zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2024-12-11 21:31:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

better return a bool for fluid_settings_str_equal()

Browse source
This commit is contained in:
derselbst 2017-09-21 21:48:06 +02:00
parent 225a546276
commit 5f3cafbcfd
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/utils/fluid_settings.c
View file

@ -896,13 +896,13 @@ fluid_settings_dupstr(fluid_settings_t* settings, const char *name, char** str)
* @param settings a settings object * @param settings a settings object
* @param name a setting's name * @param name a setting's name
* @param s a string to be tested * @param s a string to be tested
* @return #FLUID_OK if the value exists and is equal to 's', #FLUID_FAILED otherwise * @return TRUE if the value exists and is equal to 's', FALSE otherwise
*/ */
int int
fluid_settings_str_equal (fluid_settings_t* settings, const char *name, const char *s) fluid_settings_str_equal (fluid_settings_t* settings, const char *name, const char *s)
{ {
fluid_setting_node_t *node; fluid_setting_node_t *node;
int retval = FLUID_FAILED; int retval = FALSE;
fluid_return_val_if_fail (settings != NULL, retval); fluid_return_val_if_fail (settings != NULL, retval);
fluid_return_val_if_fail (name != NULL, retval); fluid_return_val_if_fail (name != NULL, retval);
@ -917,22 +917,14 @@ fluid_settings_str_equal (fluid_settings_t* settings, const char *name, const ch
{ {
fluid_str_setting_t *setting = (fluid_str_setting_t *)node; fluid_str_setting_t *setting = (fluid_str_setting_t *)node;
if (setting->value) if (setting->value)
{ retval = FLUID_STRCMP (setting->value, s) == 0;
retval = FLUID_STRCMP (setting->value, s) == 0
? FLUID_OK
: FLUID_FAILED;
}
} }
else if (node->type == FLUID_INT_TYPE) /* Handle boolean integers for backwards compatibility */ else if (node->type == FLUID_INT_TYPE) /* Handle boolean integers for backwards compatibility */
{ {
fluid_int_setting_t *setting = (fluid_int_setting_t *)node; fluid_int_setting_t *setting = (fluid_int_setting_t *)node;
if (setting->hints & FLUID_HINT_TOGGLED) if (setting->hints & FLUID_HINT_TOGGLED)
{ retval = FLUID_STRCMP (setting->value ? "yes" : "no", s) == 0;
retval = FLUID_STRCMP (setting->value ? "yes" : "no", s) == 0
? FLUID_OK
: FLUID_FAILED;
}
} }
} }