rvandegrift
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

edbus: Break while if a error happen in message_arguments_set 

Patch by: José Roberto de Souza  <zehortigoza@profusion.mobi>



SVN revision: 78549
This commit is contained in:
José Roberto de Souza 2012-10-26 18:19:57 +00:00 committed by Lucas De Marchi
parent 1513705c9b
commit c256bce151
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
legacy/edbus/src/lib/edbus_message.c
View File

@ -283,7 +283,7 @@ edbus_message_iter_arguments_vset(EDBus_Message_Iter *iter, const char *signatur
EINA_SAFETY_ON_FALSE_RETURN_VAL(iter->writable, EINA_FALSE);
dbus_signature_iter_init(&signature_iter, signature);
while ((type = dbus_signature_iter_get_signature(&signature_iter)) && r)
while ((type = dbus_signature_iter_get_signature(&signature_iter)))
{
if (type[0] != DBUS_TYPE_VARIANT && !type[1])
r = append_basic(type[0], MAKE_PTR_FROM_VA_LIST(ap),
@ -325,7 +325,7 @@ edbus_message_iter_arguments_vset(EDBus_Message_Iter *iter, const char *signatur
}
dbus_free(type);
if (!dbus_signature_iter_next(&signature_iter)) break;
if (!r || !dbus_signature_iter_next(&signature_iter)) break;
continue;
error:
r = EINA_FALSE;
@ -429,7 +429,7 @@ _edbus_message_arguments_vset(EDBus_Message *msg, const char *signature, va_list
EINA_SAFETY_ON_FALSE_RETURN_VAL(iter->writable, EINA_FALSE);
dbus_signature_iter_init(&signature_iter, signature);
while ((type = dbus_signature_iter_get_signature(&signature_iter)) && r)
while ((type = dbus_signature_iter_get_signature(&signature_iter)))
{
if (dbus_type_is_basic(type[0]))
r = append_basic(type[0], MAKE_PTR_FROM_VA_LIST(ap),
@ -443,7 +443,7 @@ _edbus_message_arguments_vset(EDBus_Message *msg, const char *signature, va_list
}
dbus_free(type);
if (!dbus_signature_iter_next(&signature_iter)) break;
if (!r || !dbus_signature_iter_next(&signature_iter)) break;
}
return r;