diff options
| author | Max Kellermann <max@duempel.org> | 2009-12-16 16:04:16 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-12-16 15:55:48 +0100 |
| commit | b009970af7db696b95da1fcea6656a42068fcb1c (patch) | |
| tree | 55470eb3bea2445ee6753bf1901b6117c0cc0619 | |
| parent | bd97586cc48431ebb3e5be7cdfcae435458dc508 (diff) | |
archive/bz2: renamed archive sources and plugin variables
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | src/archive/bz2_archive_plugin.c (renamed from src/archive/bz2_plugin.c) | 2 | ||||
| -rw-r--r-- | src/archive_list.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 4bcd1154..9e2838ed 100644 --- a/Makefile.am +++ b/Makefile.am @@ -351,7 +351,7 @@ ARCHIVE_LIBS = \ ARCHIVE_SRC = if HAVE_BZ2 -ARCHIVE_SRC += src/archive/bz2_plugin.c +ARCHIVE_SRC += src/archive/bz2_archive_plugin.c endif if HAVE_ZZIP diff --git a/src/archive/bz2_plugin.c b/src/archive/bz2_archive_plugin.c index 713dcc23..92d97b61 100644 --- a/src/archive/bz2_plugin.c +++ b/src/archive/bz2_archive_plugin.c @@ -267,7 +267,7 @@ static const struct input_plugin bz2_inputplugin = { .eof = bz2_is_eof, }; -const struct archive_plugin bz2_plugin = { +const struct archive_plugin bz2_archive_plugin = { .name = "bz2", .open = bz2_open, .scan_reset = bz2_scan_reset, diff --git a/src/archive_list.c b/src/archive_list.c index 6331a95f..b32bd663 100644 --- a/src/archive_list.c +++ b/src/archive_list.c @@ -25,13 +25,13 @@ #include <string.h> #include <glib.h> -extern const struct archive_plugin bz2_plugin; +extern const struct archive_plugin bz2_archive_plugin; extern const struct archive_plugin zzip_archive_plugin; extern const struct archive_plugin iso9660_archive_plugin; static const struct archive_plugin *const archive_plugins[] = { #ifdef HAVE_BZ2 - &bz2_plugin, + &bz2_archive_plugin, #endif #ifdef HAVE_ZZIP &zzip_archive_plugin, |