git » fp-git.git » commit 608ffeb

source clean

author ecalot
2005-12-30 01:25:46 UTC
committer ecalot
2005-12-30 01:25:46 UTC
parent 7384b9b96ce7e4eef77e92a70decf8ae0e544704

source clean

PR/src/include/tree.h +0 -1
PR/src/lib/xml/tree.c +4 -10
PR/src/lib/xml/unknown.c +6 -9

diff --git a/PR/src/include/tree.h b/PR/src/include/tree.h
index dba45e7..ee5360d 100644
--- a/PR/src/include/tree.h
+++ b/PR/src/include/tree.h
@@ -35,7 +35,6 @@ unknown.h: Princed Resources : Unknown.xml generator headers
 #define _TREE_H_
 
 /* Includes */
-#include "parse.h"
 #include "reslist.h"
 
 void unknown_folder(const char* path, const char* file, int palette, const char* paletteindex); 
diff --git a/PR/src/lib/xml/tree.c b/PR/src/lib/xml/tree.c
index 3ab8feb..9a763ae 100644
--- a/PR/src/lib/xml/tree.c
+++ b/PR/src/lib/xml/tree.c
@@ -19,10 +19,10 @@
 */
 
 /*
-unknown.c: Princed Resources : Unknown resources handler
-\xaf\xaf\xaf\xaf\xaf\xaf\xaf\xaf\xaf\xaf
+tree.c: Princed Resources : Tree handling routines
+\xaf\xaf\xaf\xaf\xaf\xaf
  Copyright 2003 Princed Development Team
-  Created: 24 Aug 2003
+  Created: 28 Dec 2005
 
   Author: Enrique Calot <ecalot.cod@princed.com.ar>
   Version: 1.01 (2003-Oct-23)
@@ -39,12 +39,8 @@ unknown.c: Princed Resources : Unknown resources handler
 /* Includes */
 #include <stdio.h>
 #include "common.h"
-#include "disk.h"
-#include "unknown.h"
 #include "memory.h"
-#include "parse.h" /* For the moment just testing */
-#include "stringformat.h"
-#include "translate.h"
+#include "parse.h" /* RES_TYPECOUNT */
 
 /***************************************************************\
 |                     Unknown.xml primitives                    |
@@ -52,8 +48,6 @@ unknown.c: Princed Resources : Unknown resources handler
 
 /* XML generation defines */
 
-#define RES_XML_UNKNOWN_FILES "%t%03n.%e"
-
 #define XML_HEADER \
 	"<!DOCTYPE resources SYSTEM \"http://www.princed.com.ar/standards/xml/resources/std1.dtd\">\n"\
 	"<?xml version=\"1.0\" ?>\n"
diff --git a/PR/src/lib/xml/unknown.c b/PR/src/lib/xml/unknown.c
index 5e1f332..743f072 100644
--- a/PR/src/lib/xml/unknown.c
+++ b/PR/src/lib/xml/unknown.c
@@ -38,14 +38,13 @@ unknown.c: Princed Resources : Unknown resources handler
 
 /* Includes */
 #include <stdio.h>
+#include "tree.h"
 #include "common.h"
 #include "disk.h"
 #include "unknown.h"
 #include "memory.h"
-#include "parse.h" /* For the moment just testing */
 #include "stringformat.h"
 #include "translate.h"
-#include "tree.h"
 
 /***************************************************************\
 |                     Unknown.xml primitives                    |
@@ -54,12 +53,10 @@ unknown.c: Princed Resources : Unknown resources handler
 /* XML generation defines */
 
 #define RES_XML_UNKNOWN_FILES "%t%03n.%e"
+#define XML_TAG_RESOURCES     "resources"
+#define XML_ATTRV_VERSION     "generated"
 
-#define XML_HEADER \
-	"<!DOCTYPE resources SYSTEM \"http://www.princed.com.ar/standards/xml/resources/std1.dtd\">\n"\
-	"<?xml version=\"1.0\" ?>\n"
-
- struct {
+struct {
 	char*        backupExtension;
 	char*        currentDat;
 	FILE*        fd;
@@ -96,8 +93,8 @@ int unknownLogStart (const char* file,int optionflag, const char* backupExtensio
 		if (error) {
 			unknownFile.tree=malloc(sizeof(tTag));
 			memset(unknownFile.tree,0,sizeof(tTag));
-			unknownFile.tree->version=strallocandcopy("generated");
-			unknownFile.tree->tag=strallocandcopy("resources");
+			unknownFile.tree->version=strallocandcopy(XML_ATTRV_VERSION);
+			unknownFile.tree->tag=strallocandcopy(XML_TAG_RESOURCES);
 		}
 	}