remove unused function parse_args; make a few functions extern "C"

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

5 files changed, 9 insertions, 71 deletions

diff --git a/src/cli/report.cpp b/src/cli/report.cpp
index 9ee37576..4c38e852 100644
--- a/src/cli/report.cpp
+++ b/src/cli/report.cpp
@@ -505,13 +505,13 @@ static GHashTable *get_reporter_plugin_settings(const vector_string_t& reporters
 
     for (vector_string_t::const_iterator it = reporters.begin(); it != reporters.end(); ++it)
     {
-        map_string_t *single_plugin_settings =  new map_string_t;
+        map_string_t *single_plugin_settings = new map_string_t;
         *single_plugin_settings = call_GetPluginSettings(it->c_str());
 
         // Copy the received settings as defaults.
         // Plugins won't work without it, if some value is missing
         // they use their default values for all fields.
-        g_hash_table_replace(settings, xstrdup(it->c_str()), (void*)single_plugin_settings);
+        g_hash_table_replace(settings, xstrdup(it->c_str()), single_plugin_settings);
     }
 
     /* Second, load user-specific settings, which override
diff --git a/src/include/abrtlib.h b/src/include/abrtlib.h
index 1fadd31a..a4337709 100644
--- a/src/include/abrtlib.h
+++ b/src/include/abrtlib.h
@@ -217,6 +217,13 @@ char* get_cmdline(pid_t pid);
 /* Returns 1 if abrtd daemon is running, 0 otherwise. */
 int daemon_is_ok();
 
+char* make_description_bz(crash_data_t *crash_data);
+char* make_description_reproduce_comment(crash_data_t *crash_data);
+char* make_description_logger(crash_data_t *crash_data);
+char* make_description_mailx(crash_data_t *crash_data);
+
+void parse_release(const char *pRelease, char **product, char **version);
+
 #ifdef __cplusplus
 }
 #endif
@@ -234,14 +241,6 @@ std::string to_string(T x)
     return unsigned_to_string(x);
 }
 
-void parse_args(const char *psArgs, vector_string_t& pArgs, int quote = -1);
-void parse_release(const char *pRelease, char **product, char **version);
-
-char* make_description_bz(crash_data_t *crash_data);
-char* make_description_reproduce_comment(crash_data_t *crash_data);
-char* make_description_logger(crash_data_t *crash_data);
-char* make_description_mailx(crash_data_t *crash_data);
-
 /**
  * Loads settings and stores it in second parameter. On success it
  * returns true, otherwise returns false.
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index cfcb9947..015632fd 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -28,7 +28,6 @@ libabrt_la_SOURCES = \
     append_to_malloced_string.c \
     overlapping_strcpy.c \
     skip_whitespace.c \
-    stringops.cpp \
     strbuf.c strbuf.h \
     xatonum.c numtoa.cpp \
     spawn.c \
diff --git a/src/lib/stringops.cpp b/src/lib/stringops.cpp
deleted file mode 100644
index 7bc5413f..00000000
--- a/src/lib/stringops.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-    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"
-
-void parse_args(const char *psArgs, vector_string_t& pArgs, int quote)
-{
-    unsigned ii;
-    bool inside_quotes = false;
-    std::string item;
-
-    for (ii = 0; psArgs[ii]; ii++)
-    {
-        if (quote != -1)
-        {
-            if (psArgs[ii] == quote)
-            {
-                inside_quotes = !inside_quotes;
-                continue;
-            }
-            /* inside quotes we support escaping with \x */
-            if (inside_quotes && psArgs[ii] == '\\' && psArgs[ii+1])
-            {
-                ii++;
-                item += psArgs[ii];
-                continue;
-            }
-        }
-        if (psArgs[ii] == ',' && !inside_quotes)
-        {
-            pArgs.push_back(item);
-            item.clear();
-            continue;
-        }
-        item += psArgs[ii];
-    }
-
-    if (item.size() != 0)
-    {
-        pArgs.push_back(item);
-    }
-}
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index fb91fc1e..9ace1b3f 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -218,7 +218,6 @@ abrt_action_upload_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_action_upload_LDFLAGS = -ltar
-# Needs libABRTdUtils only for LoadPluginSettings
 abrt_action_upload_LDADD = \
     $(GLIB_LIBS) \
     $(CURL_LIBS) \
@@ -240,7 +239,6 @@ abrt_action_kerneloops_CPPFLAGS = \
     $(GLIB_CFLAGS) \
     -D_GNU_SOURCE \
     -Wall -Werror
-# libABRTdUtils is used only because of LoadPluginSettings:
 abrt_action_kerneloops_LDADD = \
     ../lib/libabrt_web.la \
     ../lib/libabrt.la
@@ -280,7 +278,6 @@ abrt_action_print_CPPFLAGS = \
     $(GLIB_CFLAGS) \
     -D_GNU_SOURCE \
     -Wall -Werror
-# libABRTdUtils is used only because of make_description_logger:
 abrt_action_print_LDADD = \
     ../lib/libabrt.la