remove C++-ism ssprintf from abrtlib.h

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

4 files changed, 23 insertions, 28 deletions

diff --git a/src/daemon/PluginManager.cpp b/src/daemon/PluginManager.cpp
index 161256c5..e6059583 100644
--- a/src/daemon/PluginManager.cpp
+++ b/src/daemon/PluginManager.cpp
@@ -131,10 +131,11 @@ CPlugin* CPluginManager::LoadPlugin(const char *pName, bool enabled_only)
         /* Kerneloops{,Scanner,Reporter} share the same .conf file */
         conf_name = "Kerneloops";
     }
-    string conf_fullname = ssprintf(PLUGINS_CONF_DIR"/%s."PLUGINS_CONF_EXTENSION, conf_name);
+    char *conf_fullname = xasprintf(PLUGINS_CONF_DIR"/%s."PLUGINS_CONF_EXTENSION, conf_name);
     map_string_h *pluginSettings = new_map_string();
-    if (load_conf_file(conf_fullname.c_str(), pluginSettings, /*skip key w/o values:*/ true))
+    if (load_conf_file(conf_fullname, pluginSettings, /*skip key w/o values:*/ true))
         VERB3 log("Loaded %s.conf", conf_name);
+    free(conf_fullname);
 
     if (enabled_only)
     {
@@ -154,14 +155,16 @@ CPlugin* CPluginManager::LoadPlugin(const char *pName, bool enabled_only)
         }
     }
 
-    string libPath = ssprintf(PLUGINS_LIB_DIR"/"PLUGINS_LIB_PREFIX"%s."PLUGINS_LIB_EXTENSION, pName);
-    void *handle = dlopen(libPath.c_str(), RTLD_NOW);
+    char *libPath = xasprintf(PLUGINS_LIB_DIR"/"PLUGINS_LIB_PREFIX"%s."PLUGINS_LIB_EXTENSION, pName);
+    void *handle = dlopen(libPath, RTLD_NOW);
     if (!handle)
     {
-        error_msg("Can't load '%s': %s", libPath.c_str(), dlerror());
+        error_msg("Can't load '%s': %s", libPath, dlerror());
+        free(libPath);
         free_map_string(pluginSettings);
         return NULL; /* error */
     }
+    free(libPath);
     CLoadedModule *module = new CLoadedModule(handle, pName);
     if (module->GetMagicNumber() != PLUGINS_MAGIC_NUMBER
      || module->GetType() < 0
diff --git a/src/include/abrtlib.h b/src/include/abrtlib.h
index 9f428486..88e52fff 100644
--- a/src/include/abrtlib.h
+++ b/src/include/abrtlib.h
@@ -283,23 +283,4 @@ bool load_conf_file(const char *pPath, map_string_h *settings, bool skipKeysWith
 }
 #endif
 
-
-/* C++ style stuff */
-#ifdef __cplusplus
-// TODO: npajkovs: full rewrite ssprintf -> xasprintf
-static inline std::string ssprintf(const char *format, ...)
-{
-    va_list p;
-    char *string_ptr;
-
-    va_start(p, format);
-    string_ptr = xvasprintf(format, p);
-    va_end(p);
-
-    std::string res = string_ptr;
-    free(string_ptr);
-    return res;
-}
-#endif
-
 #endif
diff --git a/src/lib/abrt_dbus.h b/src/lib/abrt_dbus.h
index 2f32b26f..d8cc3aa8 100644
--- a/src/lib/abrt_dbus.h
+++ b/src/lib/abrt_dbus.h
@@ -125,6 +125,20 @@ int load_vector_of_crash_data(DBusMessageIter* iter, vector_of_crash_data_t **va
  * Helpers for building DBus messages
  */
 
+static inline std::string ssprintf(const char *format, ...)
+{
+    va_list p;
+    char *string_ptr;
+
+    va_start(p, format);
+    string_ptr = xvasprintf(format, p);
+    va_end(p);
+
+    std::string res = string_ptr;
+    free(string_ptr);
+    return res;
+}
+
 //static inline void store_val(DBusMessageIter* iter, bool val)               { store_bool(iter, val); }
 static inline void store_val(DBusMessageIter* iter, int32_t val)            { store_int32(iter, val); }
 static inline void store_val(DBusMessageIter* iter, uint32_t val)           { store_uint32(iter, val); }
diff --git a/src/lib/abrt_xmlrpc.cpp b/src/lib/abrt_xmlrpc.cpp
index 62748e29..e2b8674c 100644
--- a/src/lib/abrt_xmlrpc.cpp
+++ b/src/lib/abrt_xmlrpc.cpp
@@ -21,10 +21,7 @@
 
 void throw_xml_fault(xmlrpc_env *env)
 {
-    std::string errmsg = ssprintf("XML-RPC Fault(%d): %s", env->fault_code, env->fault_string);
-    xmlrpc_env_clean(env); // this is needed ONLY if fault_occurred
-    xmlrpc_env_init(env); // just in case user catches ex and _continues_ to use env
-    error_msg_and_die("%s", errmsg.c_str()); // show error in daemon log
+    error_msg_and_die("XML-RPC Fault(%d): %s", env->fault_code, env->fault_string);
 }
 
 void throw_if_xml_fault_occurred(xmlrpc_env *env)