Fixed some GCC 4 warnings.

zsnes/src/dos/zfile.c

@@ -32,73 +32,70 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include <unistd.h>
 
 
-#define DWORD unsigned int
-#define BYTE unsigned char
-
 FILE *FILEHANDLE[16];
-DWORD CurrentHandle=0;
+unsigned int CurrentHandle=0;
 
 //Indicate whether the file must be opened using
 //zlib or not (used for gzip support)
-BYTE TextFile;
+unsigned char TextFile;
 
 
 // ZFileSystemInit
 // return 0
 
 // ZOpenFile info :
-BYTE * ZOpenFileName;
-DWORD ZOpenMode;
+char * ZOpenFileName;
+unsigned int ZOpenMode;
 // Open modes :   0 read/write in
 //                1 write (create file, overwrite)
 // return file handle if success, 0xFFFFFFFF if error
 
 // ZCloseFile info :
-DWORD ZCloseFileHandle;
+unsigned int ZCloseFileHandle;
 // return 0
 
 // ZFileSeek info :
-DWORD ZFileSeekHandle;
-DWORD ZFileSeekPos;
-DWORD ZFileSeekMode; // 0 start, 1 end
+unsigned int ZFileSeekHandle;
+unsigned int ZFileSeekPos;
+unsigned int ZFileSeekMode; // 0 start, 1 end
 // return 0
 
 // ZFileReadBlock info :
-BYTE * ZFileReadBlock;
-DWORD ZFileReadSize;
-DWORD ZFileReadHandle;
+unsigned char * ZFileReadBlock;
+unsigned int ZFileReadSize;
+unsigned int ZFileReadHandle;
 // return 0
 
 // ZFileWriteBlock info :
-BYTE * ZFileWriteBlock;
-DWORD ZFileWriteSize;
-DWORD ZFileWriteHandle;
+unsigned char * ZFileWriteBlock;
+unsigned int ZFileWriteSize;
+unsigned int ZFileWriteHandle;
 // return 0
 
 // ZFileTell
-DWORD ZFileTellHandle;
+unsigned int ZFileTellHandle;
 
 // ZFileGetftime
-BYTE * ZFFTimeFName;
-DWORD ZFTimeHandle;
-DWORD ZFDate;
-DWORD ZFTime;
+char * ZFFTimeFName;
+int ZFTimeHandle;
+unsigned int ZFDate;
+unsigned int ZFTime;
 
 // MKDir/CHDir
-BYTE * MKPath;
-BYTE * CHPath;
-BYTE * RMPath;
+char * MKPath;
+char * CHPath;
+char * RMPath;
 
 // GetDir
-BYTE * DirName;
-DWORD DriveNumber;
+char * DirName;
+unsigned int DriveNumber;
 
 // ZFileDelete
-BYTE * ZFileDelFName;
+char * ZFileDelFName;
 // return current position
 
 
-DWORD ZFileSystemInit()
+unsigned int ZFileSystemInit()
 {
 #ifdef __GZIP__
 	TextFile = 0;
@@ -110,7 +107,7 @@ DWORD ZFileSystemInit()
 }
 
 
-DWORD ZOpenFile()
+unsigned int ZOpenFile()
 {
 	if(ZOpenMode==0)
 	{
@@ -154,7 +151,7 @@ DWORD ZOpenFile()
 	return(0xFFFFFFFF);
 }
 
-DWORD ZCloseFile()
+unsigned int ZCloseFile()
 {
 	if (TextFile)
 		fclose(FILEHANDLE[ZCloseFileHandle]);
@@ -164,7 +161,7 @@ DWORD ZCloseFile()
 	return(0);
 }
 
-DWORD ZFileSeek()
+unsigned int ZFileSeek()
 {
     /*int res = 0;*/
 	int mode = 0;
@@ -186,7 +183,7 @@ DWORD ZFileSeek()
 	return(0xFFFFFFFF);
 }
 
-DWORD ZFileRead()
+unsigned int ZFileRead()
 {
 	if (TextFile)
 		return(fread(ZFileReadBlock,
@@ -200,7 +197,7 @@ DWORD ZFileRead()
 }
 
 
-DWORD ZFileWrite()
+unsigned int ZFileWrite()
 {
 	int res=0;
 	if (TextFile)
@@ -213,13 +210,13 @@ DWORD ZFileWrite()
 			      ZFileWriteBlock,
 			      ZFileWriteSize);
 
-	if (res!=ZFileWriteSize)
+	if (res!=(int)ZFileWriteSize)
 		return(0xFFFFFFFF);
 
 	return(0);
 }
 
-DWORD ZFileTell()
+unsigned int ZFileTell()
 {
 	int res = 0;
 	if (TextFile) {
@@ -229,13 +226,13 @@ DWORD ZFileTell()
 	} else return gztell(FILEHANDLE[ZFileTellHandle]);
 }
 
-DWORD ZFileDelete()
+unsigned int ZFileDelete()
 {
   return(remove(ZFileDelFName));
 }
 
 
-DWORD ZFileGetFTime()
+unsigned int ZFileGetFTime()
 {
   _dos_open(ZFFTimeFName, 0,&ZFTimeHandle);
   _dos_getftime(ZFTimeHandle,&ZFDate,&ZFTime);
@@ -243,31 +240,31 @@ DWORD ZFileGetFTime()
   return(0);
 }
 
-DWORD ZFileMKDir()
+unsigned int ZFileMKDir()
 {
   /*return(mkdir(MKPath));*/
   return (mkdir(MKPath, S_IWUSR));
 }
 
-DWORD ZFileCHDir()
+unsigned int ZFileCHDir()
 {
   return(chdir(CHPath));
 }
 
-DWORD ZFileRMDir()
+unsigned int ZFileRMDir()
 {
   return(rmdir(RMPath));
 }
 
-DWORD ZFileGetDir()
+unsigned int ZFileGetDir()
 {
   /*return(getcwd(DirName,128));*/
   return(*getcwd(DirName,128));
 }
 
-BYTE * ZFileFindPATH;
-DWORD ZFileFindATTRIB;
-DWORD DTALocPos;
+char * ZFileFindPATH;
+unsigned int ZFileFindATTRIB;
+unsigned int DTALocPos;
 
 //struct _find_t {
 //  char reserved[21] __attribute__((packed));
@@ -278,35 +275,35 @@ DWORD DTALocPos;
 //  char name[256] __attribute__((packed));
 //};
 
-DWORD ZFileFindFirst()
+unsigned int ZFileFindFirst()
 {
    /*return(_dos_findfirst(ZFileFindPATH,ZFileFindATTRIB,DTALocPos));*/
    return(_dos_findfirst(ZFileFindPATH,ZFileFindATTRIB,((struct find_t *)DTALocPos)));
 
 }
 
-DWORD ZFileFindNext()
+unsigned int ZFileFindNext()
 {
    /*return(_dos_findnext(DTALocPos));*/
    return(_dos_findnext(((struct find_t *) DTALocPos)));
 }
 
-DWORD ZFileFindEnd()  // for compatibility with windows later
+unsigned int ZFileFindEnd()  // for compatibility with windows later
 {
    return(0);
 }
 
 
-//BYTE * DirName;
-//DWORD DriveNumber;
+//unsigned char * DirName;
+//unsigned int DriveNumber;
 
 //unsigned int   _dos_findfirst(char *_name, unsigned int _attr, struct _find_t *_result);
 //unsigned int   _dos_findnext(struct _find_t *_result);
 
 
-DWORD GetTime()
+unsigned int GetTime()
 {
-   DWORD value;
+   unsigned int value;
    struct tm *newtime;
    time_t long_time;
 
@@ -319,9 +316,9 @@ DWORD GetTime()
    return(value);
 }
 
-DWORD GetDate()
+unsigned int GetDate()
 {
-   DWORD value;
+   unsigned int value;
    struct tm *newtime;
    time_t long_time;
 
@@ -334,5 +331,3 @@ DWORD GetDate()
 
    return(value);
 }
-
-