diff options
| -rw-r--r-- | .github/workflows/release.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/testing-nightly.yml | 2 | ||||
| -rw-r--r-- | src/core/function/gpg/GpgCommandExecutor.cpp | 4 | ||||
| -rw-r--r-- | src/core/function/gpg/GpgSmartCardManager.cpp | 7 |
4 files changed, 8 insertions, 7 deletions
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f370a60e..4fd609cc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -114,7 +114,7 @@ jobs: - name: Set up MinGW (Windows) uses: msys2/setup-msys2@v2 with: - update: true + update: false release: false cache: true install: >- diff --git a/.github/workflows/testing-nightly.yml b/.github/workflows/testing-nightly.yml index 20c65b15..48345824 100644 --- a/.github/workflows/testing-nightly.yml +++ b/.github/workflows/testing-nightly.yml @@ -107,7 +107,7 @@ jobs: - name: Set up MinGW (Windows) uses: msys2/setup-msys2@v2 with: - update: true + update: false release: false cache: true install: >- diff --git a/src/core/function/gpg/GpgCommandExecutor.cpp b/src/core/function/gpg/GpgCommandExecutor.cpp index 191c1259..dd8a500e 100644 --- a/src/core/function/gpg/GpgCommandExecutor.cpp +++ b/src/core/function/gpg/GpgCommandExecutor.cpp @@ -64,8 +64,8 @@ auto BuildTaskFromExecCtx(const GpgCommandExecutor::ExecuteContext &context) Thread::Task::TaskRunnable runner = [](const DataObjectPtr &data_object) -> int { - FLOG_D("process runner called, data object size: %lu", - data_object->GetObjectSize()); + LOG_D() << "process runner called, data object size:" + << data_object->GetObjectSize(); if (!data_object->Check<QString, QStringList, GpgCommandExecutorInterator, GpgCommandExecutorCallback>()) { diff --git a/src/core/function/gpg/GpgSmartCardManager.cpp b/src/core/function/gpg/GpgSmartCardManager.cpp index b4b660cf..4c55b63d 100644 --- a/src/core/function/gpg/GpgSmartCardManager.cpp +++ b/src/core/function/gpg/GpgSmartCardManager.cpp @@ -182,9 +182,10 @@ auto PercentDataEscape(const QByteArray& data, bool plus_escape = false, if (!prefix.isEmpty()) { for (QChar ch : prefix) { if (ch == '%' || ch.unicode() < 0x20) { - result += QString("%%%1") - .arg(ch.unicode(), 2, 16, QLatin1Char('0')) - .toUpper(); + result += + QString("%%%1") + .arg(static_cast<int>(ch.unicode()), 2, 16, QLatin1Char('0')) + .toUpper(); } else { result += ch; } |