Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[common/xutil.c] Free ClassHint reply

This commit is contained in:
Arnaud Fontaine 2008-03-28 21:58:06 +00:00 committed by Julien Danjou
parent d99586f68b
commit d2d85941ad
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
common/xutil.c
View File

@ -166,32 +166,37 @@ xutil_intern_atom(xcb_connection_t *c, const char *property)
class_hint_t * class_hint_t *
xutil_get_class_hint(xcb_connection_t *conn, xcb_window_t win) xutil_get_class_hint(xcb_connection_t *conn, xcb_window_t win)
{ {
xcb_get_property_reply_t *r = NULL; xcb_get_property_reply_t *class_hint_r = NULL;
char *data = NULL; char *data = NULL;
int len_name, len_class; int len_name, len_class;
class_hint_t *ch = p_new(class_hint_t, 1); class_hint_t *ch = p_new(class_hint_t, 1);
/* TODO: 2048? (BUFINC is declared as private in xcb.c) */ class_hint_r = xcb_get_property_reply(conn,
r = xcb_get_property_reply(conn, xcb_get_property_unchecked(conn,
xcb_get_property_unchecked(conn, false, win, WM_CLASS,
false, win, WM_CLASS, STRING, 0L, 2048L),
STRING, 0L, 2048), NULL);
NULL);
if(!class_hint_r || class_hint_r->type != STRING ||
class_hint_r->format != 8)
{
if(class_hint_r)
p_delete(&class_hint_r);
if(!r || r->type != STRING || r->format != 8)
return NULL; return NULL;
}
data = xcb_get_property_value(r); data = xcb_get_property_value(class_hint_r);
len_name = strlen((char *) data); len_name = strlen(data);
len_class = strlen((char *) (data + len_name + 1)); len_class = strlen(data + len_name + 1);
ch->res_name = strndup(data, len_name); ch->res_name = strndup(data, len_name);
ch->res_class = strndup(data + len_name + 1, len_class); ch->res_class = strndup(data + len_name + 1, len_class);
p_delete(&r); p_delete(&class_hint_r);
return ch; return ch;
} }