1edc1be941
gpgme 1.7.0 OBS-URL: https://build.opensuse.org/request/show/430543 OBS-URL: https://build.opensuse.org/package/show/Base:System/gpgme?expand=0&rev=67
69 lines
2.1 KiB
Diff
69 lines
2.1 KiB
Diff
From ae324b51ffa338b891387bff2657d60c1fd3ae40 Mon Sep 17 00:00:00 2001
|
|
From: Andreas Stieger <astieger@suse.com>
|
|
Date: Wed, 21 Sep 2016 14:28:23 +0200
|
|
Subject: [PATCH] cpp: Avoid missing returns in non-void functions
|
|
|
|
* lang/cpp/src/context.cpp
|
|
(Context::signaturePolicyURL): return nullptr on default
|
|
(to_tofu_policy_t): add default case for unknown
|
|
* lang/cpp/src/key.cpp
|
|
(Key::primaryFingerprint): return nullptr on default
|
|
* lang/cpp/src/tofuinfo.cpp
|
|
(GpgME::TofuInfo::policy): add default case for unknown
|
|
|
|
Signed-off-by: Andreas Stieger <astieger@suse.com>
|
|
Signed-off-by: Andre Heinecke <aheinecke@intevation.de>
|
|
---
|
|
lang/cpp/src/context.cpp | 2 ++
|
|
lang/cpp/src/key.cpp | 1 +
|
|
lang/cpp/src/tofuinfo.cpp | 1 +
|
|
3 files changed, 4 insertions(+)
|
|
|
|
diff --git a/lang/cpp/src/context.cpp b/lang/cpp/src/context.cpp
|
|
index 00f397b..43a73b1 100644
|
|
--- a/lang/cpp/src/context.cpp
|
|
+++ b/lang/cpp/src/context.cpp
|
|
@@ -1051,6 +1051,7 @@ const char *Context::signaturePolicyURL() const
|
|
return n->value;
|
|
}
|
|
}
|
|
+ return nullptr;
|
|
}
|
|
|
|
Notation Context::signatureNotation(unsigned int idx) const
|
|
@@ -1344,6 +1345,7 @@ static gpgme_tofu_policy_t to_tofu_policy_t(unsigned int policy)
|
|
case TofuInfo::PolicyAsk:
|
|
return GPGME_TOFU_POLICY_ASK;
|
|
case TofuInfo::PolicyUnknown:
|
|
+ default:
|
|
return GPGME_TOFU_POLICY_UNKNOWN;
|
|
}
|
|
}
|
|
diff --git a/lang/cpp/src/key.cpp b/lang/cpp/src/key.cpp
|
|
index cfa1ba3..a56f77c 100644
|
|
--- a/lang/cpp/src/key.cpp
|
|
+++ b/lang/cpp/src/key.cpp
|
|
@@ -273,6 +273,7 @@ const char *Key::primaryFingerprint() const
|
|
/* Return the first subkeys fingerprint */
|
|
return key->subkeys->fpr;
|
|
}
|
|
+ return nullptr;
|
|
}
|
|
|
|
unsigned int Key::keyListMode() const
|
|
diff --git a/lang/cpp/src/tofuinfo.cpp b/lang/cpp/src/tofuinfo.cpp
|
|
index bb67fc8..e661b3b 100644
|
|
--- a/lang/cpp/src/tofuinfo.cpp
|
|
+++ b/lang/cpp/src/tofuinfo.cpp
|
|
@@ -109,6 +109,7 @@ GpgME::TofuInfo::Policy GpgME::TofuInfo::policy() const
|
|
case GPGME_TOFU_POLICY_ASK:
|
|
return PolicyAsk;
|
|
case GPGME_TOFU_POLICY_UNKNOWN:
|
|
+ default:
|
|
return PolicyUnknown;
|
|
}
|
|
}
|
|
--
|
|
2.6.6
|
|
|