git » fp-git.git » commit f918d98

see diffs

author ecalot
2006-01-18 19:21:20 UTC
committer ecalot
2006-01-18 19:21:20 UTC
parent b59fc4def8dee583b5c267a40efeb7027c69746d

see diffs

PR/src/include/en.lang.pr.h +18 -16
PR/src/include/list.h +1 -0
PR/src/include/reslist.h +3 -1
PR/src/include/types.h +3 -1

diff --git a/PR/src/include/en.lang.pr.h b/PR/src/include/en.lang.pr.h
index 5795140..f5bc3f5 100644
--- a/PR/src/include/en.lang.pr.h
+++ b/PR/src/include/en.lang.pr.h
@@ -98,9 +98,9 @@ pr.h: Princed Resources : English language strings
 	"Cannot open XML file",\
 	"XML parsing error",\
 	"XML file already open",\
-  "XML file cannot be open",\
-  "Input line syntax error",\
-  "Extraction error",\
+	"XML file cannot be open",\
+	"Input line syntax error",\
+	"Extraction error",\
 	"-19",\
 	"You may select one directory to export all DAT files or specify DAT files; both actions are not allowed",\
 	"Recursive flag must not be set when you import files",\
@@ -151,37 +151,39 @@ pr.h: Princed Resources : English language strings
   Mandatory arguments to long options are mandatory for short options too.\n\
 \n"
 #define PARSING_HELP_PART1 "\
-   -i, -m, --import[=DIRNAME] imports from DIRNAME into given DAT file\n\
-   -c, --classify             returns the DAT file type\n\
-   -e, -x, --export[=DIRNAME] exports given DAT file into DIRNAME\n\
+   -i, -m, --import[=DIRNAME] import from DIRNAME into given DAT file\n\
+   -c, --classify             return the DAT file type\n\
+   -e, -x, --export[=DIRNAME] export given DAT file into DIRNAME\n\
 \n"
 #define PARSING_HELP_PART2 "\
-   -a, --setauthor=NAME       sets your name in extracted plv files\n\
+   -a, --setauthor=NAME       set your name in extracted plv files\n\
    -b, --backup[=EXTENSION]   backup your files\n\
-   -f, --force                rewrites your files without prompting\n\
+   -f, --force                rewrite your files without prompting\n\
    -g, --cgi                  run as CGI and output mime headers\n\
    -h, -?, --help             display this help and exit\n\
-   -s, --resource=RESFILE     uses an user-specific resource XML file\n\
+   -s, --resource=RESFILE     use an user-specific resource XML file\n\
 "PARSING_SHOWRAW(PARSING_RAW)
 
 #define PARSING_HELP_PART3 "\
-   -r, --recursive            searches for all DAT files (only if DATFILEPATH\n\
+   -r, --recursive            searche for all DAT files (only if DATFILEPATH\n\
                               is not a DAT file)\n\
-   -t, --datfile=DATFILE      specifies a DAT file to read resources\n\
-                              different than the original file\n\
-   -z, --compression-level=N  a number from 1 to 7 specifying how hard has PR\n\
-                              to try to reduce the generated DAT files\n"
+   -t, --datfile=DATFILE      specify a DAT file to read resources different\n\
+                              than the original file\n"
 
 #define PARSING_HELP_PART4 "\
+   -z, --compression-level=N  a number from 1 to 7 specifying how hard has PR\n\
+                              to try to reduce the generated DAT files\n\
                               1 is high speed, low compression, 7 is high\n\
-                              compression but low speed\n\
+                              compression but low speed\n"
+
+#define PARSING_HELP_PART5 "\
        --format=FORMAT        generate the item files in the unknown file using\n\
                               the given format\n\
        --unknown              generate the unknown file without performing\n\
                               any extraction\n\
    -v, --verbose              explain what is being done\n\
        --version              output version information and exit\n\
-       --xml-optimize=XMLFILE optimizes a resources XML file\n\
+       --xml-optimize=XMLFILE optimize a resources XML file\n\
 \n"
 
 #define PR_TXT_AUTHORS           "Authors"
diff --git a/PR/src/include/list.h b/PR/src/include/list.h
index db0238f..a7be6c6 100644
--- a/PR/src/include/list.h
+++ b/PR/src/include/list.h
@@ -58,5 +58,6 @@ void  list_nextCursor(tList* list);
 void  list_firstCursor(tList* list);
 int   list_moveCursor(tList* list,const void* data);
 void* list_getCursor(tList* list);
+void  list_reorder(tList* list,int dataCmp(const void*,const void*));
 
 #endif
diff --git a/PR/src/include/reslist.h b/PR/src/include/reslist.h
index 067c767..58d57cf 100644
--- a/PR/src/include/reslist.h
+++ b/PR/src/include/reslist.h
@@ -43,7 +43,7 @@ typedef tList tResourceList;
 typedef struct {
 	unsigned short int value;
 	char               index[5];
-	unsigned short     order;
+	unsigned int       order;
 }tResourceId;
 
 typedef struct {
@@ -62,6 +62,7 @@ typedef struct {
 
 #ifdef DEBUG_RESPRINT
 void printr(const tResource* record); /* for debug purposes */
+void resourceListDebugPrint(tResourceList* r);
 #endif
 
 #define resourceListStartIteration(l) list_firstCursor(l)
@@ -74,5 +75,6 @@ tResourceList resourceListCreate(int isCopy);
 void resourceListAddInfo(tResourceList* r,tResource* res);
 void resourceListAdd(tResourceList* r,tResource* res); /* only increases order */
 void resourceListDebugPrint(tResourceList* r);
+void resourceListRebuildForIndex(tResourceList* r);
 
 #endif
diff --git a/PR/src/include/types.h b/PR/src/include/types.h
index 067c767..58d57cf 100644
--- a/PR/src/include/types.h
+++ b/PR/src/include/types.h
@@ -43,7 +43,7 @@ typedef tList tResourceList;
 typedef struct {
 	unsigned short int value;
 	char               index[5];
-	unsigned short     order;
+	unsigned int       order;
 }tResourceId;
 
 typedef struct {
@@ -62,6 +62,7 @@ typedef struct {
 
 #ifdef DEBUG_RESPRINT
 void printr(const tResource* record); /* for debug purposes */
+void resourceListDebugPrint(tResourceList* r);
 #endif
 
 #define resourceListStartIteration(l) list_firstCursor(l)
@@ -74,5 +75,6 @@ tResourceList resourceListCreate(int isCopy);
 void resourceListAddInfo(tResourceList* r,tResource* res);
 void resourceListAdd(tResourceList* r,tResource* res); /* only increases order */
 void resourceListDebugPrint(tResourceList* r);
+void resourceListRebuildForIndex(tResourceList* r);
 
 #endif