diff --git a/Makefile.am b/Makefile.am index 4bcd1154e..9e2838edc 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 similarity index 99% rename from src/archive/bz2_plugin.c rename to src/archive/bz2_archive_plugin.c index 713dcc234..92d97b61a 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 6331a95fd..b32bd6635 100644 --- a/src/archive_list.c +++ b/src/archive_list.c @@ -25,13 +25,13 @@ #include #include -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,