do not use EINA_FALSE instead of NULL

This commit is contained in:
Jérémy Zurcher 2014-05-07 17:32:49 +02:00
parent 5a1c7f6d9b
commit f8c2c57406
13 changed files with 24 additions and 24 deletions

View File

@ -2377,7 +2377,7 @@ ecore_evas_window_group_get(const Ecore_Evas *ee)
{
ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS,
"XXX");
return EINA_FALSE;
return NULL;
}
return ee->prop.group_ee;
}

View File

@ -7126,13 +7126,13 @@ edje_edit_source_generate(Evas_Object *obj)
Eina_List *images = NULL, *color_classes = NULL, *styles = NULL, *fonts = NULL;
Eina_List *l;
GET_ED_OR_RETURN(EINA_FALSE);
GET_EED_OR_RETURN(EINA_FALSE);
GET_ED_OR_RETURN(NULL);
GET_EED_OR_RETURN(NULL);
if (!ed->file) return NULL;
ce = eina_hash_find(ed->file->collection, ed->group);
if (!ce) return EINA_FALSE;
if (!ce) return NULL;
/* Go through all of group's parts to find all resources needed for that group. */
for (i = 0; i < ed->table_parts_size; i++)

View File

@ -476,13 +476,13 @@ _edje_external_content_get(const Evas_Object *obj, const char *content)
if (!type)
{
ERR("no external type for object %p", obj);
return EINA_FALSE;
return NULL;
}
if (!type->content_get)
{
ERR("external type '%s' from module '%s' does not provide content_get()",
type->module_name, type->module);
return EINA_FALSE;
return NULL;
}
return type->content_get(type->data, obj, content);
}

View File

@ -86,5 +86,5 @@ eeze_disk_udev_walk_get_sysattr(Eeze_Disk *disk,
test = udev_device_get_sysattr_value(parent, sysattr);
if (test) return eina_stringshare_add(test);
}
return EINA_FALSE;
return NULL;
}

View File

@ -188,7 +188,7 @@ eeze_sensor_new(Eeze_Sensor_Type type)
if (!module)
{
free(sens);
return EINA_FALSE;
return NULL;
}
if (!module->read)

View File

@ -5113,7 +5113,7 @@ eina_value_array_new(const Eina_Value_Type *subtype, unsigned int step)
{
Eina_Value *value;
EINA_SAFETY_ON_FALSE_RETURN_VAL(eina_value_type_check(subtype), EINA_FALSE);
EINA_SAFETY_ON_FALSE_RETURN_VAL(eina_value_type_check(subtype), NULL);
value = eina_mempool_malloc(_eina_value_mp, sizeof(Eina_Value));
if (!value)
@ -5133,7 +5133,7 @@ eina_value_list_new(const Eina_Value_Type *subtype)
{
Eina_Value *value;
EINA_SAFETY_ON_FALSE_RETURN_VAL(eina_value_type_check(subtype), EINA_FALSE);
EINA_SAFETY_ON_FALSE_RETURN_VAL(eina_value_type_check(subtype), NULL);
value = eina_mempool_malloc(_eina_value_mp, sizeof(Eina_Value));
if (!value)
@ -5153,7 +5153,7 @@ eina_value_hash_new(const Eina_Value_Type *subtype, unsigned int buckets_power_s
{
Eina_Value *value;
EINA_SAFETY_ON_FALSE_RETURN_VAL(eina_value_type_check(subtype), EINA_FALSE);
EINA_SAFETY_ON_FALSE_RETURN_VAL(eina_value_type_check(subtype), NULL);
value = eina_mempool_malloc(_eina_value_mp, sizeof(Eina_Value));
if (!value)

View File

@ -614,7 +614,7 @@ eio_file_check(Eio_File *ls)
EAPI void *
eio_file_container_get(Eio_File *ls)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(ls, EINA_FALSE);
EINA_SAFETY_ON_NULL_RETURN_VAL(ls, NULL);
return ls->container;
}

View File

@ -936,10 +936,10 @@ _eldbus_service_interface_register(Eldbus_Connection *conn, const char *path, co
const Eldbus_Property *property;
Eina_Array *signatures;
EINA_SAFETY_ON_NULL_RETURN_VAL(conn, EINA_FALSE);
EINA_SAFETY_ON_NULL_RETURN_VAL(path, EINA_FALSE);
EINA_SAFETY_ON_NULL_RETURN_VAL(desc, EINA_FALSE);
EINA_SAFETY_ON_NULL_RETURN_VAL(desc->interface, EINA_FALSE);
EINA_SAFETY_ON_NULL_RETURN_VAL(conn, NULL);
EINA_SAFETY_ON_NULL_RETURN_VAL(path, NULL);
EINA_SAFETY_ON_NULL_RETURN_VAL(desc, NULL);
EINA_SAFETY_ON_NULL_RETURN_VAL(desc->interface, NULL);
if (!dbus_connection_get_object_path_data(conn->dbus_conn, path,
(void*)&obj))
@ -1380,9 +1380,9 @@ EAPI Eldbus_Message *
eldbus_service_signal_new(const Eldbus_Service_Interface *iface, unsigned int signal_id)
{
unsigned size;
ELDBUS_SERVICE_INTERFACE_CHECK_RETVAL(iface, EINA_FALSE);
ELDBUS_SERVICE_INTERFACE_CHECK_RETVAL(iface, NULL);
size = eina_array_count(iface->sign_of_signals);
EINA_SAFETY_ON_FALSE_RETURN_VAL(signal_id < size, EINA_FALSE);
EINA_SAFETY_ON_FALSE_RETURN_VAL(signal_id < size, NULL);
return eldbus_message_signal_new(iface->obj->path, iface->name,
iface->signals[signal_id].name);

View File

@ -319,7 +319,7 @@ EAPI const char *
eolian_class_description_get(const char *class_name)
{
Class_desc *desc = _class_get(class_name);
EINA_SAFETY_ON_NULL_RETURN_VAL(desc, EINA_FALSE);
EINA_SAFETY_ON_NULL_RETURN_VAL(desc, NULL);
return desc->description;
}

View File

@ -245,7 +245,7 @@ EAPI const char *
evas_gl_string_query(Evas_GL *evas_gl, int name)
{
MAGIC_CHECK(evas_gl, Evas_GL, MAGIC_EVAS_GL);
return EINA_FALSE;
return NULL;
MAGIC_CHECK_END();
return (const char *)evas_gl->evas->engine.func->gl_string_query(evas_gl->evas->engine.data.output, name);
@ -255,7 +255,7 @@ EAPI Evas_GL_Func
evas_gl_proc_address_get(Evas_GL *evas_gl, const char *name)
{
MAGIC_CHECK(evas_gl, Evas_GL, MAGIC_EVAS_GL);
return EINA_FALSE;
return NULL;
MAGIC_CHECK_END();
return (Evas_GL_Func)evas_gl->evas->engine.func->gl_proc_address_get(evas_gl->evas->engine.data.output, name);

View File

@ -432,7 +432,7 @@ _rgba_image_alloc(Evas_Filter_Buffer const *fb, void *data)
(evas_common_image_cache_get(), fb->w, fb->h, data, EINA_TRUE, cspace);
}
}
if (!image) return EINA_FALSE;
if (!image) return NULL;
if (fb->alpha_only)
sz = image->cache_entry.w * image->cache_entry.h * sizeof(DATA8);

View File

@ -123,7 +123,7 @@ _extnbuf_lock(Extnbuf *b, int *w, int *h, int *stride)
if (lockf(b->lockfd, F_LOCK, 0) < 0)
{
ERR("lock take fail");
return EINA_FALSE;
return NULL;
}
}
b->have_lock = EINA_TRUE;

View File

@ -25,7 +25,7 @@ evas_image_load_file_open_eet(Eina_File *f, Eina_Stringshare *key,
if (!key)
{
*error = EVAS_LOAD_ERROR_DOES_NOT_EXIST;
return EINA_FALSE;
return NULL;
}
loader = calloc(1, sizeof (Evas_Loader_Internal));