diff options
| author | Denys Vlasenko <dvlasenk@redhat.com> | 2010-10-15 14:11:23 +0200 |
|---|---|---|
| committer | Denys Vlasenko <dvlasenk@redhat.com> | 2010-10-15 14:11:23 +0200 |
| commit | 2860fc63ac8246fe78efd47d7319b52e8372a48c (patch) | |
| tree | f8376a5072505344c1bd2e4c3a009b23598c08f3 /lib | |
| parent | ae0b34aa23e5c37c323f3ad2499784aabafc0bac (diff) | |
| download | abrt-2860fc63ac8246fe78efd47d7319b52e8372a48c.tar.gz abrt-2860fc63ac8246fe78efd47d7319b52e8372a48c.tar.xz abrt-2860fc63ac8246fe78efd47d7319b52e8372a48c.zip | |
mve md5 hash from Python plugin to abrtlib
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/plugins/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/plugins/Python.cpp | 1 | ||||
| -rw-r--r-- | lib/utils/Makefile.am | 3 | ||||
| -rw-r--r-- | lib/utils/hash_md5.c (renamed from lib/plugins/Python_hash.cpp) | 1 | ||||
| -rw-r--r-- | lib/utils/hash_md5.h (renamed from lib/plugins/Python_hash.h) | 0 | ||||
| -rw-r--r-- | lib/utils/hash_sha1.c (renamed from lib/utils/sha1.c) | 0 | ||||
| -rw-r--r-- | lib/utils/hash_sha1.h (renamed from lib/utils/sha1.h) | 0 |
7 files changed, 3 insertions, 4 deletions
diff --git a/lib/plugins/Makefile.am b/lib/plugins/Makefile.am index f07b376d..6e8c3f9c 100644 --- a/lib/plugins/Makefile.am +++ b/lib/plugins/Makefile.am @@ -139,7 +139,7 @@ libReportUploader_la_LIBADD = $(CURL_LIBS) libReportUploader_la_CPPFLAGS = -I$(INC_PATH) -I$(UTILS_PATH) $(CURL_CFLAGS) -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" # Python -libPython_la_SOURCES = Python.h Python.cpp Python_hash.h Python_hash.cpp +libPython_la_SOURCES = Python.h Python.cpp #libPython_la_LIBADD = $(NSS_LIBS) libPython_la_LDFLAGS = -avoid-version libPython_la_CPPFLAGS = -I$(INC_PATH) -I$(UTILS_PATH) diff --git a/lib/plugins/Python.cpp b/lib/plugins/Python.cpp index 5e4cc02a..77839570 100644 --- a/lib/plugins/Python.cpp +++ b/lib/plugins/Python.cpp @@ -19,7 +19,6 @@ #include "abrtlib.h" #include "Python.h" #include "abrt_exception.h" -#include "Python_hash.h" using namespace std; diff --git a/lib/utils/Makefile.am b/lib/utils/Makefile.am index 79df31e5..00ec6872 100644 --- a/lib/utils/Makefile.am +++ b/lib/utils/Makefile.am @@ -13,6 +13,8 @@ libABRTUtils_la_SOURCES = \ concat_path_file.c \ append_to_malloced_string.c \ encbase64.c \ + hash_md5.c hash_md5.h \ + hash_sha1.c hash_sha1.h \ read_write.c read_write.h \ logging.c logging.h \ copyfd.c \ @@ -29,7 +31,6 @@ libABRTUtils_la_SOURCES = \ strbuf.c strbuf.h \ abrt_packages.c abrt_packages.h \ hooklib.c hooklib.h \ - sha1.c sha1.h \ database.c \ parse_options.c parse_options.h libABRTUtils_la_CPPFLAGS = \ diff --git a/lib/plugins/Python_hash.cpp b/lib/utils/hash_md5.c index 36ddacdc..8bfddd54 100644 --- a/lib/plugins/Python_hash.cpp +++ b/lib/utils/hash_md5.c @@ -13,7 +13,6 @@ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. */ #include "abrtlib.h" -#include "Python_hash.h" #include <byteswap.h> #if defined(__BIG_ENDIAN__) && __BIG_ENDIAN__ diff --git a/lib/plugins/Python_hash.h b/lib/utils/hash_md5.h index cc1d2c43..cc1d2c43 100644 --- a/lib/plugins/Python_hash.h +++ b/lib/utils/hash_md5.h diff --git a/lib/utils/sha1.c b/lib/utils/hash_sha1.c index 954e7bc8..954e7bc8 100644 --- a/lib/utils/sha1.c +++ b/lib/utils/hash_sha1.c diff --git a/lib/utils/sha1.h b/lib/utils/hash_sha1.h index 02978ea4..02978ea4 100644 --- a/lib/utils/sha1.h +++ b/lib/utils/hash_sha1.h |
