X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/19193a2c85987b595932957e73013e7ea100f0e8..7b1279006496ba3251a755bcef91301ad107bb78:/src/common/unzip.c

diff --git a/src/common/unzip.c b/src/common/unzip.c
index 402cd3cf0f..a94a700ca6 100644
--- a/src/common/unzip.c
+++ b/src/common/unzip.c
@@ -12,9 +12,7 @@ $Id$
 
 */
 
-
-#include "wx/defs.h"
-#include "wx/setup.h"
+#include "wx/platform.h"
 
 #if wxUSE_ZLIB && wxUSE_ZIPSTREAM
 
@@ -322,13 +320,13 @@ local uLong unzlocal_SearchCentralDir(fin)
 	uLong uBackRead;
 	uLong uMaxBack=0xffff; /* maximum size of global comment */
 	uLong uPosFound=0;
-	
+
 	if (fseek(fin,0,SEEK_END) != 0)
 		return 0;
 
 
 	uSizeFile = ftell( fin );
-	
+
 	if (uMaxBack>uSizeFile)
 		uMaxBack = uSizeFile;
 
@@ -346,7 +344,7 @@ local uLong unzlocal_SearchCentralDir(fin)
 		else
 			uBackRead+=BUFREADCOMMENT;
 		uReadPos = uSizeFile-uBackRead ;
-		
+
 		uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
                      (BUFREADCOMMENT+4) : (uSizeFile-uReadPos);
 		if (fseek(fin,uReadPos,SEEK_SET)!=0)
@@ -511,12 +509,12 @@ extern unzFile ZEXPORT unzOpen (path)
 		                    (us.offset_central_dir+us.size_central_dir);
 	us.central_pos = central_pos;
     us.pfile_in_zip_read = NULL;
-	
+
 
 	s=(unz_s*)ALLOC(sizeof(unz_s));
 	*s=us;
-	unzGoToFirstFile((unzFile)s);	
-	return (unzFile)s;	
+	unzGoToFirstFile((unzFile)s);
+	return (unzFile)s;
 }
 
 
@@ -695,7 +693,7 @@ local int unzlocal_GetCurrentFileInfoInternal (file,
 		lSeek -= uSizeRead;
 	}
 
-	
+
 	if ((err==UNZ_OK) && (extraField!=NULL))
 	{
 		uLong uSizeRead ;
@@ -720,7 +718,7 @@ local int unzlocal_GetCurrentFileInfoInternal (file,
 	else
 		lSeek+=file_info.size_file_extra;
 
-	
+
 	if ((err==UNZ_OK) && (szComment!=NULL))
 	{
 		uLong uSizeRead ;
@@ -814,7 +812,7 @@ extern int ZEXPORT unzGoToFirstFile (file)
 extern int ZEXPORT unzGoToNextFile (file)
 	unzFile file;
 {
-	unz_s* s;	
+	unz_s* s;
 	int err;
 
 	if (file==NULL)
@@ -849,7 +847,7 @@ extern int ZEXPORT unzLocateFile (file, szFileName, iCaseSensitivity)
 	const char *szFileName;
 	int iCaseSensitivity;
 {
-	unz_s* s;	
+	unz_s* s;
 	int err;
     const char *c;
     char *c2;
@@ -862,7 +860,7 @@ extern int ZEXPORT unzLocateFile (file, szFileName, iCaseSensitivity)
         if (*c == '\\') *c2 = '/';
         else *c2 = *c;
     *c2 = '\0';
-	
+
 	if (file==NULL)
 		return UNZ_PARAMERROR;
 
@@ -991,7 +989,7 @@ local int unzlocal_CheckCurrentFileCoherencyHeader (s,piSizeVar,
 
 	return err;
 }
-												
+
 /*
   Open for reading data the current file in the zipfile.
   If there is no error and the file is opened, the return value is UNZ_OK.
@@ -1037,7 +1035,7 @@ extern int ZEXPORT unzOpenCurrentFile (file)
 	}
 
 	pfile_in_zip_read_info->stream_initialised=0;
-	
+
 	if ((s->cur_file_info.compression_method!=0) &&
         (s->cur_file_info.compression_method!=Z_DEFLATED))
 		err=UNZ_BADZIPFILE;
@@ -1074,11 +1072,11 @@ extern int ZEXPORT unzOpenCurrentFile (file)
 	pfile_in_zip_read_info->rest_read_uncompressed =
             s->cur_file_info.uncompressed_size ;
 
-	
+
 	pfile_in_zip_read_info->pos_in_zipfile =
             s->cur_file_info_internal.offset_curfile + SIZEZIPLOCALHEADER +
 			  iSizeVar;
-	
+
 	pfile_in_zip_read_info->stream.avail_in = (uInt)0;
 
 
@@ -1123,7 +1121,7 @@ extern int ZEXPORT unzReadCurrentFile  (file, buf, len)
 	pfile_in_zip_read_info->stream.next_out = (Bytef*)buf;
 
 	pfile_in_zip_read_info->stream.avail_out = (uInt)len;
-	
+
 	if (len>pfile_in_zip_read_info->rest_read_uncompressed)
 		pfile_in_zip_read_info->stream.avail_out =
 		  (uInt)pfile_in_zip_read_info->rest_read_uncompressed;
@@ -1148,7 +1146,7 @@ extern int ZEXPORT unzReadCurrentFile  (file, buf, len)
 			pfile_in_zip_read_info->pos_in_zipfile += uReadThis;
 
 			pfile_in_zip_read_info->rest_read_compressed-=uReadThis;
-			
+
 			pfile_in_zip_read_info->stream.next_in =
                 (Bytef*)pfile_in_zip_read_info->read_buffer;
 			pfile_in_zip_read_info->stream.avail_in = (uInt)uReadThis;
@@ -1162,11 +1160,11 @@ extern int ZEXPORT unzReadCurrentFile  (file, buf, len)
 				uDoCopy = pfile_in_zip_read_info->stream.avail_out ;
 			else
 				uDoCopy = pfile_in_zip_read_info->stream.avail_in ;
-				
+
 			for (i=0;i<uDoCopy;i++)
 				*(pfile_in_zip_read_info->stream.next_out+i) =
                         *(pfile_in_zip_read_info->stream.next_in+i);
-					
+
 			pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,
 								pfile_in_zip_read_info->stream.next_out,
 								uDoCopy);
@@ -1198,7 +1196,7 @@ extern int ZEXPORT unzReadCurrentFile  (file, buf, len)
 
 			uTotalOutAfter = pfile_in_zip_read_info->stream.total_out;
 			uOutThis = uTotalOutAfter-uTotalOutBefore;
-			
+
 			pfile_in_zip_read_info->crc32 =
                 crc32(pfile_in_zip_read_info->crc32,bufBefore,
                         (uInt)(uOutThis));
@@ -1256,7 +1254,7 @@ extern int ZEXPORT unzeof (file)
 
 	if (pfile_in_zip_read_info==NULL)
 		return UNZ_PARAMERROR;
-	
+
 	if (pfile_in_zip_read_info->rest_read_uncompressed == 0)
 		return 1;
 	else
@@ -1300,7 +1298,7 @@ extern int ZEXPORT unzGetLocalExtrafield (file,buf,len)
 
 	if (buf==NULL)
 		return (int)size_to_read;
-	
+
 	if (len>size_to_read)
 		read_now = (uInt)size_to_read;
 	else
@@ -1308,7 +1306,7 @@ extern int ZEXPORT unzGetLocalExtrafield (file,buf,len)
 
 	if (read_now==0)
 		return 0;
-	
+
 	if (fseek(pfile_in_zip_read_info->file,
               pfile_in_zip_read_info->offset_local_extrafield +
 			  pfile_in_zip_read_info->pos_local_extrafield,SEEK_SET)!=0)