summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDenys Vlasenko <dvlasenk@redhat.com>2010-12-09 14:17:52 +0100
committerDenys Vlasenko <dvlasenk@redhat.com>2010-12-09 14:17:52 +0100
commitdeabb987d709ef8512d61d41e44bcb77c3f5bff6 (patch)
tree6d64c0cf295946cdece555ee3f644e947b4900a2 /src
parent6afce866d57432a53938479455ec7bbcb89bab8d (diff)
downloadabrt-deabb987d709ef8512d61d41e44bcb77c3f5bff6.tar.gz
abrt-deabb987d709ef8512d61d41e44bcb77c3f5bff6.tar.xz
abrt-deabb987d709ef8512d61d41e44bcb77c3f5bff6.zip
rename a few more files from .cpp to .c
Renamed files: KerneloopsSysLog.c abrt-action-rhtsupport.c abrt-action-upload.c abrt-action-kerneloops.c abrt-action-mailx.c abrt-action-print.c Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Diffstat (limited to 'src')
-rw-r--r--src/lib/abrt_xmlrpc.h12
-rw-r--r--src/plugins/KerneloopsSysLog.c (renamed from src/plugins/KerneloopsSysLog.cpp)4
-rw-r--r--src/plugins/Makefile.am17
-rw-r--r--src/plugins/abrt-action-kerneloops.c (renamed from src/plugins/abrt-action-kerneloops.cpp)0
-rw-r--r--src/plugins/abrt-action-mailx.c (renamed from src/plugins/abrt-action-mailx.cpp)20
-rw-r--r--src/plugins/abrt-action-print.c (renamed from src/plugins/abrt-action-print.cpp)0
-rw-r--r--src/plugins/abrt-action-rhtsupport.c (renamed from src/plugins/abrt-action-rhtsupport.cpp)0
-rw-r--r--src/plugins/abrt-action-upload.c (renamed from src/plugins/abrt-action-upload.cpp)0
8 files changed, 34 insertions, 19 deletions
diff --git a/src/lib/abrt_xmlrpc.h b/src/lib/abrt_xmlrpc.h
index ad1a87d3..93c5a9d6 100644
--- a/src/lib/abrt_xmlrpc.h
+++ b/src/lib/abrt_xmlrpc.h
@@ -23,12 +23,12 @@
#include <xmlrpc-c/base.h>
#include <xmlrpc-c/client.h>
+#ifdef __cplusplus
/*
* Simple class holding XMLRPC connection data.
* Used mainly to ensure we always destroy xmlrpc client and server_info
* on return or throw.
*/
-
struct abrt_xmlrpc_conn {
xmlrpc_client* m_pClient;
xmlrpc_server_info* m_pServer_info;
@@ -40,9 +40,19 @@ struct abrt_xmlrpc_conn {
void new_xmlrpc_client(const char* url, bool ssl_verify);
void destroy_xmlrpc_client();
};
+#endif
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
/* Utility functions */
void throw_xml_fault(xmlrpc_env *env);
void throw_if_xml_fault_occurred(xmlrpc_env *env);
+#ifdef __cplusplus
+}
+#endif
+
#endif
diff --git a/src/plugins/KerneloopsSysLog.cpp b/src/plugins/KerneloopsSysLog.c
index 68f309bc..f69503af 100644
--- a/src/plugins/KerneloopsSysLog.cpp
+++ b/src/plugins/KerneloopsSysLog.c
@@ -185,8 +185,8 @@ int extract_oopses(GList **oopses, char *buffer, size_t buflen)
if (linecount >= lines_info_alloc)
{
lines_info_alloc += REALLOC_CHUNK;
- lines_info = (line_info*)xrealloc(lines_info,
- lines_info_alloc * sizeof(struct line_info));
+ lines_info = (struct line_info*)xrealloc(lines_info,
+ lines_info_alloc * sizeof(lines_info[0]));
}
lines_info[linecount].ptr = c;
lines_info[linecount].level = linelevel;
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 52f3e4d1..eee328e0 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -57,6 +57,7 @@ libCCpp_la_CPPFLAGS = \
-DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
-DLOCALSTATEDIR='"$(localstatedir)"' \
$(GLIB_CFLAGS) \
+ -D_GNU_SOURCE \
-Wall -Werror
# -DHOSTILE_KERNEL
libCCpp_la_LDFLAGS = \
@@ -65,12 +66,14 @@ libCCpp_la_LDFLAGS = \
# KerneloopsScanner
libKerneloopsScanner_la_SOURCES = \
KerneloopsScanner.cpp KerneloopsScanner.h \
- KerneloopsSysLog.cpp KerneloopsSysLog.h
+ KerneloopsSysLog.c KerneloopsSysLog.h
libKerneloopsScanner_la_CPPFLAGS = \
-I$(srcdir)/../include/report -I$(srcdir)/../include \
-I$(srcdir)/../lib \
-DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
- $(GLIB_CFLAGS)
+ $(GLIB_CFLAGS) \
+ -D_GNU_SOURCE \
+ -Wall -Werror
libKerneloopsScanner_la_LDFLAGS = \
-avoid-version \
$(GLIB_LIBS)
@@ -187,7 +190,7 @@ abrt_action_bugzilla_LDADD = \
abrt_action_rhtsupport_SOURCES = \
abrt_rh_support.h abrt_rh_support.c \
- abrt-action-rhtsupport.cpp
+ abrt-action-rhtsupport.c
abrt_action_rhtsupport_CPPFLAGS = \
-I$(srcdir)/../include/report -I$(srcdir)/../include \
-I$(srcdir)/../lib \
@@ -211,7 +214,7 @@ abrt_action_rhtsupport_LDADD = \
../lib/libreport.la
abrt_action_upload_SOURCES = \
- abrt-action-upload.cpp
+ abrt-action-upload.c
abrt_action_upload_CPPFLAGS = \
-I$(srcdir)/../include/report -I$(srcdir)/../include \
-I$(srcdir)/../lib \
@@ -234,7 +237,7 @@ abrt_action_upload_LDADD = \
../lib/libreport.la
abrt_action_kerneloops_SOURCES = \
- abrt-action-kerneloops.cpp
+ abrt-action-kerneloops.c
abrt_action_kerneloops_CPPFLAGS = \
-I$(srcdir)/../include/report -I$(srcdir)/../include \
-I$(srcdir)/../lib \
@@ -254,7 +257,7 @@ abrt_action_kerneloops_LDADD = \
../lib/libreport.la
abrt_action_mailx_SOURCES = \
- abrt-action-mailx.cpp
+ abrt-action-mailx.c
abrt_action_mailx_CPPFLAGS = \
-I$(srcdir)/../include/report -I$(srcdir)/../include \
-I$(srcdir)/../lib \
@@ -273,7 +276,7 @@ abrt_action_mailx_LDADD = \
../lib/libreport.la
abrt_action_print_SOURCES = \
- abrt-action-print.cpp
+ abrt-action-print.c
abrt_action_print_CPPFLAGS = \
-I$(srcdir)/../include/report -I$(srcdir)/../include \
-I$(srcdir)/../lib \
diff --git a/src/plugins/abrt-action-kerneloops.cpp b/src/plugins/abrt-action-kerneloops.c
index f3351ccd..f3351ccd 100644
--- a/src/plugins/abrt-action-kerneloops.cpp
+++ b/src/plugins/abrt-action-kerneloops.c
diff --git a/src/plugins/abrt-action-mailx.cpp b/src/plugins/abrt-action-mailx.c
index 8f613047..ea26b9cb 100644
--- a/src/plugins/abrt-action-mailx.cpp
+++ b/src/plugins/abrt-action-mailx.c
@@ -46,14 +46,16 @@ static void exec_and_feed_input(uid_t uid, const char* text, char **args)
error_msg_and_die("Error running '%s'", args[0]);
}
-static char** append_str_to_vector(char **vec, unsigned &size, const char *str)
+static char** append_str_to_vector(char **vec, unsigned *size_p, const char *str)
{
//log("old vec: %p", vec);
+ unsigned size = *size_p;
vec = (char**) xrealloc(vec, (size+2) * sizeof(vec[0]));
vec[size] = xstrdup(str);
//log("new vec: %p, added [%d] %p", vec, size, vec[size]);
size++;
vec[size] = NULL;
+ *size_p = size;
return vec;
}
@@ -80,7 +82,7 @@ static void create_and_send_email(
char **args = NULL;
unsigned arg_size = 0;
- args = append_str_to_vector(args, arg_size, "/bin/mailx");
+ args = append_str_to_vector(args, &arg_size, "/bin/mailx");
char *dsc = make_description_mailx(crash_data);
@@ -94,17 +96,17 @@ static void create_and_send_email(
{
if (value->flags & CD_FLAG_BIN)
{
- args = append_str_to_vector(args, arg_size, "-a");
- args = append_str_to_vector(args, arg_size, value->content);
+ args = append_str_to_vector(args, &arg_size, "-a");
+ args = append_str_to_vector(args, &arg_size, value->content);
}
}
}
- args = append_str_to_vector(args, arg_size, "-s");
- args = append_str_to_vector(args, arg_size, subject);
- args = append_str_to_vector(args, arg_size, "-r");
- args = append_str_to_vector(args, arg_size, email_from);
- args = append_str_to_vector(args, arg_size, email_to);
+ args = append_str_to_vector(args, &arg_size, "-s");
+ args = append_str_to_vector(args, &arg_size, subject);
+ args = append_str_to_vector(args, &arg_size, "-r");
+ args = append_str_to_vector(args, &arg_size, email_from);
+ args = append_str_to_vector(args, &arg_size, email_to);
log(_("Sending an email..."));
const char *uid_str = get_crash_item_content_or_NULL(crash_data, FILENAME_UID);
diff --git a/src/plugins/abrt-action-print.cpp b/src/plugins/abrt-action-print.c
index 55631c96..55631c96 100644
--- a/src/plugins/abrt-action-print.cpp
+++ b/src/plugins/abrt-action-print.c
diff --git a/src/plugins/abrt-action-rhtsupport.cpp b/src/plugins/abrt-action-rhtsupport.c
index 024b1efc..024b1efc 100644
--- a/src/plugins/abrt-action-rhtsupport.cpp
+++ b/src/plugins/abrt-action-rhtsupport.c
diff --git a/src/plugins/abrt-action-upload.cpp b/src/plugins/abrt-action-upload.c
index 8789f0e7..8789f0e7 100644
--- a/src/plugins/abrt-action-upload.cpp
+++ b/src/plugins/abrt-action-upload.c