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

edbus: Add some EINA_SAFETY to public API 

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



SVN revision: 78553
This commit is contained in:
José Roberto de Souza 2012-10-26 18:20:19 +00:00 committed by Lucas De Marchi
parent 5153494542
commit dd7e8ad1a7
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -280,7 +280,9 @@ edbus_message_iter_arguments_vset(EDBus_Message_Iter *iter, const char *signatur
Eina_Bool r = EINA_TRUE;
char *type;
EDBUS_MESSAGE_ITERATOR_CHECK_RETVAL(iter, EINA_FALSE);
EINA_SAFETY_ON_FALSE_RETURN_VAL(iter->writable, EINA_FALSE);
EINA_SAFETY_ON_NULL_RETURN_VAL(signature, EINA_FALSE);
dbus_signature_iter_init(&signature_iter, signature);
while ((type = dbus_signature_iter_get_signature(&signature_iter)))
@ -422,8 +424,9 @@ _edbus_message_arguments_vset(EDBus_Message *msg, const char *signature, va_list
char *type;
Eina_Bool r = EINA_TRUE;
if (!signature || !signature[0]) return EINA_TRUE;
EINA_SAFETY_ON_FALSE_RETURN_VAL(dbus_signature_validate(signature, NULL), EINA_FALSE);
if (!signature[0]) return EINA_TRUE;
EINA_SAFETY_ON_FALSE_RETURN_VAL(dbus_signature_validate(signature, NULL),
EINA_FALSE);
iter = edbus_message_iter_get(msg);
EINA_SAFETY_ON_FALSE_RETURN_VAL(iter->writable, EINA_FALSE);
@ -436,9 +439,9 @@ _edbus_message_arguments_vset(EDBus_Message *msg, const char *signature, va_list
&iter->dbus_iterator);
else
{
ERR("edbus_message_arguments_set() and \
ERR("sig = %s | edbus_message_arguments_set() and \
edbus_message_arguments_vset() only support basic types, \
to complex types use edbus_message_iter_* functions");
to complex types use edbus_message_iter_* functions", signature);
r = EINA_FALSE;
}
@ -541,9 +544,10 @@ edbus_message_iter_sub_iter_get(EDBus_Message_Iter *iter)
return sub;
}
EAPI char*
EAPI char *
edbus_message_iter_signature_get(EDBus_Message_Iter *iter)
{
EDBUS_MESSAGE_ITERATOR_CHECK_RETVAL(iter, NULL);
return dbus_message_iter_get_signature(&iter->dbus_iterator);
}