diff options
author | saturneric <[email protected]> | 2024-12-03 09:42:14 +0000 |
---|---|---|
committer | saturneric <[email protected]> | 2024-12-03 09:42:14 +0000 |
commit | f4525ea80237bbb57ab7e3ab196fb3e85a4b05bb (patch) | |
tree | f0dc58c1e4740f79640fbdadcbf68563ec59b9df /src/core/function/gpg | |
parent | fix: variable 'mods_path' is reassigned a value before the old one has been u... (diff) | |
download | GpgFrontend-f4525ea80237bbb57ab7e3ab196fb3e85a4b05bb.tar.gz GpgFrontend-f4525ea80237bbb57ab7e3ab196fb3e85a4b05bb.zip |
fix: compiler warnings
Diffstat (limited to 'src/core/function/gpg')
-rw-r--r-- | src/core/function/gpg/GpgKeyManager.cpp | 6 | ||||
-rw-r--r-- | src/core/function/gpg/GpgKeyOpera.cpp | 6 | ||||
-rw-r--r-- | src/core/function/gpg/GpgUIDOperator.cpp | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/src/core/function/gpg/GpgKeyManager.cpp b/src/core/function/gpg/GpgKeyManager.cpp index 630b2b0c..d0576e59 100644 --- a/src/core/function/gpg/GpgKeyManager.cpp +++ b/src/core/function/gpg/GpgKeyManager.cpp @@ -173,7 +173,8 @@ auto GpgKeyManager::SetOwnerTrustLevel(const GpgKey& key, } auto GpgKeyManager::DeleteSubkey(const GpgKey& key, int subkey_index) -> bool { - if (subkey_index < 0 || subkey_index >= key.GetSubKeys()->size()) { + if (subkey_index < 0 || + subkey_index >= static_cast<int>(key.GetSubKeys()->size())) { LOG_W() << "illegal subkey index: " << subkey_index; return false; } @@ -258,7 +259,8 @@ auto GpgKeyManager::DeleteSubkey(const GpgKey& key, int subkey_index) -> bool { auto GpgKeyManager::RevokeSubkey(const GpgKey& key, int subkey_index, int reason_code, const QString& reason_text) -> bool { - if (subkey_index < 0 || subkey_index >= key.GetSubKeys()->size()) { + if (subkey_index < 0 || + subkey_index >= static_cast<int>(key.GetSubKeys()->size())) { LOG_W() << "illegal subkey index: " << subkey_index; return false; } diff --git a/src/core/function/gpg/GpgKeyOpera.cpp b/src/core/function/gpg/GpgKeyOpera.cpp index 6898b355..a5346655 100644 --- a/src/core/function/gpg/GpgKeyOpera.cpp +++ b/src/core/function/gpg/GpgKeyOpera.cpp @@ -87,10 +87,12 @@ auto GpgKeyOpera::SetExpire(const GpgKey& key, const SubkeyId& subkey_fpr, err = gpgme_op_setexpire(ctx_.DefaultContext(), static_cast<gpgme_key_t>(key), expires_time, nullptr, 0); + assert(gpg_err_code(err) == GPG_ERR_NO_ERROR); } else { err = gpgme_op_setexpire(ctx_.DefaultContext(), static_cast<gpgme_key_t>(key), expires_time, subkey_fpr.toUtf8(), 0); + assert(gpg_err_code(err) == GPG_ERR_NO_ERROR); } return err; @@ -200,6 +202,7 @@ void GpgKeyOpera::GenerateKey(const std::shared_ptr<GenKeyInfo>& params, err = gpgme_op_createkey(ctx.DefaultContext(), userid.toUtf8(), algo.toUtf8(), 0, expires, nullptr, flags); + assert(gpg_err_code(err) == GPG_ERR_NO_ERROR); if (CheckGpgError(err) == GPG_ERR_NO_ERROR) { data_object->Swap({GpgGenerateKeyResult{ @@ -240,6 +243,7 @@ auto GpgKeyOpera::GenerateKeySync(const std::shared_ptr<GenKeyInfo>& params) err = gpgme_op_createkey(ctx.DefaultContext(), userid.toUtf8(), algo.toUtf8(), 0, expires, nullptr, flags); + assert(gpg_err_code(err) == GPG_ERR_NO_ERROR); if (CheckGpgError(err) == GPG_ERR_NO_ERROR) { data_object->Swap({GpgGenerateKeyResult{ @@ -360,6 +364,7 @@ void GpgKeyOpera::GenerateKeyWithSubkey( err = gpgme_op_createkey(ctx.DefaultContext(), userid, algo, 0, expires, nullptr, flags); + assert(gpg_err_code(err) == GPG_ERR_NO_ERROR); if (CheckGpgError(err) != GPG_ERR_NO_ERROR) { data_object->Swap({GpgGenerateKeyResult{}}); @@ -441,6 +446,7 @@ auto GpgKeyOpera::GenerateKeyWithSubkeySync( err = gpgme_op_createkey(ctx.DefaultContext(), userid, algo, 0, expires, nullptr, flags); + assert(gpg_err_code(err) == GPG_ERR_NO_ERROR); if (CheckGpgError(err) != GPG_ERR_NO_ERROR) { data_object->Swap({GpgGenerateKeyResult{}}); diff --git a/src/core/function/gpg/GpgUIDOperator.cpp b/src/core/function/gpg/GpgUIDOperator.cpp index afcd3bae..3fc506f4 100644 --- a/src/core/function/gpg/GpgUIDOperator.cpp +++ b/src/core/function/gpg/GpgUIDOperator.cpp @@ -59,7 +59,7 @@ auto GpgUIDOperator::AddUID(const GpgKey& key, const QString& name, } auto GpgUIDOperator::DeleteUID(const GpgKey& key, int uid_index) -> bool { - if (uid_index < 2 || uid_index > key.GetUIDs()->size()) { + if (uid_index < 2 || uid_index > static_cast<int>(key.GetUIDs()->size())) { LOG_W() << "illegal uid_index index: " << uid_index; return false; } @@ -144,7 +144,7 @@ auto GpgUIDOperator::DeleteUID(const GpgKey& key, int uid_index) -> bool { auto GpgUIDOperator::RevokeUID(const GpgKey& key, int uid_index, int reason_code, const QString& reason_text) -> bool { - if (uid_index < 2 || uid_index > key.GetUIDs()->size()) { + if (uid_index < 2 || uid_index > static_cast<int>(key.GetUIDs()->size())) { LOG_W() << "illegal uid index: " << uid_index; return false; } |