summaryrefslogtreecommitdiff
path: root/ACE/contrib/minizip
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2010-09-17 07:52:52 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2010-09-17 07:52:52 +0000
commite60a5d9d9b55bcb774031e36f9ea96a5a8a6045d (patch)
tree6e47dd26396eea92224f8ecd241b3c96f7531c42 /ACE/contrib/minizip
parent447b29bb6ee55ceb53aca914041c801baf05baa9 (diff)
downloadATCD-e60a5d9d9b55bcb774031e36f9ea96a5a8a6045d.tar.gz
Removed trailing whitespaces
Diffstat (limited to 'ACE/contrib/minizip')
-rw-r--r--ACE/contrib/minizip/miniunz.c4
-rw-r--r--ACE/contrib/minizip/mztools.c12
-rw-r--r--ACE/contrib/minizip/unzip.c6
-rw-r--r--ACE/contrib/minizip/zip.c2
4 files changed, 12 insertions, 12 deletions
diff --git a/ACE/contrib/minizip/miniunz.c b/ACE/contrib/minizip/miniunz.c
index a78242a16c5..55f82b5c11f 100644
--- a/ACE/contrib/minizip/miniunz.c
+++ b/ACE/contrib/minizip/miniunz.c
@@ -319,7 +319,7 @@ int do_extract_currentfile(uf,popt_extract_without_path,popt_overwrite,password)
printf("The file %s exists. Overwrite ? [y]es, [n]o, [A]ll: ",write_filename);
ret = scanf("%1s",answer);
- if (ret != 1)
+ if (ret != 1)
{
exit(EXIT_FAILURE);
}
@@ -569,7 +569,7 @@ int main(argc,argv)
return do_list(uf);
else if (opt_do_extract==1)
{
- if (opt_extractdir && chdir(dirname))
+ if (opt_extractdir && chdir(dirname))
{
printf("Error changing into %s, aborting\n", dirname);
exit(-1);
diff --git a/ACE/contrib/minizip/mztools.c b/ACE/contrib/minizip/mztools.c
index 1bb1cfb8fc8..9047871b212 100644
--- a/ACE/contrib/minizip/mztools.c
+++ b/ACE/contrib/minizip/mztools.c
@@ -226,17 +226,17 @@ uLong* bytesRecovered;
WRITE_32(header + 12, offsetCD); /* size of CD */
WRITE_32(header + 16, offset); /* offset to CD */
WRITE_16(header + 20, comsize); /* comment */
-
+
/* Header */
if (fwrite(header, 1, 22, fpOutCD) == 22) {
-
+
/* Comment field */
if (comsize > 0) {
if ((int)fwrite(comment, 1, comsize, fpOutCD) != comsize) {
err = Z_ERRNO;
}
}
-
+
} else {
err = Z_ERRNO;
}
@@ -258,14 +258,14 @@ uLong* bytesRecovered;
fclose(fpOutCD);
}
}
-
+
/* Close */
fclose(fpZip);
fclose(fpOut);
-
+
/* Wipe temporary file */
(void)remove(fileOutTmp);
-
+
/* Number of recovered entries */
if (err == Z_OK) {
if (nRecovered != 0) {
diff --git a/ACE/contrib/minizip/unzip.c b/ACE/contrib/minizip/unzip.c
index 171c2281562..14f5621f824 100644
--- a/ACE/contrib/minizip/unzip.c
+++ b/ACE/contrib/minizip/unzip.c
@@ -670,12 +670,12 @@ local int unzlocal_GetCurrentFileInfoInternal (unzFile file,
else
err=UNZ_ERRNO;
}
-
+
if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0))
- {
+ {
if (ZREAD(s->z_filefunc, s->filestream,extraField,uSizeRead)!=uSizeRead)
err=UNZ_ERRNO;
-
+
lSeek += file_info.size_file_extra - uSizeRead;
}
}
diff --git a/ACE/contrib/minizip/zip.c b/ACE/contrib/minizip/zip.c
index b39b9bfd640..a57fcfc61ef 100644
--- a/ACE/contrib/minizip/zip.c
+++ b/ACE/contrib/minizip/zip.c
@@ -944,7 +944,7 @@ extern MINIZIP_EXPORT int zipWriteInFileInZip (zipFile file,const void* buf,unsi
{
uLong uTotalOutBefore = zi->ci.stream.total_out;
err=deflate(&zi->ci.stream, Z_NO_FLUSH);
- zi->ci.pos_in_buffered_data +=
+ zi->ci.pos_in_buffered_data +=
(uInt)(zi->ci.stream.total_out - uTotalOutBefore);
}
else