Attachment 45284 Details for Bug 35766 – [PATCH 01/15] dbus-gobject: factor out reply_or_die, error_or_die and add error-checking

[patch] [PATCH 01/15] dbus-gobject: factor out reply_or_die, error_or_die and add error-checking

0001-dbus-gobject-factor-out-reply_or_die-error_or_die-an.patch (text/plain), 5.45 KB, created by Simon McVittie on 2011-04-05 10:04:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-04-05 10:04:16 UTC

Size: 5.45 KB

patch

obsolete

>From 4d8605e04cf8aa48464b9c33d6698cb5892ad8b5 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 5 Apr 2011 14:56:16 +0100
>Subject: [PATCH 01/15] dbus-gobject: factor out reply_or_die, error_or_die and add error-checking
>
>---
> dbus/dbus-gobject.c |   83 ++++++++++++++++++++++++++++++--------------------
> 1 files changed, 50 insertions(+), 33 deletions(-)
>
>diff --git a/dbus/dbus-gobject.c b/dbus/dbus-gobject.c
>index 2688fd2..fcd9ee0 100644
>--- a/dbus/dbus-gobject.c
>+++ b/dbus/dbus-gobject.c
>@@ -35,6 +35,43 @@
> #include "dbus-gvalue-utils.h"
> #include <string.h>
> 
>+#include <gio/gio.h>
>+
>+static DBusMessage *
>+reply_or_die (DBusMessage *in_reply_to)
>+{
>+  DBusMessage *reply;
>+
>+  g_return_val_if_fail (in_reply_to != NULL, NULL);
>+
>+  reply = dbus_message_new_method_return (in_reply_to);
>+
>+  if (reply == NULL)
>+    g_error ("dbus_message_new_method_return failed: out of memory?");
>+
>+  return reply;
>+}
>+
>+static DBusMessage *
>+error_or_die (DBusMessage *in_reply_to,
>+    const gchar *error_name,
>+    const gchar *error_message)
>+{
>+  DBusMessage *reply;
>+
>+  g_return_val_if_fail (in_reply_to != NULL, NULL);
>+  /* error names are syntactically the same as interface names */
>+  g_return_val_if_fail (g_dbus_is_interface_name (error_name), NULL);
>+  g_return_val_if_fail (g_utf8_validate (error_message, -1, NULL), NULL);
>+
>+  reply = dbus_message_new_error (in_reply_to, error_name, error_message);
>+
>+  if (reply == NULL)
>+    g_error ("dbus_message_new_error failed: out of memory?");
>+
>+  return reply;
>+}
>+
> static char *lookup_property_name (GObject    *object,
>                                    const char *wincaps_propiface,
>                                    const char *requested_propname);
>@@ -948,9 +985,7 @@ handle_introspect (DBusConnection *connection,
>   /* Close the XML, and send it to the requesting app */
>   g_string_append (xml, "</node>\n");
> 
>-  ret = dbus_message_new_method_return (message);
>-  if (ret == NULL)
>-    g_error ("Out of memory");
>+  ret = reply_or_die (message);
> 
>   dbus_message_append_args (ret,
>                             DBUS_TYPE_STRING, &xml->str,
>@@ -993,17 +1028,13 @@ set_object_property (DBusConnection  *connection,
> 
>       g_value_unset (&value);
> 
>-      ret = dbus_message_new_method_return (message);
>-      if (ret == NULL)
>-        g_error ("out of memory");
>+      ret = reply_or_die (message);
>     }
>   else
>     {
>-      ret = dbus_message_new_error (message,
>-                                    DBUS_ERROR_INVALID_ARGS,
>-                                    "Argument's D-BUS type can't be converted to a GType");
>-      if (ret == NULL)
>-        g_error ("out of memory");
>+      ret = error_or_die (message,
>+          DBUS_ERROR_INVALID_ARGS,
>+          "Argument's D-BUS type can't be converted to a GType");
>     }
> 
>   return ret;
>@@ -1021,10 +1052,7 @@ get_object_property (DBusConnection *connection,
>   DBusMessage *ret;
>   DBusMessageIter iter, subiter;
> 
>-  ret = dbus_message_new_method_return (message);
>-  if (ret == NULL)
>-    g_error ("out of memory");
>-
>+  ret = reply_or_die (message);
> 
>   g_value_init (&value, pspec->value_type);
>   g_object_get_property (object, pspec->name, &value);
>@@ -1182,9 +1210,7 @@ get_all_object_properties (DBusConnection        *connection,
>   const char *p;
>   char *uscore_propname;
> 
>-  ret = dbus_message_new_method_return (message);
>-  if (ret == NULL)
>-    goto oom;
>+  ret = reply_or_die (message);
> 
>   dbus_message_iter_init_append (ret, &iter_ret);
> 
>@@ -1419,7 +1445,7 @@ gerror_to_dbus_error_message (const DBusGObjectInfo *object_info,
>       char *error_msg;
>       
>       error_msg = g_strdup_printf ("Method invoked for %s returned FALSE but did not set error", dbus_message_get_member (message));
>-      reply = dbus_message_new_error (message, "org.freedesktop.DBus.GLib.ErrorError", error_msg);
>+      reply = error_or_die (message, "org.freedesktop.DBus.GLib.ErrorError", error_msg);
>       g_free (error_msg);
>     }
>   else
>@@ -1489,7 +1515,7 @@ gerror_to_dbus_error_message (const DBusGObjectInfo *object_info,
>               break;
>             }
> 
>-          reply = dbus_message_new_error (message, name, error->message);
>+          reply = error_or_die (message, name, error->message);
>         }
>       else
> 	{
>@@ -1497,16 +1523,11 @@ gerror_to_dbus_error_message (const DBusGObjectInfo *object_info,
> 	  error_name = gerror_domaincode_to_dbus_error_name (object_info,
> 							     dbus_message_get_interface (message),
> 							     error->domain, error->code);
>-	  reply = dbus_message_new_error (message, error_name, error->message);
>-	  g_free (error_name); 
>-	}
>+          reply = error_or_die (message, error_name, error->message);
>+          g_free (error_name);
>+        }
>     }
> 
>-  /* this can only fail through a programming error in dbus-glib
>-   * (@message is bad), or OOM */
>-  if (reply == NULL)
>-    g_error ("dbus_message_new_error failed: out of memory?");
>-
>   return reply;
> }
> 
>@@ -1789,11 +1810,7 @@ invoke_object_method (GObject         *object,
>        */
>       if (send_reply)
>         {
>-          reply = dbus_message_new_method_return (message);
>-          /* this can only fail through a programming error in dbus-glib
>-           * itself (passing a bad message), or OOM */
>-          if (reply == NULL)
>-            g_error ("dbus_message_new_method_return failed: out of memory?");
>+          reply = reply_or_die (message);
> 
>           /* Append output arguments to reply */
>           dbus_message_iter_init_append (reply, &iter);
>-- 
>1.7.4.1
>

Actions: View | Splinter Review

Attachments on bug 35766: 45284 | 45285 | 45286 | 45287 | 45288 | 45289 | 45290 | 45291 | 45292 | 45293 | 45294 | 45295 | 45296 | 45297 | 45298

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.