eliminate LoadOpenGPGPublicKey wrapper

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>

4 files changed, 4 insertions, 11 deletions

diff --git a/src/daemon/Daemon.cpp b/src/daemon/Daemon.cpp
index 3941b484..b7024296 100644
--- a/src/daemon/Daemon.cpp
+++ b/src/daemon/Daemon.cpp
@@ -272,7 +272,8 @@ static int SetUpMW()
     set_string_t::iterator it_k = g_settings_setOpenGPGPublicKeys.begin();
     for (; it_k != g_settings_setOpenGPGPublicKeys.end(); it_k++)
     {
-        LoadOpenGPGPublicKey(it_k->c_str());
+        VERB1 log("Loading GPG key '%s'", it_k->c_str());
+        rpm_load_gpgkey(it_k->c_str());
     }
     VERB1 log("Adding actions or reporters");
     vector_pair_string_string_t::iterator it_ar = g_settings_vectorActionsAndReporters.begin();
diff --git a/src/daemon/MiddleWare.cpp b/src/daemon/MiddleWare.cpp
index 94b38929..73959102 100644
--- a/src/daemon/MiddleWare.cpp
+++ b/src/daemon/MiddleWare.cpp
@@ -19,7 +19,7 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 #include <fnmatch.h>
-#include <algorithm>
+#include <algorithm>  /* for std::find */
 #include "abrtlib.h"
 #include "Daemon.h"
 #include "Settings.h"
@@ -638,12 +638,6 @@ static bool is_debug_dump_saved(long uid, const char *debug_dump_dir)
     return found;
 }
 
-void LoadOpenGPGPublicKey(const char* key)
-{
-    VERB1 log("Loading GPG key '%s'", key);
-    rpm_load_gpgkey(key);
-}
-
 /**
  * Returns the first full path argument in the command line or NULL.
  * Skips options are in form "-XXX".
diff --git a/src/daemon/MiddleWare.h b/src/daemon/MiddleWare.h
index ac998872..70bfd999 100644
--- a/src/daemon/MiddleWare.h
+++ b/src/daemon/MiddleWare.h
@@ -50,8 +50,6 @@ typedef enum {
 } report_status_items_t;
 
 
-void LoadOpenGPGPublicKey(const char* key);
-
 /**
  * Takes care of getting all additional data needed
  * for computing UUIDs and creating a report for particular analyzer
diff --git a/src/daemon/Settings.cpp b/src/daemon/Settings.cpp
index 6e0a82a5..a77e482b 100644
--- a/src/daemon/Settings.cpp
+++ b/src/daemon/Settings.cpp
@@ -501,7 +501,7 @@ int LoadSettings()
     if (err == 0)
     {
         /*
-         * loading gpg keys will invoke LoadOpenGPGPublicKey() from rpm.cpp
+         * loading gpg keys will invoke rpm_load_gpgkey() from rpm.cpp
          * pgpReadPkts which makes nss to re-init and thus makes
          * bugzilla plugin work :-/
          */