LADI
/
ladish
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow external creation of input message for dbus_call()

This commit is contained in:
Nedko Arnaudov 2009-09-05 19:19:55 +03:00
parent 9290a15648
commit 9ce6f0a4e4
1 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dbus/helpers.c
View File

@ -296,6 +296,8 @@ dbus_call(
ret = false; ret = false;
va_start(ap, input_signature); va_start(ap, input_signature);
if (input_signature != NULL)
{
if (!dbus_signature_validate(input_signature, NULL)) if (!dbus_signature_validate(input_signature, NULL))
{ {
lash_error("input signature '%s' is invalid", input_signature); lash_error("input signature '%s' is invalid", input_signature);
@ -333,6 +335,11 @@ dbus_call(
dbus_signature_iter_next(&sig_iter); dbus_signature_iter_next(&sig_iter);
input_signature++; input_signature++;
} }
}
else
{
request_ptr = va_arg(ap, DBusMessage *);
}
output_signature = va_arg(ap, const char *); output_signature = va_arg(ap, const char *);
@ -342,7 +349,10 @@ dbus_call(
DBUS_CALL_DEFAULT_TIMEOUT, DBUS_CALL_DEFAULT_TIMEOUT,
&g_dbus_error); &g_dbus_error);
if (input_signature != NULL)
{
dbus_message_unref(request_ptr); dbus_message_unref(request_ptr);
}
if (reply_ptr == NULL) if (reply_ptr == NULL)
{ {