diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-11-17 16:20:20 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-11-17 16:20:20 +0000 |
| commit | c61eff4bc0a9ebdfb43b8e68b345fa53456378a5 (patch) | |
| tree | 7c9d224d57b7a912e6282db4ffb53a09f66e5142 /plugins/PluginUpdater/src/Minizip | |
| parent | 3cc2e824092b0b542b3d1857bb742514560b0f32 (diff) | |
bunch of fixes for updater:
- fix to update FingerPrint icons;
- fix to move files across different disks;
- five nasty clutches removed;
- code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@2336 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/PluginUpdater/src/Minizip')
| -rw-r--r-- | plugins/PluginUpdater/src/Minizip/ioapi.c | 2 | ||||
| -rw-r--r-- | plugins/PluginUpdater/src/Minizip/unzip.c | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/plugins/PluginUpdater/src/Minizip/ioapi.c b/plugins/PluginUpdater/src/Minizip/ioapi.c index a6cd3f3ca8..4219ed1f24 100644 --- a/plugins/PluginUpdater/src/Minizip/ioapi.c +++ b/plugins/PluginUpdater/src/Minizip/ioapi.c @@ -199,7 +199,7 @@ static long ZCALLBACK fseek64_file_func (voidpf opaque, voidpf stream, ZPOS64_T } ret = 0; - if(fseeko64((FILE *)stream, offset, fseek_origin) != 0) + if (fseeko64((FILE *)stream, offset, fseek_origin) != 0) ret = -1; return ret; diff --git a/plugins/PluginUpdater/src/Minizip/unzip.c b/plugins/PluginUpdater/src/Minizip/unzip.c index 44f9876160..59b5941576 100644 --- a/plugins/PluginUpdater/src/Minizip/unzip.c +++ b/plugins/PluginUpdater/src/Minizip/unzip.c @@ -753,7 +753,7 @@ local unzFile unzOpenInternal (const void *path, s=(unz64_s*)ALLOC(sizeof(unz64_s)); - if( s != NULL) + if ( s != NULL) { *s=us; unzGoToFirstFile((unzFile)s); @@ -1040,26 +1040,26 @@ local int unz64local_GetCurrentFileInfoInternal (unzFile file, { uLong uL; - if(file_info.uncompressed_size == (ZPOS64_T)(unsigned long)-1) + if (file_info.uncompressed_size == (ZPOS64_T)(unsigned long)-1) { if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK) err=UNZ_ERRNO; } - if(file_info.compressed_size == (ZPOS64_T)(unsigned long)-1) + if (file_info.compressed_size == (ZPOS64_T)(unsigned long)-1) { if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK) err=UNZ_ERRNO; } - if(file_info_internal.offset_curfile == (ZPOS64_T)(unsigned long)-1) + if (file_info_internal.offset_curfile == (ZPOS64_T)(unsigned long)-1) { /* Relative Header offset */ if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK) err=UNZ_ERRNO; } - if(file_info.disk_num_start == (unsigned long)-1) + if (file_info.disk_num_start == (unsigned long)-1) { /* Disk Start Number */ if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK) @@ -1623,7 +1623,7 @@ extern int ZEXPORT unzOpenCurrentFile3 (unzFile file, int* method, s->pfile_in_zip_read->byte_before_the_zipfile, SEEK_SET)!=0) return UNZ_INTERNALERROR; - if(ZREAD64(s->z_filefunc, s->filestream,source, 12)<12) + if (ZREAD64(s->z_filefunc, s->filestream,source, 12)<12) return UNZ_INTERNALERROR; for (i = 0; i<12; i++) @@ -1741,10 +1741,10 @@ extern int ZEXPORT unzReadCurrentFile (unzFile file, voidp buf, unsigned len) # ifndef NOUNCRYPT - if(s->encrypted) + if (s->encrypted) { uInt i; - for(i=0;i<uReadThis;i++) + for (i=0;i<uReadThis;i++) pfile_in_zip_read_info->read_buffer[i] = zdecode(s->keys,s->pcrc_32_tab, pfile_in_zip_read_info->read_buffer[i]); |