aboutsummaryrefslogtreecommitdiffstats
path: root/src/core/function/ArchiveFileOperator.cpp
diff options
context:
space:
mode:
authorSaturn&Eric <[email protected]>2022-07-23 14:54:51 +0000
committerGitHub <[email protected]>2022-07-23 14:54:51 +0000
commitb244320b2d228189767aa6d59febceb6b64527fb (patch)
tree179d34e2a3e84231fad72c4bbe9f74673d0b74d0 /src/core/function/ArchiveFileOperator.cpp
parentMerge pull request #68 from saturneric/develop-2.0.8 (diff)
parentfeat(project): add rpm package support (diff)
downloadGpgFrontend-2.0.9.tar.gz
GpgFrontend-2.0.9.zip
Merge pull request #70 from saturneric/dev/2.0.8/saturnericv2.0.9
Develop 2.0.9.1
Diffstat (limited to '')
-rw-r--r--src/core/function/ArchiveFileOperator.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/function/ArchiveFileOperator.cpp b/src/core/function/ArchiveFileOperator.cpp
index 17f29df1..64c7389e 100644
--- a/src/core/function/ArchiveFileOperator.cpp
+++ b/src/core/function/ArchiveFileOperator.cpp
@@ -151,7 +151,8 @@ void GpgFrontend::ArchiveFileOperator::CreateArchive(
#ifdef WINDOWS
auto entry_path =
- QString::fromStdWString(std::wstring(archive_entry_pathname_w(entry))).toUtf8()
+ QString::fromStdWString(std::wstring(archive_entry_pathname_w(entry)))
+ .toUtf8()
.toStdString();
#else
auto entry_path = std::string(archive_entry_pathname_utf8(entry));
@@ -161,7 +162,6 @@ void GpgFrontend::ArchiveFileOperator::CreateArchive(
<< archive_entry_size(entry) << " bytes"
<< "file type" << archive_entry_filetype(entry);
-
r = archive_write_header(a, entry);
if (r < ARCHIVE_OK) {
LOG(ERROR) << "archive_write_header() failed: "
@@ -231,11 +231,11 @@ void GpgFrontend::ArchiveFileOperator::ExtractArchive(
LOG(ERROR) << "cannot read from stdin";
}
#ifdef WINDOWS
- if (archive_read_open_filename_w(a, archive_path.wstring().c_str(),
- 10240) != ARCHIVE_OK) {
+ if (archive_read_open_filename_w(a, archive_path.wstring().c_str(), 10240) !=
+ ARCHIVE_OK) {
#else
- if (archive_read_open_filename(a, archive_path.u8string().c_str(),
- 10240) != ARCHIVE_OK) {
+ if (archive_read_open_filename(a, archive_path.u8string().c_str(), 10240) !=
+ ARCHIVE_OK) {
#endif
LOG(ERROR) << "archive_read_open_filename() failed: "
<< archive_error_string(a);