diff options
author | Nikola Pajkovsky <npajkovs@redhat.com> | 2010-08-04 10:25:42 +0200 |
---|---|---|
committer | Nikola Pajkovsky <npajkovs@redhat.com> | 2010-08-05 10:53:01 +0200 |
commit | 2f3666132baac757176a4a28630f8244ff2a8758 (patch) | |
tree | 820dac75230332373820fad0c7b16180ead05a1d /lib | |
parent | e26072c5a3315ec346510abf89db328be371058a (diff) | |
download | abrt-2f3666132baac757176a4a28630f8244ff2a8758.tar.gz abrt-2f3666132baac757176a4a28630f8244ff2a8758.tar.xz abrt-2f3666132baac757176a4a28630f8244ff2a8758.zip |
remove libzip code
Do we really need zip compression?
Signed-off-by: Nikola Pajkovsky <npajkovs@redhat.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Plugins/FileTransfer.cpp | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/lib/Plugins/FileTransfer.cpp b/lib/Plugins/FileTransfer.cpp index 6cefef4b..cf7cf1f3 100644 --- a/lib/Plugins/FileTransfer.cpp +++ b/lib/Plugins/FileTransfer.cpp @@ -21,7 +21,6 @@ #ifndef _GNU_SOURCE # define _GNU_SOURCE #endif -#include <zip.h> #include <libtar.h> #include <bzlib.h> #include <zlib.h> @@ -91,60 +90,6 @@ void CFileTransfer::SendFile(const char *pURL, const char *pFilename) } } -/* - * Walks through the directory and applies a function with one - * parameter "something" to each filename. - */ -static void traverse_directory(const char *directory, void *something, - void (*func)(void *, const char *)) -{ - DIR *dp; - struct dirent *dirp; - - dp = opendir(directory); - if (dp == NULL) - { - return; - } - while ((dirp = readdir(dp)) != NULL) - { - if (is_regular_file(dirp, directory)) - { - string complete_name = concat_path_file(directory, dirp->d_name); - func(something, complete_name.c_str()); - } - } - closedir(dp); -} - -static void add_to_zip(void *z, const char *filename) -{ - struct zip_source *s; - - s = zip_source_file((struct zip *)z, filename, /*start:*/ 0, /*len:*/ 0); - if (s) - { - if (zip_add((struct zip *)z, filename, s) == -1) - { - zip_source_free(s); - } - /* else: don't call zip_source_free(s), successful zip_add consumes it */ - } -} - -static void create_zip(const char *archive_name, const char *directory) -{ - struct zip *z; - - z = zip_open(archive_name, ZIP_CREATE, /*errorp:*/ NULL); - if (z == NULL) - { - return; - } - traverse_directory(directory, z, add_to_zip); - zip_close(z); -} - static void create_tar(const char *archive_name, const char *directory) { TAR *tar; @@ -255,10 +200,6 @@ void CFileTransfer::CreateArchive(const char *pArchiveName, const char *pDir) { create_tarbz2(pArchiveName, pDir); } - else if (m_sArchiveType == ".zip") - { - create_zip(pArchiveName, pDir); - } else { throw CABRTException(EXCEP_PLUGIN, "Unknown/unsupported archive type %s", m_sArchiveType.c_str()); |