diff options
| author | Denys Vlasenko <dvlasenk@redhat.com> | 2010-11-26 13:21:07 +0100 |
|---|---|---|
| committer | Denys Vlasenko <dvlasenk@redhat.com> | 2010-11-26 13:21:07 +0100 |
| commit | 7ca9930ec1fc0aef059a2d8e81f7db6b3c1085ce (patch) | |
| tree | f08ad3a408d5ae61b8ea6e483016cf45d722a491 /src/include | |
| parent | 286312ff8017b4d0c0521a3f7c595c85b6f57c52 (diff) | |
| download | abrt-7ca9930ec1fc0aef059a2d8e81f7db6b3c1085ce.tar.gz abrt-7ca9930ec1fc0aef059a2d8e81f7db6b3c1085ce.tar.xz abrt-7ca9930ec1fc0aef059a2d8e81f7db6b3c1085ce.zip | |
reorganize libraries
This patch does not change any code per se,
it renames libABRTfoo -> libabrt_bar and moves a few functions around.
After the patch, we are left with the following libs:
libabrt - the stuff shared among most of abrt (like xmalloc, logging)
libabrt_daemon - only daemon-related things are here
(should probably be just moved into daemon - later)
libabrt_dbus - daemon, cli and applet use this
libabrt_web - abrt-action-foo where foo deals with network/web/ftp/...
As a result, we have following reductions in dependent libs:
/usr/libexec/abrt-hook-ccpp:
linux-vdso.so.1 => ()
- libABRTUtils.so.0 => /usr/lib64/libABRTUtils.so.0 ()
+ libabrt.so.0 => /usr/lib64/libabrt.so.0 ()
libglib-2.0.so.0 => /lib64/libglib-2.0.so.0 ()
- libdbus-1.so.3 => /lib64/libdbus-1.so.3 ()
- libpthread.so.0 => /lib64/libpthread.so.0 ()
- librt.so.1 => /lib64/librt.so.1 ()
- libdl.so.2 => /lib64/libdl.so.2 ()
/usr/libexec/abrt-action-upload:
linux-vdso.so.1 => ()
libtar.so.1 => /usr/lib64/libtar.so.1 ()
libcurl.so.4 => /usr/lib64/libcurl.so.4 ()
- libABRTdUtils.so.0 => /usr/lib64/libABRTdUtils.so.0 ()
- libABRTUtils.so.0 => /usr/lib64/libABRTUtils.so.0 ()
+ libabrt.so.0 => /usr/lib64/libabrt.so.0 ()
libglib-2.0.so.0 => /lib64/libglib-2.0.so.0 ()
- libdbus-1.so.3 => /lib64/libdbus-1.so.3 ()
Similar savings are in almost every abrt-action-foo.
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/abrtlib.h | 22 | ||||
| -rw-r--r-- | src/include/plugin.h | 22 |
2 files changed, 21 insertions, 23 deletions
diff --git a/src/include/abrtlib.h b/src/include/abrtlib.h index f069d311..cbaafc60 100644 --- a/src/include/abrtlib.h +++ b/src/include/abrtlib.h @@ -80,7 +80,6 @@ int vdprintf(int d, const char *format, va_list ap); #include "crash_types.h" #include "dump_dir.h" #include "abrt_types.h" -#include "abrt_packages.h" #ifdef __cplusplus @@ -254,6 +253,27 @@ std::string to_string(T 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(const map_crash_data_t& pCrashData); +char* make_description_reproduce_comment(const map_crash_data_t& pCrashData); +char* make_description_logger(const map_crash_data_t& pCrashData); +char* make_description_mailx(const map_crash_data_t& pCrashData); + +/** + * Loads settings and stores it in second parameter. On success it + * returns true, otherwise returns false. + * + * @param path A path of config file. + * Config file consists of "key=value" lines. + * @param settings A readed plugin's settings. + * @param skipKeysWithoutValue + * If true, lines in format "key=" (without value) are skipped. + * Otherwise empty value "" is inserted into pSettings. + * @return if it success it returns true, otherwise it returns false. + */ +extern bool LoadPluginSettings(const char *pPath, + map_plugin_settings_t& pSettings, + bool skipKeysWithoutValue = true); + // TODO: npajkovs: full rewrite ssprintf -> xasprintf static inline std::string ssprintf(const char *format, ...) { diff --git a/src/include/plugin.h b/src/include/plugin.h index e0f45b6c..0ab85617 100644 --- a/src/include/plugin.h +++ b/src/include/plugin.h @@ -110,26 +110,4 @@ typedef struct SPluginInfo PLUGINS_MAGIC_NUMBER,\ }; -/* helper functions */ -char* make_description_bz(const map_crash_data_t& pCrashData); -char* make_description_reproduce_comment(const map_crash_data_t& pCrashData); -char* make_description_logger(const map_crash_data_t& pCrashData); -char* make_dsc_mailx(const map_crash_data_t& pCrashData); - -/** - * Loads settings and stores it in second parameter. On success it - * returns true, otherwise returns false. - * - * @param path A path of config file. - * Config file consists of "key=value" lines. - * @param settings A readed plugin's settings. - * @param skipKeysWithoutValue - * If true, lines in format "key=" (without value) are skipped. - * Otherwise empty value "" is inserted into pSettings. - * @return if it success it returns true, otherwise it returns false. - */ -extern bool LoadPluginSettings(const char *pPath, - map_plugin_settings_t& pSettings, - bool skipKeysWithoutValue = true); - #endif |
