aboutsummaryrefslogtreecommitdiff
path: root/contrib/minizip/unzip.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--contrib/minizip/unzip.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/contrib/minizip/unzip.c b/contrib/minizip/unzip.c
index a2ee14b..e9088bd 100644
--- a/contrib/minizip/unzip.c
+++ b/contrib/minizip/unzip.c
@@ -842,7 +842,7 @@ local int unz64local_GetCurrentFileInfoInternal(unzFile file,
842 if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK) 842 if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK)
843 err=UNZ_ERRNO; 843 err=UNZ_ERRNO;
844 844
845 // relative offset of local header 845 /* relative offset of local header */
846 if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK) 846 if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK)
847 err=UNZ_ERRNO; 847 err=UNZ_ERRNO;
848 file_info_internal.offset_curfile = uL; 848 file_info_internal.offset_curfile = uL;
@@ -865,7 +865,7 @@ local int unz64local_GetCurrentFileInfoInternal(unzFile file,
865 lSeek -= uSizeRead; 865 lSeek -= uSizeRead;
866 } 866 }
867 867
868 // Read extrafield 868 /* Read extrafield */
869 if ((err==UNZ_OK) && (extraField!=NULL)) 869 if ((err==UNZ_OK) && (extraField!=NULL))
870 { 870 {
871 ZPOS64_T uSizeRead ; 871 ZPOS64_T uSizeRead ;
@@ -896,7 +896,7 @@ local int unz64local_GetCurrentFileInfoInternal(unzFile file,
896 { 896 {
897 uLong acc = 0; 897 uLong acc = 0;
898 898
899 // since lSeek now points to after the extra field we need to move back 899 /* since lSeek now points to after the extra field we need to move back */
900 lSeek -= file_info.size_file_extra; 900 lSeek -= file_info.size_file_extra;
901 901
902 if (lSeek!=0) 902 if (lSeek!=0)
@@ -1525,10 +1525,10 @@ extern ZPOS64_T ZEXPORT unzGetCurrentFileZStreamPos64(unzFile file) {
1525 file_in_zip64_read_info_s* pfile_in_zip_read_info; 1525 file_in_zip64_read_info_s* pfile_in_zip_read_info;
1526 s=(unz64_s*)file; 1526 s=(unz64_s*)file;
1527 if (file==NULL) 1527 if (file==NULL)
1528 return 0; //UNZ_PARAMERROR; 1528 return 0; /* UNZ_PARAMERROR; */
1529 pfile_in_zip_read_info=s->pfile_in_zip_read; 1529 pfile_in_zip_read_info=s->pfile_in_zip_read;
1530 if (pfile_in_zip_read_info==NULL) 1530 if (pfile_in_zip_read_info==NULL)
1531 return 0; //UNZ_PARAMERROR; 1531 return 0; /* UNZ_PARAMERROR; */
1532 return pfile_in_zip_read_info->pos_in_zipfile + 1532 return pfile_in_zip_read_info->pos_in_zipfile +
1533 pfile_in_zip_read_info->byte_before_the_zipfile; 1533 pfile_in_zip_read_info->byte_before_the_zipfile;
1534} 1534}
@@ -1697,7 +1697,7 @@ extern int ZEXPORT unzReadCurrentFile(unzFile file, voidp buf, unsigned len) {
1697 if (err!=BZ_OK) 1697 if (err!=BZ_OK)
1698 break; 1698 break;
1699#endif 1699#endif
1700 } // end Z_BZIP2ED 1700 } /* end Z_BZIP2ED */
1701 else 1701 else
1702 { 1702 {
1703 ZPOS64_T uTotalOutBefore,uTotalOutAfter; 1703 ZPOS64_T uTotalOutBefore,uTotalOutAfter;
@@ -1940,7 +1940,7 @@ extern ZPOS64_T ZEXPORT unzGetOffset64(unzFile file) {
1940 unz64_s* s; 1940 unz64_s* s;
1941 1941
1942 if (file==NULL) 1942 if (file==NULL)
1943 return 0; //UNZ_PARAMERROR; 1943 return 0; /* UNZ_PARAMERROR; */
1944 s=(unz64_s*)file; 1944 s=(unz64_s*)file;
1945 if (!s->current_file_ok) 1945 if (!s->current_file_ok)
1946 return 0; 1946 return 0;
@@ -1954,7 +1954,7 @@ extern uLong ZEXPORT unzGetOffset(unzFile file) {
1954 ZPOS64_T offset64; 1954 ZPOS64_T offset64;
1955 1955
1956 if (file==NULL) 1956 if (file==NULL)
1957 return 0; //UNZ_PARAMERROR; 1957 return 0; /* UNZ_PARAMERROR; */
1958 offset64 = unzGetOffset64(file); 1958 offset64 = unzGetOffset64(file);
1959 return (uLong)offset64; 1959 return (uLong)offset64;
1960} 1960}