git » fp-git.git » commit f58d315

compiles with Wall

author ecalot
2005-03-19 13:58:55 UTC
committer ecalot
2005-03-19 13:58:55 UTC
parent da137c08b43ac8a76d60a41487979db57605f6a5

compiles with Wall

PR/src/Makefile +1 -1
PR/src/include/common.h +1 -1
PR/src/include/pr.h +1 -1
PR/src/lib/formats/pal.c +3 -3
PR/src/lib/layers/autodetect.c +1 -1
PR/src/lib/layers/dat.c +0 -1
PR/src/lib/layers/idlist.c +1 -1
PR/src/lib/xml/tree.c +1 -1
PR/src/lib/xml/unknown.c +1 -1

diff --git a/PR/src/Makefile b/PR/src/Makefile
index a43a181..cb5f535 100644
--- a/PR/src/Makefile
+++ b/PR/src/Makefile
@@ -21,7 +21,7 @@ endif
 #Compiler options
 INCLUDE = -Iinclude/
 DEFINES = -DOS=\"$(OS)\" $(LINUX) 
-OPTIONS = $(INCLUDE) $(DEFINES) -g -pedantic
+OPTIONS = $(INCLUDE) $(DEFINES) -g -pedantic -Wall
 
 OBJFILES = compile.o compress.o extract.o resources.o tasks.o disk.o\
            xmlparse.o xmlsearch.o dat.o bmp.o mid.o pal.o wav.o plv.o\
diff --git a/PR/src/include/common.h b/PR/src/include/common.h
index 387da8f..5c5ea29 100644
--- a/PR/src/include/common.h
+++ b/PR/src/include/common.h
@@ -96,7 +96,7 @@ void prSetOutput(FILE* output);
 \***************************************************************/
 
 #define PR_URL                    "http://www.princed.com.ar"
-#define PR_VERSION                "v1.0-dev1"
+#define PR_VERSION                "v1.0-dev2"
 #define PR_COPY                   "(c) Copyright 2003, 2004 - Princed Development Team"
 
 /***************************************************************\
diff --git a/PR/src/include/pr.h b/PR/src/include/pr.h
index 387da8f..5c5ea29 100644
--- a/PR/src/include/pr.h
+++ b/PR/src/include/pr.h
@@ -96,7 +96,7 @@ void prSetOutput(FILE* output);
 \***************************************************************/
 
 #define PR_URL                    "http://www.princed.com.ar"
-#define PR_VERSION                "v1.0-dev1"
+#define PR_VERSION                "v1.0-dev2"
 #define PR_COPY                   "(c) Copyright 2003, 2004 - Princed Development Team"
 
 /***************************************************************\
diff --git a/PR/src/lib/formats/pal.c b/PR/src/lib/formats/pal.c
index ca47143..84dad2e 100644
--- a/PR/src/lib/formats/pal.c
+++ b/PR/src/lib/formats/pal.c
@@ -92,9 +92,9 @@ int mFormatImportPal(unsigned char* data, tResource *res,const char* vFile) {
 	unsigned char* pal2;
 	char* data2;
 	char aux[MAX_FILENAME_SIZE];
-	unsigned int r;
-	unsigned int g;
-	unsigned int b;
+	int r;
+	int g;
+	int b;
 	int i=0;
 	int k=16;
 	int sample1;
diff --git a/PR/src/lib/layers/autodetect.c b/PR/src/lib/layers/autodetect.c
index a7583be..280a430 100644
--- a/PR/src/lib/layers/autodetect.c
+++ b/PR/src/lib/layers/autodetect.c
@@ -365,7 +365,7 @@ int importDir(const char* directory, const char* vResFile, int pOption, const ch
 	/* Use the xml structure to Generate the file list */
 	workTree(xmlStructure,NULL,addFileToList);
 
-	while(datfile=getFileFromList()) {
+	while((datfile=getFileFromList())) {
 		sizeOfPath=strlen(vDatDirectory);
 		sizeOfFile=strlen(datfile);
 
diff --git a/PR/src/lib/layers/dat.c b/PR/src/lib/layers/dat.c
index 6640cf3..15273e1 100644
--- a/PR/src/lib/layers/dat.c
+++ b/PR/src/lib/layers/dat.c
@@ -66,7 +66,6 @@ int mReadBeginDatFile(unsigned short int *numberOfItems,const char* vFiledat){
 			1 Ok
 	*/
 
-	int ok;
 	unsigned char* readDatFilePoint;
 
 	/* Open file */
diff --git a/PR/src/lib/layers/idlist.c b/PR/src/lib/layers/idlist.c
index a7583be..280a430 100644
--- a/PR/src/lib/layers/idlist.c
+++ b/PR/src/lib/layers/idlist.c
@@ -365,7 +365,7 @@ int importDir(const char* directory, const char* vResFile, int pOption, const ch
 	/* Use the xml structure to Generate the file list */
 	workTree(xmlStructure,NULL,addFileToList);
 
-	while(datfile=getFileFromList()) {
+	while((datfile=getFileFromList())) {
 		sizeOfPath=strlen(vDatDirectory);
 		sizeOfFile=strlen(datfile);
 
diff --git a/PR/src/lib/xml/tree.c b/PR/src/lib/xml/tree.c
index a7583be..280a430 100644
--- a/PR/src/lib/xml/tree.c
+++ b/PR/src/lib/xml/tree.c
@@ -365,7 +365,7 @@ int importDir(const char* directory, const char* vResFile, int pOption, const ch
 	/* Use the xml structure to Generate the file list */
 	workTree(xmlStructure,NULL,addFileToList);
 
-	while(datfile=getFileFromList()) {
+	while((datfile=getFileFromList())) {
 		sizeOfPath=strlen(vDatDirectory);
 		sizeOfFile=strlen(datfile);
 
diff --git a/PR/src/lib/xml/unknown.c b/PR/src/lib/xml/unknown.c
index a7583be..280a430 100644
--- a/PR/src/lib/xml/unknown.c
+++ b/PR/src/lib/xml/unknown.c
@@ -365,7 +365,7 @@ int importDir(const char* directory, const char* vResFile, int pOption, const ch
 	/* Use the xml structure to Generate the file list */
 	workTree(xmlStructure,NULL,addFileToList);
 
-	while(datfile=getFileFromList()) {
+	while((datfile=getFileFromList())) {
 		sizeOfPath=strlen(vDatDirectory);
 		sizeOfFile=strlen(datfile);