fix return type of fluid_settings_get_type()

This commit is contained in:
derselbst 2017-09-21 15:31:49 +02:00
parent 2700519b3e
commit 872cedbd69

View file

@ -607,22 +607,22 @@ fluid_settings_register_int(fluid_settings_t* settings, const char* name, int de
* *
* @param settings a settings object * @param settings a settings object
* @param name a setting's name * @param name a setting's name
* @return the type for the named setting, or #FLUID_NO_TYPE when it does not exist * @return the type for the named setting (see #fluid_types_enum), or #FLUID_NO_TYPE when it does not exist
*/ */
enum fluid_types_enum int
fluid_settings_get_type(fluid_settings_t* settings, const char *name) fluid_settings_get_type(fluid_settings_t* settings, const char *name)
{ {
fluid_setting_node_t *node; fluid_setting_node_t *node;
enum fluid_types_enum type = FLUID_NO_TYPE; int type = FLUID_NO_TYPE;
fluid_return_val_if_fail (settings != NULL, FLUID_NO_TYPE); fluid_return_val_if_fail (settings != NULL, type);
fluid_return_val_if_fail (name != NULL, FLUID_NO_TYPE); fluid_return_val_if_fail (name != NULL, type);
fluid_return_val_if_fail (name[0] != '\0', FLUID_NO_TYPE); fluid_return_val_if_fail (name[0] != '\0', type);
fluid_rec_mutex_lock (settings->mutex); fluid_rec_mutex_lock (settings->mutex);
type = fluid_settings_get (settings, name, &node) == FLUID_OK if(fluid_settings_get (settings, name, &node) == FLUID_OK)
? (enum fluid_types_enum)node->type type = node->type;
: FLUID_NO_TYPE;
fluid_rec_mutex_unlock (settings->mutex); fluid_rec_mutex_unlock (settings->mutex);
return type; return type;