Menu
▾
▴
[Opengtoolkit-svn] SF.net SVN: opengtoolkit:[1533] trunk/lvzip/c_source
|
From: <lab...@us...> - 2015-05-27 17:17:11
|
Revision: 1533
http://sourceforge.net/p/opengtoolkit/svn/1533
Author: labviewer
Date: 2015-05-27 17:17:08 +0000 (Wed, 27 May 2015)
Log Message:
-----------
Some cosmetic changes from the Mac
Modified Paths:
--------------
trunk/lvzip/c_source/iomem.c
trunk/lvzip/c_source/lvzip.xcodeproj/project.pbxproj
trunk/lvzip/c_source/unzip.h
trunk/lvzip/c_source/zip.c
Modified: trunk/lvzip/c_source/iomem.c
===================================================================
--- trunk/lvzip/c_source/iomem.c 2015-05-27 15:22:25 UTC (rev 1532)
+++ trunk/lvzip/c_source/iomem.c 2015-05-27 17:17:08 UTC (rev 1533)
@@ -58,10 +58,7 @@
int error;
} MEMORY_IO;
-voidpf ZCALLBACK mem_open_file_func (opaque, filename, mode)
- voidpf opaque;
- const void* filename;
- int mode;
+voidpf ZCALLBACK mem_open_file_func (voidpf opaque, const void* filename, int mode)
{
MEMORY_IO *memio = malloc(sizeof(MEMORY_IO));
Unused(opaque);
@@ -72,18 +69,17 @@
memio->mode = mode;
memio->error = 0;
-/* if (opaque && !(mode & ZLIB_FILEFUNC_MODE_CREATE))
- memio->pos = LStrLen(*(LStrHandle)opaque); */
+ if (opaque && !(mode & ZLIB_FILEFUNC_MODE_CREATE))
+ memio->pos = LStrLen(*(LStrHandle)opaque);
}
return memio;
}
-voidpf ZCALLBACK mem_opendisk_file_func (opaque, stream, number_disk, mode)
- voidpf opaque;
- voidpf stream;
- int number_disk;
- int mode;
+voidpf ZCALLBACK mem_opendisk_file_func (voidpf opaque, voidpf stream, int number_disk, int mode)
{
+ Unused(opaque);
+ Unused(number_disk);
+ Unused(mode);
if (stream)
{
MEMORY_IO* mem = (MEMORY_IO*)stream;
@@ -92,11 +88,7 @@
return NULL;
}
-uLong ZCALLBACK mem_read_file_func (opaque, stream, buf, size)
- voidpf opaque;
- voidpf stream;
- void* buf;
- uLong size;
+uLong ZCALLBACK mem_read_file_func (voidpf opaque, voidpf stream, void* buf, uLong size)
{
if (stream && opaque)
{
@@ -152,11 +144,7 @@
return mgNoErr;
}
-uLong ZCALLBACK mem_write_file_func (opaque, stream, buf, size)
- voidpf opaque;
- voidpf stream;
- const void* buf;
- uLong size;
+uLong ZCALLBACK mem_write_file_func (voidpf opaque, voidpf stream, const void* buf, uLong size)
{
MEMORY_IO* mem = (MEMORY_IO*)stream;
ZPOS64_T len = size;
@@ -175,9 +163,7 @@
return 0;
}
-ZPOS64_T ZCALLBACK mem_tell_file_func (opaque, stream)
- voidpf opaque;
- voidpf stream;
+ZPOS64_T ZCALLBACK mem_tell_file_func (voidpf opaque, voidpf stream)
{
Unused(opaque);
if (stream != NULL)
@@ -187,11 +173,7 @@
return -1;
}
-long ZCALLBACK mem_seek_file_func (opaque, stream, offset, origin)
- voidpf opaque;
- voidpf stream;
- ZPOS64_T offset;
- int origin;
+long ZCALLBACK mem_seek_file_func (voidpf opaque, voidpf stream, ZPOS64_T offset, int origin)
{
if (stream != NULL)
{
@@ -224,10 +206,7 @@
return -1;
}
-int ZCALLBACK mem_close_file_func (opaque, stream, output)
- voidpf opaque;
- voidpf stream;
- voidpf output;
+int ZCALLBACK mem_close_file_func (voidpf opaque, voidpf stream, voidpf output)
{
int ret = -1;
UHandle s = (UHandle)opaque;
@@ -257,22 +236,18 @@
return ret;
}
-int ZCALLBACK mem_error_file_func (opaque, stream)
- voidpf opaque;
- voidpf stream;
+int ZCALLBACK mem_error_file_func (voidpf opaque, voidpf stream)
{
- int ret=-1;
+ int ret = -1;
Unused(opaque);
- if (stream!=NULL)
+ if (stream != NULL)
{
ret = ((MEMORY_IO*)stream)->error;
}
return ret;
}
-void fill_mem_filefunc (pzlib_filefunc_def, memory)
- zlib_filefunc64_def* pzlib_filefunc_def;
- LStrHandle *memory;
+void fill_mem_filefunc (zlib_filefunc64_def* pzlib_filefunc_def, LStrHandle *memory)
{
pzlib_filefunc_def->zopen64_file = mem_open_file_func;
pzlib_filefunc_def->zopendisk64_file = mem_opendisk_file_func;
Modified: trunk/lvzip/c_source/lvzip.xcodeproj/project.pbxproj
===================================================================
--- trunk/lvzip/c_source/lvzip.xcodeproj/project.pbxproj 2015-05-27 15:22:25 UTC (rev 1532)
+++ trunk/lvzip/c_source/lvzip.xcodeproj/project.pbxproj 2015-05-27 17:17:08 UTC (rev 1533)
@@ -210,9 +210,9 @@
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
- 83D3E1AE080D116E00DE332C /* OSX DLL */ = {
+ 83D3E1AE080D116E00DE332C /* LVZIP Framework */ = {
isa = PBXNativeTarget;
- buildConfigurationList = C77CC6B40C9C7C6500886AB2 /* Build configuration list for PBXNativeTarget "OSX DLL" */;
+ buildConfigurationList = C77CC6B40C9C7C6500886AB2 /* Build configuration list for PBXNativeTarget "LVZIP Framework" */;
buildPhases = (
83D3E1A9080D116E00DE332C /* Headers */,
83D3E1AA080D116E00DE332C /* Sources */,
@@ -223,7 +223,7 @@
);
dependencies = (
);
- name = "OSX DLL";
+ name = "LVZIP Framework";
productName = "OSX DLL";
productReference = 83D3E1AF080D116E00DE332C /* lvzlib.framework */;
productType = "com.apple.product-type.framework";
@@ -247,7 +247,7 @@
projectDirPath = "";
projectRoot = "";
targets = (
- 83D3E1AE080D116E00DE332C /* OSX DLL */,
+ 83D3E1AE080D116E00DE332C /* LVZIP Framework */,
);
};
/* End PBXProject section */
@@ -487,7 +487,7 @@
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
- C77CC6B40C9C7C6500886AB2 /* Build configuration list for PBXNativeTarget "OSX DLL" */ = {
+ C77CC6B40C9C7C6500886AB2 /* Build configuration list for PBXNativeTarget "LVZIP Framework" */ = {
isa = XCConfigurationList;
buildConfigurations = (
C77CC6B50C9C7C6500886AB2 /* Development */,
Modified: trunk/lvzip/c_source/unzip.h
===================================================================
--- trunk/lvzip/c_source/unzip.h 2015-05-27 15:22:25 UTC (rev 1532)
+++ trunk/lvzip/c_source/unzip.h 2015-05-27 17:17:08 UTC (rev 1533)
@@ -229,12 +229,16 @@
/* Unzip package allow you browse the directory of the zipfile */
ZEXTERN int ZEXPORT unzGoToFirstFile OF((unzFile file));
+ZEXTERN int ZEXPORT unzGoToFirstFile2 OF((unzFile file, unz_file_info64 *pfile_info, char *filename,
+ uLong filename_size, void *extrafield, uLong extrafield_size, char *comment, uLong comment_size));
/*
Set the current file of the zipfile to the first file.
return UNZ_OK if there is no problem
*/
ZEXTERN int ZEXPORT unzGoToNextFile OF((unzFile file));
+ZEXTERN int ZEXPORT unzGoToNextFile2 OF((unzFile file, unz_file_info64 *pfile_info, char *filename,
+ uLong filename_size, void *extrafield, uLong extrafield_size, char *comment, uLong comment_size));
/*
Set the current file of the zipfile to the next file.
return UNZ_OK if there is no problem
Modified: trunk/lvzip/c_source/zip.c
===================================================================
--- trunk/lvzip/c_source/zip.c 2015-05-27 15:22:25 UTC (rev 1532)
+++ trunk/lvzip/c_source/zip.c 2015-05-27 17:17:08 UTC (rev 1533)
@@ -1852,7 +1852,7 @@
#endif
if (!zi->ci.raw)
{
- if ((zi->ci.compression_method == Z_DEFLATED))
+ if (zi->ci.compression_method == Z_DEFLATED)
{
int tmp_err = deflateEnd(&zi->ci.stream);
if (err == ZIP_OK)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
