enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

e/connman: fix eina_safety checks 

SVN revision: 76064
This commit is contained in:
Lucas De Marchi 2012-09-03 22:04:49 +00:00
parent c603073254
commit dc908c9a3c
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/modules/connman/e_connman.c
View File

@ -237,9 +237,6 @@ static void _service_parse_prop_changed(struct Connman_Service *cs,
static void _service_prop_dict_changed(struct Connman_Service *cs,
DBusMessageIter *dict)
{
EINA_SAFETY_ON_FALSE_RETURN(dbus_message_iter_get_arg_type(dict) !=
DBUS_TYPE_ARRAY);
for (; dbus_message_iter_get_arg_type(dict) != DBUS_TYPE_INVALID;
dbus_message_iter_next(dict))
{
@ -248,13 +245,13 @@ static void _service_prop_dict_changed(struct Connman_Service *cs,
dbus_message_iter_recurse(dict, &entry);
EINA_SAFETY_ON_FALSE_RETURN(dbus_message_iter_get_arg_type(dict) !=
DBUS_TYPE_STRING);
EINA_SAFETY_ON_FALSE_RETURN(
dbus_message_iter_get_arg_type(&entry) == DBUS_TYPE_STRING);
dbus_message_iter_get_basic(&entry, &name);
dbus_message_iter_next(&entry);
EINA_SAFETY_ON_FALSE_RETURN(dbus_message_iter_get_arg_type(dict) !=
DBUS_TYPE_VARIANT);
dbus_message_iter_next(&entry);
EINA_SAFETY_ON_FALSE_RETURN(
dbus_message_iter_get_arg_type(&entry) == DBUS_TYPE_VARIANT);
dbus_message_iter_recurse(&entry, &var);
_service_parse_prop_changed(cs, name, &var);