archive/bz2: renamed archive sources and plugin variables

This commit is contained in:
Max Kellermann 2009-12-16 16:04:16 +01:00
parent bd97586cc4
commit b009970af7
3 changed files with 4 additions and 4 deletions

View File

@ -351,7 +351,7 @@ ARCHIVE_LIBS = \
ARCHIVE_SRC = ARCHIVE_SRC =
if HAVE_BZ2 if HAVE_BZ2
ARCHIVE_SRC += src/archive/bz2_plugin.c ARCHIVE_SRC += src/archive/bz2_archive_plugin.c
endif endif
if HAVE_ZZIP if HAVE_ZZIP

View File

@ -267,7 +267,7 @@ static const struct input_plugin bz2_inputplugin = {
.eof = bz2_is_eof, .eof = bz2_is_eof,
}; };
const struct archive_plugin bz2_plugin = { const struct archive_plugin bz2_archive_plugin = {
.name = "bz2", .name = "bz2",
.open = bz2_open, .open = bz2_open,
.scan_reset = bz2_scan_reset, .scan_reset = bz2_scan_reset,

View File

@ -25,13 +25,13 @@
#include <string.h> #include <string.h>
#include <glib.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 zzip_archive_plugin;
extern const struct archive_plugin iso9660_archive_plugin; extern const struct archive_plugin iso9660_archive_plugin;
static const struct archive_plugin *const archive_plugins[] = { static const struct archive_plugin *const archive_plugins[] = {
#ifdef HAVE_BZ2 #ifdef HAVE_BZ2
&bz2_plugin, &bz2_archive_plugin,
#endif #endif
#ifdef HAVE_ZZIP #ifdef HAVE_ZZIP
&zzip_archive_plugin, &zzip_archive_plugin,