group_ctx->name is only used in this one function, and for now it

corresponds directly to the static list of group names. Just use the
static list and stop strdup()ing a new version for the context struct.
Since that never got freed this also fixes a small memleak.

Kill some unused variables while i'm here.

ok okan@
This commit is contained in:
oga 2008-05-18 19:38:18 +00:00
parent a21a064a9b
commit 5c402536fa
2 changed files with 2 additions and 8 deletions

View File

@ -171,7 +171,6 @@ static char *shortcut_to_name[] = {
struct group_ctx {
TAILQ_ENTRY(group_ctx) entry;
struct client_ctx_q clients;
char *name;
int shortcut;
int hidden;
int nhidden;

View File

@ -24,10 +24,8 @@
#define CALMWM_NGROUPS 9
int Groupnamemode = 0;
struct group_ctx *Group_active = NULL;
struct group_ctx Groups[CALMWM_NGROUPS];
char Group_name[256];
int Grouphideall = 0;
struct group_ctx_q Groupq;
@ -266,16 +264,13 @@ group_menu(XButtonEvent *e)
if (TAILQ_EMPTY(&gc->clients))
continue;
if (gc->name == NULL)
gc->name = xstrdup(shortcut_to_name[gc->shortcut]);
XCALLOC(mi, struct menu);
if (gc->hidden)
snprintf(mi->text, sizeof(mi->text), "%d: [%s]",
gc->shortcut, gc->name);
gc->shortcut, shortcut_to_name[gc->shortcut]);
else
snprintf(mi->text, sizeof(mi->text), "%d: %s",
gc->shortcut, gc->name);
gc->shortcut, shortcut_to_name[gc->shortcut]);
mi->ctx = gc;
TAILQ_INSERT_TAIL(&menuq, mi, entry);
}