git » fp-git.git » commit 8877eb5

diff --git a/PR/src/console/filedir.c b/PR/src/console/filedir.c
index 80e5cdb..f3c10f6 100644
--- a/PR/src/console/filedir.c
+++ b/PR/src/console/filedir.c
@@ -316,8 +316,6 @@ void fileDirAddOption(tFileDir2* list1, const char* option) {
 	filedir_push(op, &(list1->options),0);
 }
 
-
-
 int fileDirGetFiles(tFileDir2* list1,tFileDir2* files,int hasExportFlag,int notHasRecursiveFlag,const char* resfile,int given) {
 /* case 1: * import from more than one directory */
  
diff --git a/PR/src/console/main.c b/PR/src/console/main.c
index 6173290..c9a1d22 100644
--- a/PR/src/console/main.c
+++ b/PR/src/console/main.c
@@ -237,4 +237,3 @@ int main (int argc, char **argv) {
 	return c;
 }
 
-
diff --git a/PR/src/include/common.h b/PR/src/include/common.h
index 2ee19a3..24a1cd3 100644
--- a/PR/src/include/common.h
+++ b/PR/src/include/common.h
@@ -192,18 +192,5 @@ PARSING_OPTRAW\
 #define PR_RESULT_ERR_XML_PARSING -14
 #define PR_RESULT_SUCCESS 0
 
-#define PR_RESULT_TYPE_1BINARY 1
-#define PR_RESULT_TYPE_1GRAPHIC_BAD 2
-#define PR_RESULT_TYPE_1GRAPHIC_PAL 3
-#define PR_RESULT_TYPE_1LEVEL 4
-#define PR_RESULT_TYPE_1PCS 5
-#define PR_RESULT_TYPE_1WAVE 6
-#define PR_RESULT_TYPE_2BINARY 11
-#define PR_RESULT_TYPE_2GRAPHIC_BAD 12
-#define PR_RESULT_TYPE_2GRAPHIC_PAL 13
-#define PR_RESULT_TYPE_2LEVEL 14
-#define PR_RESULT_TYPE_2PCS 15
-#define PR_RESULT_TYPE_2WAVE 16
-
 #endif
 
diff --git a/PR/src/include/compress.h b/PR/src/include/compress.h
index a0ca254..36d9724 100644
--- a/PR/src/include/compress.h
+++ b/PR/src/include/compress.h
@@ -48,11 +48,6 @@ compress.c: Princed Resources : Image Compressor headers
 #define COMPRESS_RESULT_WARNING -1
 #define COMPRESS_RESULT_SUCCESS 0
 
-/* reserved memory for the Lzx algorithm */
-#define MAX_MOD_SIZE_IN_LZG    32001                /* 38401 */
-/* modulus to be used in the 10 bits of the algorithm */
-#define MAX_MXD_SIZE_IN_LZG    0x400
-
 typedef struct {
 	int width;
 	int widthInBytes;
diff --git a/PR/src/include/disk.h b/PR/src/include/disk.h
index 773ae51..c97cb39 100644
--- a/PR/src/include/disk.h
+++ b/PR/src/include/disk.h
@@ -54,14 +54,12 @@ disk.h: Princed Resources : Disk Access & File handling functions headers
  #define DIR_SEPARATOR           '\\'
 #endif
 
-
 typedef enum {eFile,eDirectory,eNotFound}whatIs;
 
 #define charToUpper(a) ((a)&0xDF)
 #define isDirSep(a,i) ((a[i]=='\\')||(a[i]=='/'))
 
 #define writeCloseOk(a,b,c) writeClose(a,0,b,c)
-#define writeCloseDelete(a,b,c) writeClose(a,1,b,c)
 int  writeData     (const unsigned char* data, int ignoreChars, char* vFileext, int size, int optionflag,const char* backupExtension);
 int  writeOpen     (const char* vFileext, FILE* *fp, int optionflag);
 int  writeClose    (FILE* fp,int dontSave,int optionflag,const char* backupExtension);
@@ -70,7 +68,7 @@ int  makebase      (const char* p);
 const char* repairFolders(const char* a);
 const char* getFileNameFromPath(const char* path);
 whatIs isDir(const char *nombre);
-#define mRemoveFile(a) remove(repairFolders(a))
+/*#define mRemoveFile(a) remove(repairFolders(a))*/
 
 #ifdef DISK_DIR_SCANING
 int recurseDirectory(const char* path,int recursive, void* pass, void (*function)(const char*,void*));
diff --git a/PR/src/include/export.h b/PR/src/include/export.h
index ebd24de..9394b7e 100644
--- a/PR/src/include/export.h
+++ b/PR/src/include/export.h
@@ -31,11 +31,12 @@ export.h: Princed Resources : DAT Extractor headers
   DO NOT remove this copyright notice
 */
 
-#ifndef _EXTARCT_H_
-#define _EXTRACT_H_
+#ifndef _EXPORT_H_
+#define _EXPORT_H_
 
 #include "resources.h"
 
 int extract(const char* vFiledat,const char* vDirExt, tResourceList* r, int task, const char* vDatFileName, const char* vDatAuthor,const char* backupExtension);
+
 #endif
 
diff --git a/PR/src/include/image.h b/PR/src/include/image.h
index a0ca254..36d9724 100644
--- a/PR/src/include/image.h
+++ b/PR/src/include/image.h
@@ -48,11 +48,6 @@ compress.c: Princed Resources : Image Compressor headers
 #define COMPRESS_RESULT_WARNING -1
 #define COMPRESS_RESULT_SUCCESS 0
 
-/* reserved memory for the Lzx algorithm */
-#define MAX_MOD_SIZE_IN_LZG    32001                /* 38401 */
-/* modulus to be used in the 10 bits of the algorithm */
-#define MAX_MXD_SIZE_IN_LZG    0x400
-
 typedef struct {
 	int width;
 	int widthInBytes;
diff --git a/PR/src/include/plv.h b/PR/src/include/plv.h
index b18aadb..0d5eca1 100644
--- a/PR/src/include/plv.h
+++ b/PR/src/include/plv.h
@@ -35,7 +35,6 @@ plv.h: Princed Resources : PLV prince level files support headers
    Enrique Calot <ecalot.cod@princed.com.ar>
   Version: 1.00 (2003-Nov-28)
 
-
  Note:
   DO NOT remove this copyright notice
 */
@@ -84,7 +83,6 @@ int mFormatExportPlv(const unsigned char* data, const char *vFileext,unsigned lo
 #define PLV_FOOT_TMODIF        "Time Last Modified"
 #define PLV_FOOT_ORIG_FILE     "Original Filename"
 #define PLV_FOOT_LEV_NUM_ORIG  "Original Level Number"
-#define PLV_HEADER_SIZE_OFFSET PLV_HEADER_A_SIZE+PLV_HEADER_B_SIZE
 
 #define PLV_DEFAULT_AUTHOR     "PR user"
 
diff --git a/PR/src/include/search.h b/PR/src/include/search.h
index 7bbb22d..f003db4 100644
--- a/PR/src/include/search.h
+++ b/PR/src/include/search.h
@@ -57,7 +57,6 @@ void workTree(const tTag* t,void* pass, void (*function)(const tTag*,void*));
 
 void compareXmlFile(tTag* modified,tTag* original);
 
-
 /* File List Functions */
 char* getFileFromList();
 
diff --git a/PR/src/lib/actions/export.c b/PR/src/lib/actions/export.c
index 879ddbd..e05b276 100644
--- a/PR/src/lib/actions/export.c
+++ b/PR/src/lib/actions/export.c
@@ -59,7 +59,6 @@ extern FILE* outputStream;
 |                    M A I N   E X T R A C T                    |
 \***************************************************************/
 
-
 /*
 	Extracts a dat file
 	For parameter documentation, see pr.c
diff --git a/PR/src/lib/actions/import.c b/PR/src/lib/actions/import.c
index df038ae..e987b68 100644
--- a/PR/src/lib/actions/import.c
+++ b/PR/src/lib/actions/import.c
@@ -134,7 +134,6 @@ int fullCompile(const char* vFiledat, const char* vDirExt, tResourceList* r, int
 	return error;
 }
 
-#define RW_ERROR {mRWCloseDatFile(1);return error;}
 int partialCompile(const char* vFiledat, const char* vDirExt, tResourceList* r, int optionflag, const char* vDatFileName,const char* backupExtension) {
 	/*
 		Return values:
diff --git a/PR/src/lib/formats/bmp.c b/PR/src/lib/formats/bmp.c
index 16a02bf..43e76da 100644
--- a/PR/src/lib/formats/bmp.c
+++ b/PR/src/lib/formats/bmp.c
@@ -67,7 +67,6 @@ int mFormatExportBmp(const unsigned char* data, const char *vFileext,unsigned lo
 	return 1;
 }
 
-
 int mFormatImportBmp(tResource *res) {
 	int size;
 	tImage img;
diff --git a/PR/src/lib/formats/plv.c b/PR/src/lib/formats/plv.c
index 67915ea..7f8e91c 100644
--- a/PR/src/lib/formats/plv.c
+++ b/PR/src/lib/formats/plv.c
@@ -35,7 +35,6 @@ plv.c: Princed Resources : PLV prince level files support
    Enrique Calot <ecalot.cod@princed.com.ar>
   Version: 1.00 (2003-Nov-28)
 
-
  Note:
   DO NOT remove this copyright notice
 */
diff --git a/PR/src/lib/layers/dat.c b/PR/src/lib/layers/dat.c
index bb95c91..64c3851 100644
--- a/PR/src/lib/layers/dat.c
+++ b/PR/src/lib/layers/dat.c
@@ -455,7 +455,6 @@ void mWriteFileInDatFile(const tResource* res) {
 	dat_write(res,checksum);
 }
 
-
 void mWriteCloseDatFile(int dontSave,int optionflag, const char* backupExtension) {
 	/*
 		Closes a dat file filling the index and other structures
diff --git a/PR/src/lib/layers/disk.c b/PR/src/lib/layers/disk.c
index 2dd5ee4..58bfe6f 100644
--- a/PR/src/lib/layers/disk.c
+++ b/PR/src/lib/layers/disk.c
@@ -110,7 +110,6 @@ const char *repairFolders(const char* a) {
 	return result;
 }
 
-
 /* Create base directory of a file */
 int makebase(const char* p) {
 	/*
@@ -280,7 +279,6 @@ int writeOpen(const char* vFileext, FILE* *fp, int optionflag) {
 	fileType=isDir(vFileext);
 	if (fileType==eDirectory) return 0;
 
-
 	if (fileType==eFile) {
 		/* File exists. We need to ask */
 		if ((!(hasFlag(force_flag)))&&(!all)) {
@@ -295,7 +293,6 @@ int writeOpen(const char* vFileext, FILE* *fp, int optionflag) {
 		makebase(file);
 	}
 
-
 #ifdef UNIX
 #ifdef DISK_TERM_MANIPULATION
 	/* restoring previous terminal options */
@@ -308,7 +305,6 @@ int writeOpen(const char* vFileext, FILE* *fp, int optionflag) {
 		if not, we need to know the name in case we need to delete it
 	*/
 
-
 	addFileToOpenFilesList(file,hasFlag(backup_flag));
 
 	if ((result=((*fp=fopen(file,"wb"))!=NULL))) addPointerToOpenFilesList(*fp);
diff --git a/PR/src/lib/layers/memory.c b/PR/src/lib/layers/memory.c
index 821e510..22b26d3 100644
--- a/PR/src/lib/layers/memory.c
+++ b/PR/src/lib/layers/memory.c
@@ -45,7 +45,6 @@ char* strallocandcopy(const char* text) {
 	return aux;
 }
 
-
 #else
 #include <stdlib.h>
 #include <stdio.h>
@@ -58,7 +57,6 @@ typedef struct memm {
 	int   size;
 }memm;
 
-
 static memm* list=NULL;
 static int memcounter=0;
 static long int memsize=0;
@@ -90,7 +88,6 @@ void myfree(void* a,char* fileName,int line) {
 	/*if ((!(memcounter%100))||((memcounter<100)&&(memcounter>-100)))
 	//fprintf(stderr,"Liberando memoria? -> %p (%d/%d)\n",a,memsize,memcounter);*/
 
-
 	free(a);
 
 	if (list==NULL) {
diff --git a/PR/src/lib/object/image/image16.c b/PR/src/lib/object/image/image16.c
index 4ce4179..9155b44 100644
--- a/PR/src/lib/object/image/image16.c
+++ b/PR/src/lib/object/image/image16.c
@@ -236,7 +236,6 @@ int mCompressGraphic(unsigned char* *data,tImage* image, int* dataSizeInBytes) {
 		Perform all compressions
 	*/
 
-
 	/* Forward compression */
 	
 	/* COMPRESS_RAW
diff --git a/PR/src/lib/object/image/image2.c b/PR/src/lib/object/image/image2.c
index 4ce4179..9155b44 100644
--- a/PR/src/lib/object/image/image2.c
+++ b/PR/src/lib/object/image/image2.c
@@ -236,7 +236,6 @@ int mCompressGraphic(unsigned char* *data,tImage* image, int* dataSizeInBytes) {
 		Perform all compressions
 	*/
 
-
 	/* Forward compression */
 	
 	/* COMPRESS_RAW
diff --git a/PR/src/lib/object/image/image256.c b/PR/src/lib/object/image/image256.c
index 4ce4179..9155b44 100644
--- a/PR/src/lib/object/image/image256.c
+++ b/PR/src/lib/object/image/image256.c
@@ -236,7 +236,6 @@ int mCompressGraphic(unsigned char* *data,tImage* image, int* dataSizeInBytes) {
 		Perform all compressions
 	*/
 
-
 	/* Forward compression */
 	
 	/* COMPRESS_RAW
diff --git a/PR/src/lib/object/image/image_common.c b/PR/src/lib/object/image/image_common.c
index 4ce4179..9155b44 100644
--- a/PR/src/lib/object/image/image_common.c
+++ b/PR/src/lib/object/image/image_common.c
@@ -236,7 +236,6 @@ int mCompressGraphic(unsigned char* *data,tImage* image, int* dataSizeInBytes) {
 		Perform all compressions
 	*/
 
-
 	/* Forward compression */
 	
 	/* COMPRESS_RAW
diff --git a/PR/src/lib/pr.c b/PR/src/lib/pr.c
index f3cd381..8352b66 100644
--- a/PR/src/lib/pr.c
+++ b/PR/src/lib/pr.c
@@ -62,7 +62,6 @@ pr.c: Main source file for Princed Resources library
 #include "memory.h"    /* getMemory, free */
 #include "disk.h"      /* getFileNameFromPath */
 
-
 /***************************************************************\
 |                      Main working functions                   |
 \***************************************************************/
@@ -106,7 +105,6 @@ int prExportDatOpt(const char* vDatFile, const char* vDirName, const char* vResF
 			                 so please make a backup of your files
 			backup_flag    - backup your files
 
-
 		Return values:
 			00 Ok
 			-1 Error accessing the file DAT
@@ -183,7 +181,6 @@ int prImportDatOpt(const char* vDatFile, const char* vDirName, const char* vResF
 			                 for action
 			backup_flag    - backup your files
 
-
 		Return values:
 			-1 DAT File couldn't be open for writing
 			-2 DAT file not found or invalid in partial importation
diff --git a/PR/src/lib/xml/parse.c b/PR/src/lib/xml/parse.c
index 5c8cc57..643f21d 100644
--- a/PR/src/lib/xml/parse.c
+++ b/PR/src/lib/xml/parse.c
@@ -71,7 +71,6 @@ const char* getExtDesc(int type) {
 			memcpy(tag->attribute,father->attribute,x);\
 		}
 
-
 #define ParseError return PR_RESULT_ERR_XML_PARSING
 
 tTag* getTagStructure() {
diff --git a/PR/src/lib/xml/search.c b/PR/src/lib/xml/search.c
index 6104ae6..809545a 100644
--- a/PR/src/lib/xml/search.c
+++ b/PR/src/lib/xml/search.c
@@ -208,4 +208,3 @@ void compareXmlFile(tTag* modified,tTag* original) {
 
 #endif
 
-