Make choose_sig_format a static member of Config rather than

a standalone function.

1 files changed, 4 insertions, 11 deletions

diff --git a/include/config.h b/include/config.h
index 61a22d46d..0b28cb848 100644
--- a/include/config.h
+++ b/include/config.h
@@ -34,6 +34,10 @@ class Config
       std::string option(const std::string&) const;
 
       void load_inifile(const std::string&);
+
+      static void choose_sig_format(const std::string&, std::string&,
+                                    Signature_Format&);
+
    private:
       std::map<std::string, std::string> settings;
    };
@@ -43,17 +47,6 @@ class Config
 *************************************************/
 Config& global_config();
 
-namespace ConfigXXX {
-
-/*************************************************
-* Choose the signature format for a PK algorithm *
-*************************************************/
-void choose_sig_format(const std::string&, std::string&, Signature_Format&);
-void choose_sig_format(const std::string&, std::string&, std::string&,
-                       Signature_Format&);
-
-}
-
 }
 
 #endif