GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cpp: Factor out common code of GpgME::engineInfo() overloads

Browse Source 
* lang/cpp/src/context.cpp (get_engine_info, get_static_engine_info):
New.
(GpgME::engineInfo(GpgME::Protocol), GpgME::engineInfo(GpgME::Engine)):
Use get_static_engine_info().
--

GnuPG-bug-id: 5722
This commit is contained in:
Ingo Klöcker 2021-12-07 11:07:13 +01:00
parent b8b49c11e9
commit 1a1e914587
1 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
lang/cpp/src/context.cpp
View File

@ -462,6 +462,30 @@ Error Context::setLocale(int cat, const char *val)
return Error(d->lasterr = gpgme_set_locale(d->ctx, cat, val)); return Error(d->lasterr = gpgme_set_locale(d->ctx, cat, val));
} }
static GpgME::EngineInfo get_engine_info(gpgme_engine_info_t engineInfos, gpgme_protocol_t protocol)
{
if (!engineInfos) {
return EngineInfo{};
}
for (gpgme_engine_info_t i = engineInfos ; i ; i = i->next) {
if (i->protocol == protocol) {
return EngineInfo{i};
}
}
return EngineInfo{};
}
static GpgME::EngineInfo get_static_engine_info(gpgme_protocol_t protocol)
{
gpgme_engine_info_t ei = nullptr;
if (gpgme_get_engine_info(&ei)) {
return EngineInfo{};
}
return get_engine_info(ei, protocol);
}
EngineInfo Context::engineInfo() const EngineInfo Context::engineInfo() const
{ {
return EngineInfo(gpgme_ctx_get_engine_info(d->ctx)); return EngineInfo(gpgme_ctx_get_engine_info(d->ctx));
@ -1794,20 +1818,7 @@ GpgME::Error GpgME::setDefaultLocale(int cat, const char *val)
GpgME::EngineInfo GpgME::engineInfo(GpgME::Protocol proto) GpgME::EngineInfo GpgME::engineInfo(GpgME::Protocol proto)
{ {
gpgme_engine_info_t ei = nullptr; return get_static_engine_info(proto == CMS ? GPGME_PROTOCOL_CMS : GPGME_PROTOCOL_OpenPGP);
if (gpgme_get_engine_info(&ei)) {
return EngineInfo();
}
const gpgme_protocol_t p = proto == CMS ? GPGME_PROTOCOL_CMS : GPGME_PROTOCOL_OpenPGP ;
for (gpgme_engine_info_t i = ei ; i ; i = i->next) {
if (i->protocol == p) {
return EngineInfo(i);
}
}
return EngineInfo();
} }
const char *GpgME::dirInfo(const char *what) const char *GpgME::dirInfo(const char *what)
@ -1845,20 +1856,7 @@ static gpgme_protocol_t engine2protocol(const GpgME::Engine engine)
GpgME::EngineInfo GpgME::engineInfo(GpgME::Engine engine) GpgME::EngineInfo GpgME::engineInfo(GpgME::Engine engine)
{ {
gpgme_engine_info_t ei = nullptr; return get_static_engine_info(engine2protocol(engine));
if (gpgme_get_engine_info(&ei)) {
return EngineInfo();
}
const gpgme_protocol_t p = engine2protocol(engine);
for (gpgme_engine_info_t i = ei ; i ; i = i->next) {
if (i->protocol == p) {
return EngineInfo(i);
}
}
return EngineInfo();
} }
GpgME::Error GpgME::checkEngine(GpgME::Engine engine) GpgME::Error GpgME::checkEngine(GpgME::Engine engine)