From b04adde7ab6a2d69272f10d98def072e346156df Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 16 Dec 2009 16:11:45 +0100 Subject: archive: added a C header for each plugin Moved the archive plugin "extern" declarations into each plugin header. --- Makefile.am | 3 +++ src/archive/bz2_archive_plugin.c | 1 + src/archive/bz2_archive_plugin.h | 25 +++++++++++++++++++++++++ src/archive/iso9660_archive_plugin.c | 1 + src/archive/iso9660_archive_plugin.h | 25 +++++++++++++++++++++++++ src/archive/zzip_archive_plugin.c | 1 + src/archive/zzip_archive_plugin.h | 25 +++++++++++++++++++++++++ src/archive_list.c | 7 +++---- 8 files changed, 84 insertions(+), 4 deletions(-) create mode 100644 src/archive/bz2_archive_plugin.h create mode 100644 src/archive/iso9660_archive_plugin.h create mode 100644 src/archive/zzip_archive_plugin.h diff --git a/Makefile.am b/Makefile.am index 9e2838edc..f2e8cf3db 100644 --- a/Makefile.am +++ b/Makefile.am @@ -198,6 +198,9 @@ mpd_headers = \ src/archive_internal.h \ src/archive_list.h \ src/archive_plugin.h \ + src/archive/bz2_archive_plugin.h \ + src/archive/iso9660_archive_plugin.h \ + src/archive/zzip_archive_plugin.h \ src/input/archive_input_plugin.h \ src/cue/cue_tag.h diff --git a/src/archive/bz2_archive_plugin.c b/src/archive/bz2_archive_plugin.c index 44fac9f1f..32efc09dc 100644 --- a/src/archive/bz2_archive_plugin.c +++ b/src/archive/bz2_archive_plugin.c @@ -22,6 +22,7 @@ */ #include "config.h" +#include "archive/bz2_archive_plugin.h" #include "archive_api.h" #include "input_plugin.h" diff --git a/src/archive/bz2_archive_plugin.h b/src/archive/bz2_archive_plugin.h new file mode 100644 index 000000000..42b0c48ed --- /dev/null +++ b/src/archive/bz2_archive_plugin.h @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2003-2009 The Music Player Daemon Project + * http://www.musicpd.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPD_ARCHIVE_BZ2_H +#define MPD_ARCHIVE_BZ2_H + +extern const struct archive_plugin bz2_archive_plugin; + +#endif diff --git a/src/archive/iso9660_archive_plugin.c b/src/archive/iso9660_archive_plugin.c index 7e1901623..440393e41 100644 --- a/src/archive/iso9660_archive_plugin.c +++ b/src/archive/iso9660_archive_plugin.c @@ -22,6 +22,7 @@ */ #include "config.h" +#include "archive/iso9660_archive_plugin.h" #include "archive_api.h" #include "input_plugin.h" diff --git a/src/archive/iso9660_archive_plugin.h b/src/archive/iso9660_archive_plugin.h new file mode 100644 index 000000000..21730c537 --- /dev/null +++ b/src/archive/iso9660_archive_plugin.h @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2003-2009 The Music Player Daemon Project + * http://www.musicpd.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPD_ARCHIVE_ISO9660_H +#define MPD_ARCHIVE_ISO9660_H + +extern const struct archive_plugin iso9660_archive_plugin; + +#endif diff --git a/src/archive/zzip_archive_plugin.c b/src/archive/zzip_archive_plugin.c index ac6e7dac2..97b1d727d 100644 --- a/src/archive/zzip_archive_plugin.c +++ b/src/archive/zzip_archive_plugin.c @@ -22,6 +22,7 @@ */ #include "config.h" +#include "archive/zzip_archive_plugin.h" #include "archive_api.h" #include "archive_api.h" #include "input_plugin.h" diff --git a/src/archive/zzip_archive_plugin.h b/src/archive/zzip_archive_plugin.h new file mode 100644 index 000000000..07a8a2eca --- /dev/null +++ b/src/archive/zzip_archive_plugin.h @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2003-2009 The Music Player Daemon Project + * http://www.musicpd.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPD_ARCHIVE_ZZIP_H +#define MPD_ARCHIVE_ZZIP_H + +extern const struct archive_plugin zzip_archive_plugin; + +#endif diff --git a/src/archive_list.c b/src/archive_list.c index b32bd6635..191cb004a 100644 --- a/src/archive_list.c +++ b/src/archive_list.c @@ -21,14 +21,13 @@ #include "archive_list.h" #include "archive_plugin.h" #include "utils.h" +#include "archive/bz2_archive_plugin.h" +#include "archive/iso9660_archive_plugin.h" +#include "archive/zzip_archive_plugin.h" #include #include -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_archive_plugin, -- cgit v1.2.3