Changeset 47dbbb940a7211caebac367f2a0fc05c278f6f8b

Timestamp:

03/07/10 13:42:44 (5 months ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

e154c89ce313738b3356c116c83148b5b3044ce2

Parents:

c2f277228ed93d3377c520fa75ba53e51c484254

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-03-07T13:42:44Z+0200

Message:

sane helper for sending signals with complex parameters

• expose dbus_signal_send()
• dbus_signal_emit() is lame for complex parameters because path, interface and name function parameters are unused

Location:

dbus

Files:

• signal.c (modified) (3 diffs)
• signal.h (modified) (2 diffs)

dbus/signal.c

@@ -3 +3 @@
  * LADI Session Handler (ladish)
  *
- * Copyright (C) 2009 Nedko Arnaudov <nedko@arnaudov.name>
+ * Copyright (C) 2009, 2010 Nedko Arnaudov <nedko@arnaudov.name>
  * Copyright (C) 2008 Juuso Alasuutari <juuso.alasuutari@gmail.com>
  *
@@ -32 +32 @@
 #include "helpers.h"
 
-static void dbus_signal_send(DBusConnection * connection_ptr, DBusMessage * message_ptr)
+void dbus_signal_send(DBusConnection * connection_ptr, DBusMessage * message_ptr)
 {
   if (!dbus_connection_send(connection_ptr, message_ptr, NULL))
@@ -62 +62 @@
   va_start(ap, signature);
 
-  if (signature != NULL)
+  ASSERT(signature != NULL);
+
+  if (!dbus_signature_validate(signature, NULL))
   {
-    if (!dbus_signature_validate(signature, NULL))
+    log_error("signature '%s' is invalid", signature);
+    goto exit;
+  }
+
+  dbus_signature_iter_init(&sig_iter, signature);
+
+  message_ptr = dbus_message_new_signal(path, interface, name);
+  if (message_ptr == NULL)
+  {
+    log_error("dbus_message_new_signal() failed.");
+    goto exit;
+  }
+
+  dbus_message_iter_init_append(message_ptr, &iter);
+
+  while (*signature != '\0')
+  {
+    type = dbus_signature_iter_get_current_type(&sig_iter);
+    if (!dbus_type_is_basic(type))
     {
-      log_error("signature '%s' is invalid", signature);
-      goto exit;
+      log_error("non-basic input parameter '%c' (%d)", *signature, type);
+      goto unref;
     }
 
-    dbus_signature_iter_init(&sig_iter, signature);
+    parameter_ptr = va_arg(ap, void *);
 
-    message_ptr = dbus_message_new_signal(path, interface, name);
-    if (message_ptr == NULL)
+    if (!dbus_message_iter_append_basic(&iter, type, parameter_ptr))
     {
-      log_error("dbus_message_new_signal() failed.");
-      goto exit;
+      log_error("dbus_message_iter_append_basic() failed.");
+      goto unref;
     }
 
-    dbus_message_iter_init_append(message_ptr, &iter);
+    dbus_signature_iter_next(&sig_iter);
+    signature++;
+  }
 
-    while (*signature != '\0')
-    {
-      type = dbus_signature_iter_get_current_type(&sig_iter);
-      if (!dbus_type_is_basic(type))
-      {
-        log_error("non-basic input parameter '%c' (%d)", *signature, type);
-        goto unref;
-      }
+  dbus_signal_send(connection_ptr, message_ptr);
 
-      parameter_ptr = va_arg(ap, void *);
-
-      if (!dbus_message_iter_append_basic(&iter, type, parameter_ptr))
-      {
-        log_error("dbus_message_iter_append_basic() failed.");
-        goto unref;
-      }
-
-      dbus_signature_iter_next(&sig_iter);
-      signature++;
-    }
-
-    dbus_signal_send(connection_ptr, message_ptr);
-
-  unref:
-    dbus_message_unref(message_ptr);
-  }
-  else
-  {
-    message_ptr = va_arg(ap, DBusMessage *);
-    dbus_signal_send(connection_ptr, message_ptr);
-  }
+unref:
+  dbus_message_unref(message_ptr);
 
 exit:

dbus/signal.h

@@ -3 +3 @@
  * LADI Session Handler (ladish)
  *
- * Copyright (C) 2008, 2009 Nedko Arnaudov <nedko@arnaudov.name>
+ * Copyright (C) 2008, 2009, 2010 Nedko Arnaudov <nedko@arnaudov.name>
  * Copyright (C) 2008 Juuso Alasuutari <juuso.alasuutari@gmail.com>
  *
@@ -42 +42 @@
   const struct dbus_signal_arg_descriptor * args;
 };
+
+void dbus_signal_send(DBusConnection * connection_ptr, DBusMessage * message_ptr);
 
 void