utils: renamed stringFoundInStringArray()

No CamelCase.  Use bool instead of int.  Make both arguments
mandatory.
This commit is contained in:
Max Kellermann
2009-11-06 19:50:47 +01:00
parent ba34d48cf0
commit f9218423b9
6 changed files with 35 additions and 30 deletions

View File

@@ -118,8 +118,8 @@ decoder_plugin_from_suffix(const char *suffix, unsigned int next)
i = 0;
for (; i < num_decoder_plugins; ++i) {
const struct decoder_plugin *plugin = decoder_plugins[i];
if (decoder_plugins_enabled[i] &&
stringFoundInStringArray(plugin->suffixes, suffix)) {
if (decoder_plugins_enabled[i] && plugin->suffixes != NULL &&
string_array_contains(plugin->suffixes, suffix)) {
++i;
return plugin;
}
@@ -140,8 +140,8 @@ decoder_plugin_from_mime_type(const char *mimeType, unsigned int next)
i = 0;
for (; i < num_decoder_plugins; ++i) {
const struct decoder_plugin *plugin = decoder_plugins[i];
if (decoder_plugins_enabled[i] &&
stringFoundInStringArray(plugin->mime_types, mimeType)) {
if (decoder_plugins_enabled[i] && plugin->mime_types != NULL &&
string_array_contains(plugin->mime_types, mimeType)) {
++i;
return plugin;
}