nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use GString for appending strings

Browse source 
It can take a very long time to print a _NET_WM_ICON property for firefox with the previous code, several minutes. Fixes bug #6042 and also implements the change for append_string.
This commit is contained in:
Mikael Magnusson 2014-10-28 02:23:35 +01:00
parent 26951b0d4c
commit 088524f016
1 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
tools/obxprop/obxprop.c
View file

@ -106,33 +106,30 @@ static gboolean get_all(Display *d, Window win, Atom prop,
return ret; return ret;
} }
gchar *append_string(gchar *before, gchar *after, gboolean quote) GString *append_string(GString *before, gchar *after, gboolean quote)
{ {
gchar *tmp;
const gchar *q = quote ? "\"" : ""; const gchar *q = quote ? "\"" : "";
if (before) if (before)
tmp = g_strdup_printf("%s, %s%s%s", before, q, after, q); g_string_append_printf(before, ", %s%s%s", q, after, q);
else else
tmp = g_strdup_printf("%s%s%s", q, after, q); g_string_append_printf(before = g_string_new(NULL), "%s%s%s", q, after, q);
g_free(before); return before;
return tmp;
} }
gchar *append_int(gchar *before, guint after) GString *append_int(GString *before, guint after)
{ {
gchar *tmp;
if (before) if (before)
tmp = g_strdup_printf("%s, %u", before, after); g_string_append_printf(before, ", %u", after);
else else
tmp = g_strdup_printf("%u", after); g_string_append_printf(before = g_string_new(NULL), "%u", after);
g_free(before); return before;
return tmp;
} }
gchar* read_strings(gchar *val, guint n, gboolean utf8) gchar* read_strings(gchar *val, guint n, gboolean utf8)
{ {
GSList *strs = NULL, *it; GSList *strs = NULL, *it;
gchar *ret, *p; GString *ret;
gchar *p;
guint i; guint i;
p = val; p = val;
@ -162,23 +159,27 @@ gchar* read_strings(gchar *val, guint n, gboolean utf8)
g_free(strs->data); g_free(strs->data);
strs = g_slist_delete_link(strs, strs); strs = g_slist_delete_link(strs, strs);
} }
return ret; if (ret)
return g_string_free(ret, FALSE);
return NULL;
} }
gchar* read_atoms(Display *d, guchar *val, guint n) gchar* read_atoms(Display *d, guchar *val, guint n)
{ {
gchar *ret; GString *ret;
guint i; guint i;
ret = NULL; ret = NULL;
for (i = 0; i < n; ++i) for (i = 0; i < n; ++i)
ret = append_string(ret, XGetAtomName(d, ((guint32*)val)[i]), FALSE); ret = append_string(ret, XGetAtomName(d, ((guint32*)val)[i]), FALSE);
return ret; if (ret)
return g_string_free(ret, FALSE);
return NULL;
} }
gchar* read_numbers(guchar *val, guint n, guint size) gchar* read_numbers(guchar *val, guint n, guint size)
{ {
gchar *ret; GString *ret;
guint i; guint i;
ret = NULL; ret = NULL;
@ -197,7 +198,9 @@ gchar* read_numbers(guchar *val, guint n, guint size)
g_assert_not_reached(); /* unhandled size */ g_assert_not_reached(); /* unhandled size */
} }
return ret; if (ret)
return g_string_free(ret, FALSE);
return NULL;
} }
gboolean read_prop(Display *d, Window w, Atom prop, const gchar **type, gchar **val) gboolean read_prop(Display *d, Window w, Atom prop, const gchar **type, gchar **val)