summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-02-24 02:25:56 +0300
committerAndrei Karas <akaras@inbox.ru>2017-02-24 02:27:16 +0300
commitd71570608f36cfa3d812687cb53e82bdb818caa4 (patch)
tree07a77c8c3ecfcb42aad96ab456feadb86596343b
parentb882d8c240a1667a820adb703d3f7c84dfcd61c2 (diff)
downloadplus-d71570608f36cfa3d812687cb53e82bdb818caa4.tar.gz
plus-d71570608f36cfa3d812687cb53e82bdb818caa4.tar.bz2
plus-d71570608f36cfa3d812687cb53e82bdb818caa4.tar.xz
plus-d71570608f36cfa3d812687cb53e82bdb818caa4.zip
Fix code style.
-rw-r--r--src/fs/zip.cpp12
-rw-r--r--src/fs/ziplocalheader.h2
2 files changed, 8 insertions, 6 deletions
diff --git a/src/fs/zip.cpp b/src/fs/zip.cpp
index 2164a4303..57aa9fc76 100644
--- a/src/fs/zip.cpp
+++ b/src/fs/zip.cpp
@@ -80,7 +80,7 @@ namespace Zip
fseek(arcFile, 14, SEEK_CUR); // + 14
// file header pointer on 18
readVal(&header->compressSize, 4,
- "zip compressed size") // + 4
+ "zip compressed size") // + 4
// file header pointer on 22
// +++ need add endian specific decoding for val32
readVal(&header->uncompressSize, 4,
@@ -115,8 +115,10 @@ namespace Zip
headers.push_back(header);
logger->log(" file name: %s",
header->fileName.c_str());
- logger->log(" compressed size: %u", header->compressSize);
- logger->log(" uncompressed size: %u", header->uncompressSize);
+ logger->log(" compressed size: %u",
+ header->compressSize);
+ logger->log(" uncompressed size: %u",
+ header->uncompressSize);
}
}
else if (buf[0] == 0x50 &&
@@ -126,7 +128,7 @@ namespace Zip
{ // central directory file header
// !!! This is quick way for read zip archives. !!!
// !!! It ignore modified files in archive. !!!
- // ignoring central directory entries because all data already read.
+ // ignoring central directory entries
break;
}
else if (buf[0] == 0x50 &&
@@ -136,7 +138,7 @@ namespace Zip
{ // end of central directory
// !!! This is quick way for read zip archives. !!!
// !!! It ignore modified files in archive. !!!
- // ignoring central directory entries because all data already read.
+ // ignoring end of central directory
break;
}
else
diff --git a/src/fs/ziplocalheader.h b/src/fs/ziplocalheader.h
index 1b00c3b54..68bebaa06 100644
--- a/src/fs/ziplocalheader.h
+++ b/src/fs/ziplocalheader.h
@@ -25,7 +25,7 @@
#include <string>
-struct ZipLocalHeader
+struct ZipLocalHeader final
{
ZipLocalHeader() :
archiveName(),