oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

archive_list: iterate with NULL check

Browse Source 
Don't use num_archive_plugins.
This commit is contained in:
Max Kellermann 2009-12-15 17:31:00 +01:00
parent 243c96304b
commit f1ecd9eac8
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/archive_list.c
View File

@ -42,22 +42,16 @@ static const struct archive_plugin *const archive_plugins[] = {
NULL NULL
}; };
enum {
num_archive_plugins = G_N_ELEMENTS(archive_plugins)-1,
};
/** which plugins have been initialized successfully? */ /** which plugins have been initialized successfully? */
static bool archive_plugins_enabled[num_archive_plugins+1]; static bool archive_plugins_enabled[G_N_ELEMENTS(archive_plugins) - 1];
const struct archive_plugin * const struct archive_plugin *
archive_plugin_from_suffix(const char *suffix) archive_plugin_from_suffix(const char *suffix)
{ {
unsigned i;
if (suffix == NULL) if (suffix == NULL)
return NULL; return NULL;
for (i=0; i < num_archive_plugins; ++i) { for (unsigned i = 0; archive_plugins[i] != NULL; ++i) {
const struct archive_plugin *plugin = archive_plugins[i]; const struct archive_plugin *plugin = archive_plugins[i];
if (archive_plugins_enabled[i] && if (archive_plugins_enabled[i] &&
plugin->suffixes != NULL && plugin->suffixes != NULL &&
@ -72,7 +66,7 @@ archive_plugin_from_suffix(const char *suffix)
const struct archive_plugin * const struct archive_plugin *
archive_plugin_from_name(const char *name) archive_plugin_from_name(const char *name)
{ {
for (unsigned i = 0; i < num_archive_plugins; ++i) { for (unsigned i = 0; archive_plugins[i] != NULL; ++i) {
const struct archive_plugin *plugin = archive_plugins[i]; const struct archive_plugin *plugin = archive_plugins[i];
if (archive_plugins_enabled[i] && if (archive_plugins_enabled[i] &&
strcmp(plugin->name, name) == 0) strcmp(plugin->name, name) == 0)
@ -85,7 +79,7 @@ void archive_plugin_print_all_suffixes(FILE * fp)
{ {
const char *const*suffixes; const char *const*suffixes;
for (unsigned i = 0; i < num_archive_plugins; ++i) { for (unsigned i = 0; archive_plugins[i] != NULL; ++i) {
const struct archive_plugin *plugin = archive_plugins[i]; const struct archive_plugin *plugin = archive_plugins[i];
if (!archive_plugins_enabled[i]) if (!archive_plugins_enabled[i])
continue; continue;
@ -102,7 +96,7 @@ void archive_plugin_print_all_suffixes(FILE * fp)
void archive_plugin_init_all(void) void archive_plugin_init_all(void)
{ {
for (unsigned i = 0; i < num_archive_plugins; ++i) { for (unsigned i = 0; archive_plugins[i] != NULL; ++i) {
const struct archive_plugin *plugin = archive_plugins[i]; const struct archive_plugin *plugin = archive_plugins[i];
if (plugin->init == NULL || archive_plugins[i]->init()) if (plugin->init == NULL || archive_plugins[i]->init())
archive_plugins_enabled[i] = true; archive_plugins_enabled[i] = true;
@ -111,7 +105,7 @@ void archive_plugin_init_all(void)
void archive_plugin_deinit_all(void) void archive_plugin_deinit_all(void)
{ {
for (unsigned i = 0; i < num_archive_plugins; ++i) { for (unsigned i = 0; archive_plugins[i] != NULL; ++i) {
const struct archive_plugin *plugin = archive_plugins[i]; const struct archive_plugin *plugin = archive_plugins[i];
if (archive_plugins_enabled[i] && plugin->finish != NULL) if (archive_plugins_enabled[i] && plugin->finish != NULL)
archive_plugins[i]->finish(); archive_plugins[i]->finish();