luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-23 18:52:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

gvariant: Factor out some common calls to g_variant_get_type_string()

Browse Source 
When printing a `GVariant`.

This introduces no functional changes, but should speed things up a
little bit when printing out arrays.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
This commit is contained in:
Philip Withnall 2022-12-29 17:38:04 +00:00
parent c28829fe87
commit f068347b14
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
glib/gvariant.c
View File

@ -2213,15 +2213,16 @@ g_variant_print_string (GVariant *value,
GString *string, GString *string,
gboolean type_annotate) gboolean type_annotate)
{ {
const gchar *value_type_string = g_variant_get_type_string (value);
if G_UNLIKELY (string == NULL) if G_UNLIKELY (string == NULL)
string = g_string_new (NULL); string = g_string_new (NULL);
switch (g_variant_classify (value)) switch (value_type_string[0])
{ {
case G_VARIANT_CLASS_MAYBE: case G_VARIANT_CLASS_MAYBE:
if (type_annotate) if (type_annotate)
g_string_append_printf (string, "@%s ", g_string_append_printf (string, "@%s ", value_type_string);
g_variant_get_type_string (value));
if (g_variant_n_children (value)) if (g_variant_n_children (value))
{ {
@ -2265,7 +2266,7 @@ g_variant_print_string (GVariant *value,
* if the first two characters are 'ay' then it's a bytestring. * if the first two characters are 'ay' then it's a bytestring.
* under certain conditions we print those as strings. * under certain conditions we print those as strings.
*/ */
if (g_variant_get_type_string (value)[1] == 'y') if (value_type_string[1] == 'y')
{ {
const gchar *str; const gchar *str;
gsize size; gsize size;
@ -2307,7 +2308,7 @@ g_variant_print_string (GVariant *value,
* dictionary entries (ie: a dictionary) so we print that * dictionary entries (ie: a dictionary) so we print that
* differently. * differently.
*/ */
if (g_variant_get_type_string (value)[1] == '{') if (value_type_string[1] == '{')
/* dictionary */ /* dictionary */
{ {
const gchar *comma = ""; const gchar *comma = "";
@ -2316,8 +2317,7 @@ g_variant_print_string (GVariant *value,
if ((n = g_variant_n_children (value)) == 0) if ((n = g_variant_n_children (value)) == 0)
{ {
if (type_annotate) if (type_annotate)
g_string_append_printf (string, "@%s ", g_string_append_printf (string, "@%s ", value_type_string);
g_variant_get_type_string (value));
g_string_append (string, "{}"); g_string_append (string, "{}");
break; break;
} }
@ -2353,8 +2353,7 @@ g_variant_print_string (GVariant *value,
if ((n = g_variant_n_children (value)) == 0) if ((n = g_variant_n_children (value)) == 0)
{ {
if (type_annotate) if (type_annotate)
g_string_append_printf (string, "@%s ", g_string_append_printf (string, "@%s ", value_type_string);
g_variant_get_type_string (value));
g_string_append (string, "[]"); g_string_append (string, "[]");
break; break;
} }