forked from enlightenment/efl
edbus: Use NULL instead of EDBUS_ARGS({"", ""})
Patch by: José Roberto de Souza <zehortigoza@profusion.mobi> SVN revision: 78192
This commit is contained in:
parent
9537606427
commit
c6bf21cbbe
|
@ -289,23 +289,23 @@ _properties_set(const EDBus_Service_Interface *iface, const EDBus_Message *msg)
|
|||
static const EDBus_Method methods[] = {
|
||||
{
|
||||
"ReceiveArray", EDBUS_ARGS({"as", "array_of_strings"}),
|
||||
EDBUS_ARGS({"", ""}), _receive_array, 0
|
||||
NULL, _receive_array, 0
|
||||
},
|
||||
{
|
||||
"ReceiveArrayOfStringIntWithSize",
|
||||
EDBUS_ARGS({"i", "size_of_array"}, {"a(si)", "array"}),
|
||||
EDBUS_ARGS({"", ""}), _receive_array_of_string_int_with_size, 0
|
||||
NULL, _receive_array_of_string_int_with_size, 0
|
||||
},
|
||||
{
|
||||
"SendVariantData", EDBUS_ARGS({"v", "variant_data"}),
|
||||
EDBUS_ARGS({"", ""}), _send_variant, 0
|
||||
NULL, _send_variant, 0
|
||||
},
|
||||
{
|
||||
"SendArrayInt", EDBUS_ARGS({"", ""}),
|
||||
"SendArrayInt", NULL,
|
||||
EDBUS_ARGS({"ai", "array_of_int"}), _send_array_int, 0
|
||||
},
|
||||
{
|
||||
"SendArray", EDBUS_ARGS({"", ""}), EDBUS_ARGS({"as", "array_string"}),
|
||||
"SendArray", NULL, EDBUS_ARGS({"as", "array_string"}),
|
||||
_send_array, 0
|
||||
},
|
||||
{
|
||||
|
@ -314,7 +314,7 @@ static const EDBus_Method methods[] = {
|
|||
},
|
||||
{
|
||||
"DoubleContainner", EDBUS_ARGS({"a(ii)", "array1"}, {"a(ii)", "array2"}),
|
||||
EDBUS_ARGS({"", ""}), _double_container, 0
|
||||
NULL, _double_container, 0
|
||||
},
|
||||
{ }
|
||||
};
|
||||
|
@ -326,7 +326,7 @@ static const EDBus_Method properties_methods[] = {
|
|||
},
|
||||
{
|
||||
"Set", EDBUS_ARGS({"s", "interface"}, {"s", "property"}, {"v", "value"}),
|
||||
EDBUS_ARGS({"", ""}), _properties_set, 0
|
||||
NULL, _properties_set, 0
|
||||
},
|
||||
{ }
|
||||
};
|
||||
|
|
|
@ -151,11 +151,11 @@ static const EDBus_Signal signals[] = {
|
|||
|
||||
static const EDBus_Method methods[] = {
|
||||
{
|
||||
"Hello", EDBUS_ARGS({"", ""}), EDBUS_ARGS({"s", "message"}),
|
||||
"Hello", NULL, EDBUS_ARGS({"s", "message"}),
|
||||
_hello, 0
|
||||
},
|
||||
{
|
||||
"Quit", EDBUS_ARGS({"", ""}), EDBUS_ARGS({"", ""}),
|
||||
"Quit", NULL, NULL,
|
||||
_quit, EDBUS_METHOD_FLAG_DEPRECATED
|
||||
},
|
||||
{ "SendBool", EDBUS_ARGS({"b", "bool"}), EDBUS_ARGS({"b", "bool"}),
|
||||
|
@ -179,7 +179,7 @@ static const EDBus_Method methods[] = {
|
|||
{ "SendString", EDBUS_ARGS({"s", "string"}), EDBUS_ARGS({"s", "string"}),
|
||||
_send_string, 0
|
||||
},
|
||||
{ "AsyncTest", EDBUS_ARGS({"", ""}), EDBUS_ARGS({"s", "text"}),
|
||||
{ "AsyncTest", NULL, EDBUS_ARGS({"s", "text"}),
|
||||
_async_test, 0
|
||||
},
|
||||
{ }
|
||||
|
|
|
@ -265,7 +265,7 @@ _have_signature(const EDBus_Arg_Info *args, EDBus_Message *msg)
|
|||
const char *sig = dbus_message_get_signature(msg->dbus_msg);
|
||||
const char *p = NULL;
|
||||
|
||||
for (; args->signature && *args->signature && *sig; args++)
|
||||
for (; args && args->signature && *sig; args++)
|
||||
{
|
||||
p = args->signature;
|
||||
for (; *sig && *p; sig++, p++)
|
||||
|
@ -273,9 +273,9 @@ _have_signature(const EDBus_Arg_Info *args, EDBus_Message *msg)
|
|||
if (*p != *sig)
|
||||
return EINA_FALSE;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (*sig || (p && *p) || (args->signature && *args->signature))
|
||||
if (*sig || (p && *p) || (args && args->signature))
|
||||
return EINA_FALSE;
|
||||
|
||||
return EINA_TRUE;
|
||||
|
|
Loading…
Reference in New Issue