luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-13 07:56:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

gdbus tool: print GVariant errors in context

Browse Source 
Use g_variant_parse_error_print_context() to format the error message
from the GVariant parser.

There is a slightly dubious interaction with the "parse me harder"
functionality here.  We're probably going to have to deal with that
separately.

https://bugzilla.gnome.org/show_bug.cgi?id=715028
This commit is contained in:
Ryan Lortie 2013-11-22 13:06:54 -05:00
parent 94a89f6c2f
commit ee5dab6bb5
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gio/gdbus-tool.c
View File

@ -671,18 +671,24 @@ handle_emit (gint *argc,
&error); &error);
if (value == NULL) if (value == NULL)
{ {
gchar *context;
context = g_variant_parse_error_print_context (error, (*argv)[n]);
g_error_free (error); g_error_free (error);
error = NULL; error = NULL;
value = _g_variant_parse_me_harder (NULL, (*argv)[n], &error); value = _g_variant_parse_me_harder (NULL, (*argv)[n], &error);
if (value == NULL) if (value == NULL)
{ {
/* Use the original non-"parse-me-harder" error */
g_printerr (_("Error parsing parameter %d: %s\n"), g_printerr (_("Error parsing parameter %d: %s\n"),
n, n,
error->message); context);
g_error_free (error); g_error_free (error);
g_free (context);
g_variant_builder_clear (&builder); g_variant_builder_clear (&builder);
goto out; goto out;
} }
g_free (context);
} }
g_variant_builder_add_value (&builder, value); g_variant_builder_add_value (&builder, value);
} }
@ -973,6 +979,9 @@ handle_call (gint *argc,
&error); &error);
if (value == NULL) if (value == NULL)
{ {
gchar *context;
context = g_variant_parse_error_print_context (error, (*argv)[n]);
g_error_free (error); g_error_free (error);
error = NULL; error = NULL;
value = _g_variant_parse_me_harder (type, (*argv)[n], &error); value = _g_variant_parse_me_harder (type, (*argv)[n], &error);
@ -984,19 +993,21 @@ handle_call (gint *argc,
g_printerr (_("Error parsing parameter %d of type '%s': %s\n"), g_printerr (_("Error parsing parameter %d of type '%s': %s\n"),
n, n,
s, s,
error->message); context);
g_free (s); g_free (s);
} }
else else
{ {
g_printerr (_("Error parsing parameter %d: %s\n"), g_printerr (_("Error parsing parameter %d: %s\n"),
n, n,
error->message); context);
} }
g_error_free (error); g_error_free (error);
g_variant_builder_clear (&builder); g_variant_builder_clear (&builder);
g_free (context);
goto out; goto out;
} }
g_free (context);
} }
g_variant_builder_add_value (&builder, value); g_variant_builder_add_value (&builder, value);
} }