summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Vlasenko <dvlasenk@redhat.com>2011-06-17 16:31:27 +0200
committerDenys Vlasenko <dvlasenk@redhat.com>2011-06-17 16:31:27 +0200
commita7e51ae8800a2bc14e4449fd3e2a3c689d9feb37 (patch)
tree649966c5ef2b9f620c5f46568a6859f5384d42d0
parent10028830ab9be6ec1a154d2f9d9a7a66c94ae7b4 (diff)
downloadabrt-a7e51ae8800a2bc14e4449fd3e2a3c689d9feb37.zip
abrt-a7e51ae8800a2bc14e4449fd3e2a3c689d9feb37.tar.gz
abrt-a7e51ae8800a2bc14e4449fd3e2a3c689d9feb37.tar.xz
clean up after libreport separation into a different source tree
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
-rw-r--r--src/applet/applet.c9
-rw-r--r--src/daemon/CommLayerServerDBus.c8
-rw-r--r--src/daemon/abrt-action-save-package-data.c1
-rw-r--r--src/daemon/abrt-server.c2
-rw-r--r--src/daemon/abrtd.c1
-rw-r--r--src/gui-gtk/main.c4
-rw-r--r--src/hooks/abrt-hook-ccpp.c2
-rw-r--r--src/include/Makefile.am5
-rw-r--r--src/include/abrt_problem_data.h104
-rw-r--r--src/include/abrt_types.h45
-rw-r--r--src/include/abrtlib.h42
-rw-r--r--src/include/xfuncs.h144
-rw-r--r--src/lib/hooklib.c4
-rw-r--r--src/plugins/abrt-action-analyze-backtrace.c3
-rw-r--r--src/plugins/abrt-action-analyze-c.c1
-rw-r--r--src/plugins/abrt-action-analyze-oops.c1
-rw-r--r--src/plugins/abrt-action-analyze-python.c1
-rw-r--r--src/plugins/abrt-action-bugzilla.c2
-rw-r--r--src/plugins/abrt-action-generate-backtrace.c3
-rw-r--r--src/plugins/abrt-action-kerneloops.c2
-rw-r--r--src/plugins/abrt-action-mailx.c2
-rw-r--r--src/plugins/abrt-action-print.c1
-rw-r--r--src/plugins/abrt-action-rhtsupport.c2
-rw-r--r--src/plugins/abrt-action-trim-files.c1
-rw-r--r--src/plugins/abrt-action-upload.c2
-rw-r--r--src/plugins/abrt-dump-oops.c1
-rw-r--r--src/plugins/abrt-retrace-client.c8
-rw-r--r--src/plugins/rhbz.h1
28 files changed, 27 insertions, 375 deletions
diff --git a/src/applet/applet.c b/src/applet/applet.c
index 70482e6..b14e55a 100644
--- a/src/applet/applet.c
+++ b/src/applet/applet.c
@@ -25,11 +25,18 @@
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
+#include <internal_abrt_dbus.h>
#include "abrtlib.h"
-#include "abrt_dbus.h"
+
#define ENABLE_ANIMATION 0
+
+#define ABRTD_DBUS_NAME "com.redhat.abrt"
+#define ABRTD_DBUS_PATH "/com/redhat/abrt"
+#define ABRTD_DBUS_IFACE "com.redhat.abrt"
+
+
static gboolean persistent_notification;
static GtkStatusIcon *ap_status_icon;
static GtkWidget *ap_menu;
diff --git a/src/daemon/CommLayerServerDBus.c b/src/daemon/CommLayerServerDBus.c
index 8311dc6..64930d5 100644
--- a/src/daemon/CommLayerServerDBus.c
+++ b/src/daemon/CommLayerServerDBus.c
@@ -17,11 +17,17 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <dbus/dbus.h>
+#include <internal_abrt_dbus.h>
#include "abrtlib.h"
-#include "abrt_dbus.h"
#include "comm_layer_inner.h"
#include "CommLayerServerDBus.h"
+
+#define ABRTD_DBUS_NAME "com.redhat.abrt"
+#define ABRTD_DBUS_PATH "/com/redhat/abrt"
+#define ABRTD_DBUS_IFACE "com.redhat.abrt"
+
+
/*
* DBus signal emitters
*/
diff --git a/src/daemon/abrt-action-save-package-data.c b/src/daemon/abrt-action-save-package-data.c
index df8de7b..80217b3 100644
--- a/src/daemon/abrt-action-save-package-data.c
+++ b/src/daemon/abrt-action-save-package-data.c
@@ -19,7 +19,6 @@
#include <fnmatch.h>
#include "abrtlib.h"
#include "rpm.h"
-#include "parse_options.h"
// TODO: convert g_settings_foo usage to command-line switches
diff --git a/src/daemon/abrt-server.c b/src/daemon/abrt-server.c
index 367289f..20caaae 100644
--- a/src/daemon/abrt-server.c
+++ b/src/daemon/abrt-server.c
@@ -15,8 +15,8 @@
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#include <syslog.h>
#include "abrtlib.h"
-#include "parse_options.h"
/* Maximal length of backtrace. */
#define MAX_BACKTRACE_SIZE (1024*1024)
diff --git a/src/daemon/abrtd.c b/src/daemon/abrtd.c
index 32d948a..8a22ab8 100644
--- a/src/daemon/abrtd.c
+++ b/src/daemon/abrtd.c
@@ -27,7 +27,6 @@
#include "abrtlib.h"
#include "comm_layer_inner.h"
#include "CommLayerServerDBus.h"
-#include "parse_options.h"
#define VAR_RUN_PIDFILE VAR_RUN"/abrtd.pid"
diff --git a/src/gui-gtk/main.c b/src/gui-gtk/main.c
index 2888d6d..e465d7b 100644
--- a/src/gui-gtk/main.c
+++ b/src/gui-gtk/main.c
@@ -16,16 +16,14 @@
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include <sys/inotify.h>
#include <libreport-gtk.h>
-#include "abrtlib.h"
-#include "parse_options.h"
#if HAVE_LOCALE_H
# include <locale.h>
#endif
+#include "abrtlib.h"
static void scan_dirs_and_add_to_dirlist(void);
diff --git a/src/hooks/abrt-hook-ccpp.c b/src/hooks/abrt-hook-ccpp.c
index e920139..f9a72a6 100644
--- a/src/hooks/abrt-hook-ccpp.c
+++ b/src/hooks/abrt-hook-ccpp.c
@@ -18,9 +18,9 @@
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"
#include <syslog.h>
#include <sys/utsname.h>
+#include "abrtlib.h"
static char* malloc_readlink(const char *linkname)
{
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index 357debd..e94e40d 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -2,7 +2,4 @@ libabrt_includedir = \
$(includedir)/abrt
libabrt_include_HEADERS = \
- abrtlib.h \
- abrt_types.h \
- abrt_problem_data.h \
- xfuncs.h
+ abrtlib.h
diff --git a/src/include/abrt_problem_data.h b/src/include/abrt_problem_data.h
deleted file mode 100644
index b705daa..0000000
--- a/src/include/abrt_problem_data.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- Copyright (C) 2009 Abrt team.
- Copyright (C) 2009 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.
-*/
-#ifndef ABRT_PROBLEM_DATA_H_
-#define ABRT_PROBLEM_DATA_H_
-
-#include "problem_data.h"
-#include "abrt_types.h"
-
-// Text bigger than this usually is attached, not added inline
-// was 2k, now bumbed up to 20k:
-#define CD_TEXT_ATT_SIZE (20*1024)
-
-// Filenames in dump directory:
-// filled by a hook:
-#define FILENAME_REASON "reason" /* mandatory */
-#define FILENAME_UID "uid" /* mandatory */
-#define FILENAME_TIME "time" /* mandatory */
-#define FILENAME_ANALYZER "analyzer"
-#define FILENAME_EXECUTABLE "executable"
-#define FILENAME_BINARY "binary"
-#define FILENAME_CMDLINE "cmdline"
-#define FILENAME_COREDUMP "coredump"
-#define FILENAME_BACKTRACE "backtrace"
-#define FILENAME_MAPS "maps"
-#define FILENAME_SMAPS "smaps"
-#define FILENAME_ENVIRON "environ"
-#define FILENAME_DUPHASH "duphash"
-// Name of the function where the application crashed.
-// Optional.
-#define FILENAME_CRASH_FUNCTION "crash_function"
-// filled by CDebugDump::Create() (which also fills FILENAME_UID):
-#define FILENAME_ARCHITECTURE "architecture"
-#define FILENAME_KERNEL "kernel"
-// From /etc/system-release or /etc/redhat-release
-#define FILENAME_OS_RELEASE "os_release"
-// Filled by <what?>
-#define FILENAME_PACKAGE "package"
-#define FILENAME_COMPONENT "component"
-#define FILENAME_COMMENT "comment"
-#define FILENAME_RATING "backtrace_rating"
-#define FILENAME_HOSTNAME "hostname"
-// Optional. Set to "1" by abrt-handle-upload for every unpacked dump
-#define FILENAME_REMOTE "remote"
-#define FILENAME_TAINTED "kernel_tainted"
-#define FILENAME_TAINTED_SHORT "kernel_tainted_short"
-#define FILENAME_TAINTED_LONG "kernel_tainted_long"
-
-#define FILENAME_UUID "uuid"
-#define FILENAME_COUNT "count"
-/* Multi-line list of places problem was reported.
- * Recommended line format:
- * "Reporter: VAR=VAL VAR=VAL"
- * Use add_reported_to(dd, "line_without_newline"): it adds line
- * only if it is not already there.
- */
-#define FILENAME_REPORTED_TO "reported_to"
-#define FILENAME_EVENT_LOG "event_log"
-
-// Not stored as files, added "on the fly":
-#define CD_DUMPDIR "Directory"
-//UNUSED:
-//// "Which events are possible (make sense) on this dump dir?"
-//// (a string with "\n" terminated event names)
-//#define CD_EVENTS "Events"
-
-/* FILENAME_EVENT_LOG is trimmed to below LOW_WATERMARK
- * when it reaches HIGH_WATERMARK size
- */
-enum {
- EVENT_LOG_HIGH_WATERMARK = 30 * 1024,
- EVENT_LOG_LOW_WATERMARK = 20 * 1024,
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define add_reported_to abrt_add_reported_to
-void add_reported_to(struct dump_dir *dd, const char *line);
-
-#define log_problem_data abrt_log_problem_data
-void log_problem_data(problem_data_t *problem_data, const char *pfx);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/include/abrt_types.h b/src/include/abrt_types.h
deleted file mode 100644
index 4636bb7..0000000
--- a/src/include/abrt_types.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- Copyright (C) 2009 Denys Vlasenko (dvlasenk@redhat.com)
- Copyright (C) 2009 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.
-*/
-#ifndef ABRT_TYPES_H_
-#define ABRT_TYPES_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* TODO: rename to map_string_t */
-typedef GHashTable map_string_h;
-
-#define new_map_string abrt_new_map_string
-map_string_h *new_map_string(void);
-#define free_map_string abrt_free_map_string
-void free_map_string(map_string_h *ms);
-#define get_map_string_item_or_empty abrt_get_map_string_item_or_empty
-const char *get_map_string_item_or_empty(map_string_h *ms, const char *key);
-static inline
-const char *get_map_string_item_or_NULL(map_string_h *ms, const char *key)
-{
- return (const char*)g_hash_table_lookup(ms, key);
-}
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/include/abrtlib.h b/src/include/abrtlib.h
index 3d17ce3..40d88f3 100644
--- a/src/include/abrtlib.h
+++ b/src/include/abrtlib.h
@@ -6,47 +6,8 @@
#ifndef ABRTLIB_H_
#define ABRTLIB_H_
-#include <assert.h>
-#include <ctype.h>
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <setjmp.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <string.h>
-#include <sys/poll.h>
-#include <sys/mman.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <arpa/inet.h> /* sockaddr_in, sockaddr_in6 etc */
-#include <termios.h>
-#include <time.h>
-#include <unistd.h>
-/* Try to pull in PATH_MAX */
-#include <limits.h>
-#include <sys/param.h>
-#ifndef PATH_MAX
-# define PATH_MAX 256
-#endif
-#include <pwd.h>
-#include <grp.h>
-/* C++ bits */
-#ifdef __cplusplus
-# include <string>
-#endif
-#include <glib.h>
-
-#include <report.h>
/* libreport's internal functions we use: */
-#include <libreport.h>
+#include <internal_libreport.h>
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -75,7 +36,6 @@ int vdprintf(int d, const char *format, va_list ap);
#undef ARRAY_SIZE
#define ARRAY_SIZE(x) ((unsigned)(sizeof(x) / sizeof((x)[0])))
-
#include "hooklib.h"
#include "abrt_conf.h"
diff --git a/src/include/xfuncs.h b/src/include/xfuncs.h
deleted file mode 100644
index 5f2504b..0000000
--- a/src/include/xfuncs.h
+++ /dev/null
@@ -1,144 +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.
-*/
-#ifndef ABRT_XFUNCS_H
-#define ABRT_XFUNCS_H
-
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <stdbool.h>
-#include <stdarg.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define ndelay_on abrt_ndelay_on
-int ndelay_on(int fd);
-#define ndelay_off abrt_ndelay_off
-int ndelay_off(int fd);
-#define close_on_exec_on abrt_close_on_exec_on
-int close_on_exec_on(int fd);
-
-#define xmalloc abrt_xmalloc
-void* xmalloc(size_t size);
-#define xrealloc abrt_xrealloc
-void* xrealloc(void *ptr, size_t size);
-#define xzalloc abrt_xzalloc
-void* xzalloc(size_t size);
-#define xstrdup abrt_xstrdup
-char* xstrdup(const char *s);
-#define xstrndup abrt_xstrndup
-char* xstrndup(const char *s, int n);
-
-#define xpipe abrt_xpipe
-void xpipe(int filedes[2]);
-#define xdup abrt_xdup
-void xdup(int from);
-#define xdup2 abrt_xdup2
-void xdup2(int from, int to);
-#define xmove_fd abrt_xmove_fd
-void xmove_fd(int from, int to);
-
-#define xwrite abrt_xwrite
-void xwrite(int fd, const void *buf, size_t count);
-#define xwrite_str abrt_xwrite_str
-void xwrite_str(int fd, const char *str);
-
-#define xlseek abrt_xlseek
-off_t xlseek(int fd, off_t offset, int whence);
-
-#define xchdir abrt_xchdir
-void xchdir(const char *path);
-
-#define xvasprintf abrt_xvasprintf
-char* xvasprintf(const char *format, va_list p);
-#define xasprintf abrt_xasprintf
-char* xasprintf(const char *format, ...);
-
-#define xsetenv abrt_xsetenv
-void xsetenv(const char *key, const char *value);
-/*
- * Utility function to unsetenv a string which was possibly putenv'ed.
- * The problem here is that "natural" optimization:
- * strchrnul(var_val, '=')[0] = '\0';
- * unsetenv(var_val);
- * is BUGGY: if string was put into environment via putenv,
- * its modification (s/=/NUL/) is illegal, and unsetenv will fail to unset it.
- * Of course, saving/restoring the char wouldn't work either.
- * This helper creates a copy up to '=', unsetenv's it, and frees:
- */
-#define safe_unsetenv abrt_safe_unsetenv
-void safe_unsetenv(const char *var_val);
-
-#define xsocket abrt_xsocket
-int xsocket(int domain, int type, int protocol);
-#define xbind abrt_xbind
-void xbind(int sockfd, struct sockaddr *my_addr, socklen_t addrlen);
-#define xlisten abrt_xlisten
-void xlisten(int s, int backlog);
-#define xsendto abrt_xsendto
-ssize_t xsendto(int s, const void *buf, size_t len,
- const struct sockaddr *to, socklen_t tolen);
-
-#define xstat abrt_xstat
-void xstat(const char *name, struct stat *stat_buf);
-
-#define xopen3 abrt_xopen3
-int xopen3(const char *pathname, int flags, int mode);
-#define xopen abrt_xopen
-int xopen(const char *pathname, int flags);
-#define xunlink abrt_xunlink
-void xunlink(const char *pathname);
-
-/* Just testing dent->d_type == DT_REG is wrong: some filesystems
- * do not report the type, they report DT_UNKNOWN for every dirent
- * (and this is not a bug in filesystem, this is allowed by standards).
- * This function handles this case. Note: it returns 0 on symlinks
- * even if they point to regular files.
- */
-#define is_regular_file abrt_is_regular_file
-int is_regular_file(struct dirent *dent, const char *dirname);
-
-#define dot_or_dotdot abrt_dot_or_dotdot
-bool dot_or_dotdot(const char *filename);
-#define last_char_is abrt_last_char_is
-char *last_char_is(const char *s, int c);
-
-#define string_to_bool abrt_string_to_bool
-bool string_to_bool(const char *s);
-
-#define xseteuid abrt_xseteuid
-void xseteuid(uid_t euid);
-#define xsetegid abrt_xsetegid
-void xsetegid(gid_t egid);
-#define xsetreuid abrt_xsetreuid
-void xsetreuid(uid_t ruid, uid_t euid);
-#define xsetregid abrt_xsetregid
-void xsetregid(gid_t rgid, gid_t egid);
-
-/* Returns getpwuid(uid)->pw_dir or NULL */
-#define get_home_dir abrt_get_home_dir
-const char *get_home_dir(uid_t uid);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/lib/hooklib.c b/src/lib/hooklib.c
index 365d595..b5fcec2 100644
--- a/src/lib/hooklib.c
+++ b/src/lib/hooklib.c
@@ -15,9 +15,9 @@
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "libreport.h"
-#include "hooklib.h"
#include <sys/statvfs.h>
+#include "internal_libreport.h"
+#include "hooklib.h"
void check_free_space(unsigned setting_MaxCrashReportsSize)
{
diff --git a/src/plugins/abrt-action-analyze-backtrace.c b/src/plugins/abrt-action-analyze-backtrace.c
index eb75d63..e5e5db1 100644
--- a/src/plugins/abrt-action-analyze-backtrace.c
+++ b/src/plugins/abrt-action-analyze-backtrace.c
@@ -15,11 +15,10 @@
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"
#include <btparser/backtrace.h>
#include <btparser/frame.h>
#include <btparser/location.h>
-#include "parse_options.h"
+#include "abrtlib.h"
static const char *dump_dir_name = ".";
diff --git a/src/plugins/abrt-action-analyze-c.c b/src/plugins/abrt-action-analyze-c.c
index 240ca2a..576fba1 100644
--- a/src/plugins/abrt-action-analyze-c.c
+++ b/src/plugins/abrt-action-analyze-c.c
@@ -17,7 +17,6 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "abrtlib.h"
-#include "parse_options.h"
static void create_hash(char hash_str[SHA1_RESULT_LEN*2 + 1], const char *pInput)
{
diff --git a/src/plugins/abrt-action-analyze-oops.c b/src/plugins/abrt-action-analyze-oops.c
index 33c6500..db5b60a 100644
--- a/src/plugins/abrt-action-analyze-oops.c
+++ b/src/plugins/abrt-action-analyze-oops.c
@@ -17,7 +17,6 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "abrtlib.h"
-#include "parse_options.h"
static void hash_oops_str(char hash_str[SHA1_RESULT_LEN*2 + 1], char *oops_buf, const char *oops_ptr)
{
diff --git a/src/plugins/abrt-action-analyze-python.c b/src/plugins/abrt-action-analyze-python.c
index c991cfc..548c182 100644
--- a/src/plugins/abrt-action-analyze-python.c
+++ b/src/plugins/abrt-action-analyze-python.c
@@ -17,7 +17,6 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "abrtlib.h"
-#include "parse_options.h"
int main(int argc, char **argv)
{
diff --git a/src/plugins/abrt-action-bugzilla.c b/src/plugins/abrt-action-bugzilla.c
index 956e11e..108365b 100644
--- a/src/plugins/abrt-action-bugzilla.c
+++ b/src/plugins/abrt-action-bugzilla.c
@@ -17,8 +17,6 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "abrtlib.h"
-#include "abrt_problem_data.h"
-#include "parse_options.h"
#include "abrt_xmlrpc.h"
#include "rhbz.h"
diff --git a/src/plugins/abrt-action-generate-backtrace.c b/src/plugins/abrt-action-generate-backtrace.c
index b5e845b..b0e558e 100644
--- a/src/plugins/abrt-action-generate-backtrace.c
+++ b/src/plugins/abrt-action-generate-backtrace.c
@@ -16,11 +16,10 @@
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"
#include <btparser/backtrace.h>
#include <btparser/frame.h>
#include <btparser/location.h>
-#include "parse_options.h"
+#include "abrtlib.h"
#define DEBUGINFO_CACHE_DIR LOCALSTATEDIR"/cache/abrt-di"
diff --git a/src/plugins/abrt-action-kerneloops.c b/src/plugins/abrt-action-kerneloops.c
index b8f4337..79186f8 100644
--- a/src/plugins/abrt-action-kerneloops.c
+++ b/src/plugins/abrt-action-kerneloops.c
@@ -16,10 +16,8 @@
Anton Arapov <anton@redhat.com>
Arjan van de Ven <arjan@linux.intel.com>
*/
-
#include <curl/curl.h>
#include "abrtlib.h"
-#include "parse_options.h"
/* helpers */
static size_t writefunction(void *ptr, size_t size, size_t nmemb, void *stream)
diff --git a/src/plugins/abrt-action-mailx.c b/src/plugins/abrt-action-mailx.c
index d513fbb..21014e5 100644
--- a/src/plugins/abrt-action-mailx.c
+++ b/src/plugins/abrt-action-mailx.c
@@ -16,9 +16,7 @@
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"
-#include "parse_options.h"
static void exec_and_feed_input(const char* text, char **args)
{
diff --git a/src/plugins/abrt-action-print.c b/src/plugins/abrt-action-print.c
index 0de1fbe..9bad3d2 100644
--- a/src/plugins/abrt-action-print.c
+++ b/src/plugins/abrt-action-print.c
@@ -19,7 +19,6 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "abrtlib.h"
-#include "parse_options.h"
static const char *dump_dir_name = ".";
static const char *output_file = NULL;
diff --git a/src/plugins/abrt-action-rhtsupport.c b/src/plugins/abrt-action-rhtsupport.c
index 59d02ed..312ab92 100644
--- a/src/plugins/abrt-action-rhtsupport.c
+++ b/src/plugins/abrt-action-rhtsupport.c
@@ -16,13 +16,11 @@
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
#include <libtar.h>
#include "abrtlib.h"
#include "abrt_curl.h"
#include "abrt_xmlrpc.h"
#include "abrt_rh_support.h"
-#include "parse_options.h"
static void report_to_rhtsupport(
const char *dump_dir_name,
diff --git a/src/plugins/abrt-action-trim-files.c b/src/plugins/abrt-action-trim-files.c
index 9f15038..2de0e17 100644
--- a/src/plugins/abrt-action-trim-files.c
+++ b/src/plugins/abrt-action-trim-files.c
@@ -17,7 +17,6 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "abrtlib.h"
-#include "parse_options.h"
static double get_dir_size(const char *dirname,
char **worst_file,
diff --git a/src/plugins/abrt-action-upload.c b/src/plugins/abrt-action-upload.c
index 06ae8b2..54f1493 100644
--- a/src/plugins/abrt-action-upload.c
+++ b/src/plugins/abrt-action-upload.c
@@ -16,11 +16,9 @@
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
#include <libtar.h>
#include <curl/curl.h>
#include "abrtlib.h"
-#include "parse_options.h"
//TODO: use this for better logging
#if 0
diff --git a/src/plugins/abrt-dump-oops.c b/src/plugins/abrt-dump-oops.c
index 5eba803..b43d507 100644
--- a/src/plugins/abrt-dump-oops.c
+++ b/src/plugins/abrt-dump-oops.c
@@ -21,7 +21,6 @@
#include <sys/inotify.h>
#include <sys/ioctl.h> /* ioctl(FIONREAD) */
#include "abrtlib.h"
-#include "parse_options.h"
static bool world_readable_dump = false;
static const char *debug_dumps_dir = ".";
diff --git a/src/plugins/abrt-retrace-client.c b/src/plugins/abrt-retrace-client.c
index 2001e38..1d5eba1 100644
--- a/src/plugins/abrt-retrace-client.c
+++ b/src/plugins/abrt-retrace-client.c
@@ -15,9 +15,7 @@
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"
-#include "parse_options.h"
-#include "strbuf.h"
+#include <syslog.h>
#include <nspr.h>
#include <nss.h>
#include <pk11pub.h>
@@ -26,10 +24,10 @@
#include <sslerr.h>
#include <secerr.h>
#include <secmod.h>
-
#if HAVE_LOCALE_H
-#include <locale.h>
+# include <locale.h>
#endif
+#include "abrtlib.h"
struct retrace_settings
{
diff --git a/src/plugins/rhbz.h b/src/plugins/rhbz.h
index 60d6407..6a12c68 100644
--- a/src/plugins/rhbz.h
+++ b/src/plugins/rhbz.h
@@ -25,7 +25,6 @@
*/
#include "abrt_xmlrpc.h"
-#include "abrt_problem_data.h"
#ifdef __cplusplus
extern "C" {