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>

4 files changed, 1 insertions, 40 deletions

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;
-}