summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorJosé Roberto de Souza <zehortigoza@profusion.mobi>2012-10-18 17:00:28 +0000
committerLucas De Marchi <lucas.demarchi@profusion.mobi>2012-10-18 17:00:28 +0000
commitc6bf21cbbe54a08a92f2f5f0efd52e71c9e4d22f (patch)
tree3e9f56b0e70d8f837f635f54571dd7d5790579fb /legacy
parent95376064270fd3c314b790f7a5b63850b4f54d8f (diff)
edbus: Use NULL instead of EDBUS_ARGS({"", ""})
Patch by: José Roberto de Souza <zehortigoza@profusion.mobi> SVN revision: 78192
Diffstat (limited to 'legacy')
-rw-r--r--legacy/edbus/src/examples/complex_types_server.c14
-rw-r--r--legacy/edbus/src/examples/server.c6
-rw-r--r--legacy/edbus/src/lib/edbus_service.c6
3 files changed, 13 insertions, 13 deletions
diff --git a/legacy/edbus/src/examples/complex_types_server.c b/legacy/edbus/src/examples/complex_types_server.c
index e3d0ad609d..dce769e1dc 100644
--- a/legacy/edbus/src/examples/complex_types_server.c
+++ b/legacy/edbus/src/examples/complex_types_server.c
@@ -289,23 +289,23 @@ _properties_set(const EDBus_Service_Interface *iface, const EDBus_Message *msg)
289static const EDBus_Method methods[] = { 289static const EDBus_Method methods[] = {
290 { 290 {
291 "ReceiveArray", EDBUS_ARGS({"as", "array_of_strings"}), 291 "ReceiveArray", EDBUS_ARGS({"as", "array_of_strings"}),
292 EDBUS_ARGS({"", ""}), _receive_array, 0 292 NULL, _receive_array, 0
293 }, 293 },
294 { 294 {
295 "ReceiveArrayOfStringIntWithSize", 295 "ReceiveArrayOfStringIntWithSize",
296 EDBUS_ARGS({"i", "size_of_array"}, {"a(si)", "array"}), 296 EDBUS_ARGS({"i", "size_of_array"}, {"a(si)", "array"}),
297 EDBUS_ARGS({"", ""}), _receive_array_of_string_int_with_size, 0 297 NULL, _receive_array_of_string_int_with_size, 0
298 }, 298 },
299 { 299 {
300 "SendVariantData", EDBUS_ARGS({"v", "variant_data"}), 300 "SendVariantData", EDBUS_ARGS({"v", "variant_data"}),
301 EDBUS_ARGS({"", ""}), _send_variant, 0 301 NULL, _send_variant, 0
302 }, 302 },
303 { 303 {
304 "SendArrayInt", EDBUS_ARGS({"", ""}), 304 "SendArrayInt", NULL,
305 EDBUS_ARGS({"ai", "array_of_int"}), _send_array_int, 0 305 EDBUS_ARGS({"ai", "array_of_int"}), _send_array_int, 0
306 }, 306 },
307 { 307 {
308 "SendArray", EDBUS_ARGS({"", ""}), EDBUS_ARGS({"as", "array_string"}), 308 "SendArray", NULL, EDBUS_ARGS({"as", "array_string"}),
309 _send_array, 0 309 _send_array, 0
310 }, 310 },
311 { 311 {
@@ -314,7 +314,7 @@ static const EDBus_Method methods[] = {
314 }, 314 },
315 { 315 {
316 "DoubleContainner", EDBUS_ARGS({"a(ii)", "array1"}, {"a(ii)", "array2"}), 316 "DoubleContainner", EDBUS_ARGS({"a(ii)", "array1"}, {"a(ii)", "array2"}),
317 EDBUS_ARGS({"", ""}), _double_container, 0 317 NULL, _double_container, 0
318 }, 318 },
319 { } 319 { }
320}; 320};
@@ -326,7 +326,7 @@ static const EDBus_Method properties_methods[] = {
326 }, 326 },
327 { 327 {
328 "Set", EDBUS_ARGS({"s", "interface"}, {"s", "property"}, {"v", "value"}), 328 "Set", EDBUS_ARGS({"s", "interface"}, {"s", "property"}, {"v", "value"}),
329 EDBUS_ARGS({"", ""}), _properties_set, 0 329 NULL, _properties_set, 0
330 }, 330 },
331 { } 331 { }
332}; 332};
diff --git a/legacy/edbus/src/examples/server.c b/legacy/edbus/src/examples/server.c
index 06424b393a..be3db13e48 100644
--- a/legacy/edbus/src/examples/server.c
+++ b/legacy/edbus/src/examples/server.c
@@ -151,11 +151,11 @@ static const EDBus_Signal signals[] = {
151 151
152static const EDBus_Method methods[] = { 152static const EDBus_Method methods[] = {
153 { 153 {
154 "Hello", EDBUS_ARGS({"", ""}), EDBUS_ARGS({"s", "message"}), 154 "Hello", NULL, EDBUS_ARGS({"s", "message"}),
155 _hello, 0 155 _hello, 0
156 }, 156 },
157 { 157 {
158 "Quit", EDBUS_ARGS({"", ""}), EDBUS_ARGS({"", ""}), 158 "Quit", NULL, NULL,
159 _quit, EDBUS_METHOD_FLAG_DEPRECATED 159 _quit, EDBUS_METHOD_FLAG_DEPRECATED
160 }, 160 },
161 { "SendBool", EDBUS_ARGS({"b", "bool"}), EDBUS_ARGS({"b", "bool"}), 161 { "SendBool", EDBUS_ARGS({"b", "bool"}), EDBUS_ARGS({"b", "bool"}),
@@ -179,7 +179,7 @@ static const EDBus_Method methods[] = {
179 { "SendString", EDBUS_ARGS({"s", "string"}), EDBUS_ARGS({"s", "string"}), 179 { "SendString", EDBUS_ARGS({"s", "string"}), EDBUS_ARGS({"s", "string"}),
180 _send_string, 0 180 _send_string, 0
181 }, 181 },
182 { "AsyncTest", EDBUS_ARGS({"", ""}), EDBUS_ARGS({"s", "text"}), 182 { "AsyncTest", NULL, EDBUS_ARGS({"s", "text"}),
183 _async_test, 0 183 _async_test, 0
184 }, 184 },
185 { } 185 { }
diff --git a/legacy/edbus/src/lib/edbus_service.c b/legacy/edbus/src/lib/edbus_service.c
index c0bb94fa8b..4568cd6079 100644
--- a/legacy/edbus/src/lib/edbus_service.c
+++ b/legacy/edbus/src/lib/edbus_service.c
@@ -265,7 +265,7 @@ _have_signature(const EDBus_Arg_Info *args, EDBus_Message *msg)
265 const char *sig = dbus_message_get_signature(msg->dbus_msg); 265 const char *sig = dbus_message_get_signature(msg->dbus_msg);
266 const char *p = NULL; 266 const char *p = NULL;
267 267
268 for (; args->signature && *args->signature && *sig; args++) 268 for (; args && args->signature && *sig; args++)
269 { 269 {
270 p = args->signature; 270 p = args->signature;
271 for (; *sig && *p; sig++, p++) 271 for (; *sig && *p; sig++, p++)
@@ -273,9 +273,9 @@ _have_signature(const EDBus_Arg_Info *args, EDBus_Message *msg)
273 if (*p != *sig) 273 if (*p != *sig)
274 return EINA_FALSE; 274 return EINA_FALSE;
275 } 275 }
276 } 276 }
277 277
278 if (*sig || (p && *p) || (args->signature && *args->signature)) 278 if (*sig || (p && *p) || (args && args->signature))
279 return EINA_FALSE; 279 return EINA_FALSE;
280 280
281 return EINA_TRUE; 281 return EINA_TRUE;