summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-02-25 21:44:35 +0300
committerAndrei Karas <akaras@inbox.ru>2017-02-25 21:45:13 +0300
commit98cfc99ce4d9fb8d7f03780d8d09513013ec9bdd (patch)
treef046aa56efaf5d8a7d5dce4a8887ee1decb4c531
parente6198149823ee18e4167b0e6dd34cfb7f2e2f496 (diff)
downloadplus-98cfc99ce4d9fb8d7f03780d8d09513013ec9bdd.tar.gz
plus-98cfc99ce4d9fb8d7f03780d8d09513013ec9bdd.tar.bz2
plus-98cfc99ce4d9fb8d7f03780d8d09513013ec9bdd.tar.xz
plus-98cfc99ce4d9fb8d7f03780d8d09513013ec9bdd.zip
Fix code style.
-rw-r--r--src/fs/virtfszip.cpp6
-rw-r--r--src/fs/virtfszip_unittest.cc3
-rw-r--r--src/fs/virtzipentry.h2
-rw-r--r--src/fs/ziplocalheader.cpp2
4 files changed, 9 insertions, 4 deletions
diff --git a/src/fs/virtfszip.cpp b/src/fs/virtfszip.cpp
index d980a56b6..fe75c0192 100644
--- a/src/fs/virtfszip.cpp
+++ b/src/fs/virtfszip.cpp
@@ -81,7 +81,8 @@ namespace VirtFsZip
}
if (findLast(newDir, ".zip") == false)
{
- reportAlways("Called VirtFsZip::addToSearchPath without zip archive");
+ reportAlways("Called VirtFsZip::addToSearchPath without "
+ "zip archive");
return false;
}
VirtZipEntry *entry = VirtFsZip::searchEntryByArchive(newDir);
@@ -120,7 +121,8 @@ namespace VirtFsZip
}
if (findLast(newDir, ".zip") == false)
{
- reportAlways("Called VirtFsZip::addToSearchPath without zip archive");
+ reportAlways("Called VirtFsZip::addToSearchPath without "
+ "zip archive");
return false;
}
VirtZipEntry *entry = VirtFsZip::searchEntryByArchive(newDir);
diff --git a/src/fs/virtfszip_unittest.cc b/src/fs/virtfszip_unittest.cc
index 376f26380..1182ea53b 100644
--- a/src/fs/virtfszip_unittest.cc
+++ b/src/fs/virtfszip_unittest.cc
@@ -229,7 +229,8 @@ TEST_CASE("VirtFsZip removeFromSearchPath")
REQUIRE(VirtFsZip::addToSearchPathSilent(prefix + "test.zip",
Append_true));
REQUIRE(VirtFsZip::getEntries().size() == 1);
- REQUIRE(VirtFsZip::getEntries()[0]->mArchiveName == prefix + "test.zip");
+ REQUIRE(VirtFsZip::getEntries()[0]->mArchiveName ==
+ prefix + "test.zip");
}
VirtFsZip::deinit();
diff --git a/src/fs/virtzipentry.h b/src/fs/virtzipentry.h
index ba3bd2d9f..fac36cc2d 100644
--- a/src/fs/virtzipentry.h
+++ b/src/fs/virtzipentry.h
@@ -30,7 +30,7 @@ struct ZipLocalHeader;
struct VirtZipEntry final
{
- VirtZipEntry(const std::string &restrict archiveName);
+ explicit VirtZipEntry(const std::string &restrict archiveName);
A_DELETE_COPY(VirtZipEntry)
diff --git a/src/fs/ziplocalheader.cpp b/src/fs/ziplocalheader.cpp
index 7bb869624..8af552b0d 100644
--- a/src/fs/ziplocalheader.cpp
+++ b/src/fs/ziplocalheader.cpp
@@ -26,6 +26,8 @@
#include <string>
+#include "debug.h"
+
ZipLocalHeader::ZipLocalHeader() :
fileName(),
zipEntry(nullptr),