removal of C++isms from libabrt, part 2

This patch rewrites a few places where we use C++ strings

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

8 files changed, 24 insertions, 76 deletions

diff --git a/src/daemon/MiddleWare.cpp b/src/daemon/MiddleWare.cpp
index 7135a50a..51f7929d 100644
--- a/src/daemon/MiddleWare.cpp
+++ b/src/daemon/MiddleWare.cpp
@@ -230,19 +230,23 @@ report_status_t Report(crash_data_t *client_report,
     }
 
     // Is it allowed for this user to report?
-    if (caller_uid != 0   // not called by root
-     && strcmp(to_string(caller_uid).c_str(), get_crash_item_content_or_die(stored_report, FILENAME_UID)) != 0
-    ) {
-        const char *inform_all = get_crash_item_content_or_NULL(stored_report, FILENAME_INFORMALL);
-        if (!inform_all || !string_to_bool(inform_all))
+    if (caller_uid != 0)   // not called by root
+    {
+        char caller_uid_str[sizeof(long)*3 + 2];
+        sprintf(caller_uid_str, "%ld", caller_uid);
+        if (strcmp(caller_uid_str, get_crash_item_content_or_die(stored_report, FILENAME_UID)) != 0)
         {
-            free_crash_data(stored_report);
-            char *errmsg = xasprintf("user with uid %ld can't report crash %s", caller_uid, dump_dir_name);
-            update_client("Reporting error: %s", errmsg);
-            ret[""].push_back("0");      // REPORT_STATUS_IDX_FLAG
-            ret[""].push_back(errmsg); // REPORT_STATUS_IDX_MSG
-            free(errmsg);
-            return ret;
+            const char *inform_all = get_crash_item_content_or_NULL(stored_report, FILENAME_INFORMALL);
+            if (!inform_all || !string_to_bool(inform_all))
+            {
+                free_crash_data(stored_report);
+                char *errmsg = xasprintf("user with uid %ld can't report crash %s", caller_uid, dump_dir_name);
+                update_client("Reporting error: %s", errmsg);
+                ret[""].push_back("0");      // REPORT_STATUS_IDX_FLAG
+                ret[""].push_back(errmsg); // REPORT_STATUS_IDX_MSG
+                free(errmsg);
+                return ret;
+            }
         }
     }
 
diff --git a/src/include/abrtlib.h b/src/include/abrtlib.h
index f3a5de4e..d8dd361a 100644
--- a/src/include/abrtlib.h
+++ b/src/include/abrtlib.h
@@ -245,16 +245,6 @@ bool load_conf_file(const char *pPath, map_string_h *settings, bool skipKeysWith
 
 /* C++ style stuff */
 #ifdef __cplusplus
-std::string unsigned_to_string(unsigned long long x);
-std::string signed_to_string(long long x);
-template <class T> inline
-std::string to_string(T x)
-{
-    if ((T)~(T)0 < (T)0) /* T is a signed type */
-        return signed_to_string(x);
-    return unsigned_to_string(x);
-}
-
 // TODO: npajkovs: full rewrite ssprintf -> xasprintf
 static inline std::string ssprintf(const char *format, ...)
 {
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 8212ebf7..9f828cc9 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -29,7 +29,7 @@ libabrt_la_SOURCES = \
     overlapping_strcpy.c \
     skip_whitespace.c \
     strbuf.c strbuf.h \
-    xatonum.c numtoa.cpp \
+    xatonum.c \
     spawn.c \
     dirsize.c \
     dump_dir.c \
diff --git a/src/lib/create_crash_dump_dir.cpp b/src/lib/create_crash_dump_dir.cpp
index c3125db6..e05d1d9d 100644
--- a/src/lib/create_crash_dump_dir.cpp
+++ b/src/lib/create_crash_dump_dir.cpp
@@ -19,8 +19,6 @@
 
 #include "abrtlib.h"
 
-using namespace std;
-
 struct dump_dir *create_crash_dump_dir(crash_data_t *crash_data)
 {
     char *path = xasprintf(LOCALSTATEDIR"/run/abrt/tmp-%lu-%lu", (long)getpid(), (long)time(NULL));
diff --git a/src/lib/make_descr.cpp b/src/lib/make_descr.cpp
index 9234fc98..e4d678c5 100644
--- a/src/lib/make_descr.cpp
+++ b/src/lib/make_descr.cpp
@@ -19,9 +19,6 @@
 #include "abrtlib.h"
 #include "abrt_crash_dump.h"
 
-
-using namespace std;
-
 // caller is responsible for freeing **dsc
 static void add_content(bool *was_multiline, char **dsc, const char *header, const char *content)
 {
diff --git a/src/lib/numtoa.cpp b/src/lib/numtoa.cpp
deleted file mode 100644
index 061da553..00000000
--- a/src/lib/numtoa.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-    Number to string conversions
-
-    Copyright (C) 2010  ABRT team
-    Copyright (C) 2010  RedHat inc.
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-#include "abrtlib.h"
-
-std::string unsigned_to_string(unsigned long long x)
-{
-	char buf[sizeof(x)*3];
-	sprintf(buf, "%llu", x);
-	return buf;
-}
-std::string signed_to_string(long long x)
-{
-	char buf[sizeof(x)*3];
-	sprintf(buf, "%lld", x);
-	return buf;
-}
diff --git a/src/plugins/CCpp.cpp b/src/plugins/CCpp.cpp
index 11968349..19860290 100644
--- a/src/plugins/CCpp.cpp
+++ b/src/plugins/CCpp.cpp
@@ -258,17 +258,6 @@ void CAnalyzerCCpp::SetSettings(const map_plugin_settings_t& pSettings)
     }
 }
 
-//ok to delete?
-//const map_plugin_settings_t& CAnalyzerCCpp::GetSettings()
-//{
-//    m_pSettings["MemoryMap"] = m_bMemoryMap ? "yes" : "no";
-//    m_pSettings["DebugInfo"] = m_sDebugInfo;
-//    m_pSettings["DebugInfoCacheMB"] = to_string(m_nDebugInfoCacheMB);
-//    m_pSettings["InstallDebugInfo"] = m_bInstallDebugInfo ? "yes" : "no";
-//
-//    return m_pSettings;
-//}
-
 PLUGIN_INFO(ANALYZER,
             CAnalyzerCCpp,
             "CCpp",
diff --git a/src/plugins/abrt-action-bugzilla.cpp b/src/plugins/abrt-action-bugzilla.cpp
index 8486662d..d1bd271a 100644
--- a/src/plugins/abrt-action-bugzilla.cpp
+++ b/src/plugins/abrt-action-bugzilla.cpp
@@ -567,7 +567,9 @@ int ctx::add_attachments(const char* bug_id_str, crash_data_t *crash_data)
 
 int ctx::get_bug_info(struct bug_info* bz, xmlrpc_int32 bug_id)
 {
-    xmlrpc_value* result = call("bugzilla.getBug", "(s)", to_string(bug_id).c_str());
+    char bug_id_str[sizeof(long)*3 + 2];
+    sprintf(bug_id_str, "%lu", (long)bug_id);
+    xmlrpc_value* result = call("bugzilla.getBug", "(s)", bug_id_str);
     if (!result)
         return -1;
 
@@ -772,8 +774,10 @@ static void report_to_bugzilla(
             error_msg_and_die(_("Bugzilla entry creation failed"));
         }
 
-        log("Adding attachments to bug %d...", bug_id);
-        int ret = bz_server.add_attachments(to_string(bug_id).c_str(), crash_data);
+        log("Adding attachments to bug %ld...", (long)bug_id);
+        char bug_id_str[sizeof(long)*3 + 2];
+        sprintf(bug_id_str, "%ld", (long) bug_id);
+        int ret = bz_server.add_attachments(bug_id_str, crash_data);
         if (ret == -1)
         {
             throw_if_xml_fault_occurred(&bz_server.env);