awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

xutil: stop leaking atom name, and don't dup on cache hit 

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2008-06-27 10:06:31 +02:00
parent a67e5023c0
commit b63e10b7e8
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/xutil.c
View File

@ -173,10 +173,9 @@ xutil_intern_atom(xcb_connection_t *c,
xutil_atom_cache_t *atom_next; xutil_atom_cache_t *atom_next;
int cmp_cache; int cmp_cache;
atom_req.name = a_strdup(name); p_clear(&atom_req, 1);
/* Check if this atom is present in the cache ordered /* Check if this atom is present in the cache ordered linked-list */
* linked-list */
if(atoms) if(atoms)
for(atom_next = *atoms; for(atom_next = *atoms;
atom_next && (cmp_cache = a_strcmp(name, atom_next->name)) >= 0; atom_next && (cmp_cache = a_strcmp(name, atom_next->name)) >= 0;
@ -189,9 +188,9 @@ xutil_intern_atom(xcb_connection_t *c,
} }
/* Otherwise send an InternAtom request to the server */ /* Otherwise send an InternAtom request to the server */
atom_req.name = a_strdup(name);
atom_req.cache_hit = false; atom_req.cache_hit = false;
atom_req.cookie = xcb_intern_atom_unchecked(c, false, a_strlen(name), atom_req.cookie = xcb_intern_atom_unchecked(c, false, a_strlen(name), name);
name);
return atom_req; return atom_req;
} }
@ -219,7 +218,10 @@ xutil_intern_atom_reply(xcb_connection_t *c,
/* Get the reply from InternAtom request */ /* Get the reply from InternAtom request */
if(!(atom_rep = xcb_intern_atom_reply(c, atom_req.cookie, NULL))) if(!(atom_rep = xcb_intern_atom_reply(c, atom_req.cookie, NULL)))
{
p_delete(&atom_req.name);
return 0; return 0;
}
/* Create a new atom cache entry */ /* Create a new atom cache entry */
atom_cache = p_new(xutil_atom_cache_t, 1); atom_cache = p_new(xutil_atom_cache_t, 1);
@ -248,8 +250,8 @@ xutil_intern_atom_reply(xcb_connection_t *c,
return atom_cache->atom; return atom_cache->atom;
} }
/* Delete a cache entry /* Delete a atom cache entry.
* \param entry cache entry * \param entry A cache entry.
*/ */
void void
xutil_atom_cache_delete(xutil_atom_cache_t **entry) xutil_atom_cache_delete(xutil_atom_cache_t **entry)