Attachment 45298 Details for Bug 35766 – [PATCH 15/15] test-dbus-glib: make lose() abort, and make lose_gerror() more informative

[patch] [PATCH 15/15] test-dbus-glib: make lose() abort, and make lose_gerror() more informative

0015-test-dbus-glib-make-lose-abort-and-make-lose_gerror-.patch (text/plain), 1.60 KB, created by Simon McVittie on 2011-04-05 10:09:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-04-05 10:09:02 UTC

Size: 1.60 KB

patch

obsolete

>From c4a97c1e75bf16ed3e991b2c44e93a6a0ce4d65c Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Tue, 5 Apr 2011 17:43:15 +0100
>Subject: [PATCH 15/15] test-dbus-glib: make lose() abort, and make lose_gerror() more informative
>
>---
> test/core/test-dbus-glib.c |   21 ++++-----------------
> 1 files changed, 4 insertions(+), 17 deletions(-)
>
>diff --git a/test/core/test-dbus-glib.c b/test/core/test-dbus-glib.c
>index f86cba9..4ce1dde 100644
>--- a/test/core/test-dbus-glib.c
>+++ b/test/core/test-dbus-glib.c
>@@ -27,7 +27,8 @@ static gboolean proxy_destroy_and_nameowner_complete = FALSE;
> static DBusGProxy *test_terminate_proxy1 = NULL;
> static DBusGProxy *test_terminate_proxy2 = NULL;
> 
>-static void lose (const char *fmt, ...) G_GNUC_NORETURN G_GNUC_PRINTF (1, 2);
>+#define lose(...) g_error (__VA_ARGS__)
>+
> static void lose_gerror (const char *prefix, GError *error) G_GNUC_NORETURN;
> 
> static void
>@@ -464,28 +465,14 @@ test_subclass_get_all (DBusGConnection *connection,
> }
> 
> static void
>-lose (const char *str, ...)
>-{
>-  va_list args;
>-
>-  va_start (args, str);
>-
>-  vfprintf (stderr, str, args);
>-  fputc ('\n', stderr);
>-
>-  va_end (args);
>-
>-  exit (1);
>-}
>-
>-static void
> lose_gerror (const char *prefix, GError *error) 
> {
>   if (error->domain == DBUS_GERROR && error->code == DBUS_GERROR_REMOTE_EXCEPTION)
>     lose ("%s (%s): %s", prefix, dbus_g_error_get_name (error),
> 	  error->message);
>   else
>-    lose ("%s: %s", prefix, error->message);
>+    lose ("%s: %s#%d: %s", prefix, g_quark_to_string (error->domain),
>+        error->code, error->message);
> }
> 
> static void
>-- 
>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.