diff options
| author | Christian Neukirchen <chneukirchen@gmail.com> | 2012-11-26 16:17:45 +0100 |
|---|---|---|
| committer | Christian Neukirchen <chneukirchen@gmail.com> | 2012-11-26 16:17:45 +0100 |
| commit | 319d4e179ec4fdd1197c434d42257eba524be904 (patch) | |
| tree | f90656f4aa88024b330f3c508fbc4a6e1b252e03 /group.c | |
| parent | e27f649ae7903168b85b15c1c003b019c64a6d45 (diff) | |
| parent | 93f64ffc55d29947614f234a5c6deddcbc2d4e81 (diff) | |
| download | cwm-319d4e179ec4fdd1197c434d42257eba524be904.tar.gz cwm-319d4e179ec4fdd1197c434d42257eba524be904.tar.xz cwm-319d4e179ec4fdd1197c434d42257eba524be904.zip | |
cvsimport
Diffstat (limited to 'group.c')
| -rw-r--r-- | group.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/group.c b/group.c index 3370643..fd507be 100644 --- a/group.c +++ b/group.c @@ -25,9 +25,9 @@ #include <assert.h> #include <err.h> #include <errno.h> +#include <stdio.h> #include <stdlib.h> #include <string.h> -#include <stdio.h> #include <unistd.h> #include "calmwm.h" @@ -129,7 +129,7 @@ group_show(struct screen_ctx *sc, struct group_ctx *gc) } XRestackWindows(X_Dpy, winlist, gc->nhidden); - xfree(winlist); + free(winlist); gc->hidden = 0; group_setactive(sc, gc->shortcut - 1); @@ -387,7 +387,7 @@ group_menu(XButtonEvent *e) cleanup: while ((mi = TAILQ_FIRST(&menuq)) != NULL) { TAILQ_REMOVE(&menuq, mi, entry); - xfree(mi); + free(mi); } } @@ -472,7 +472,7 @@ group_update_names(struct screen_ctx *sc) strings = xmalloc((nstrings < CALMWM_NGROUPS ? CALMWM_NGROUPS : nstrings) * sizeof(*strings)); - p = prop_ret; + p = (char *)prop_ret; while (n < nstrings) { strings[n++] = xstrdup(p); p += strlen(p) + 1; @@ -491,7 +491,7 @@ group_update_names(struct screen_ctx *sc) if (prop_ret != NULL) XFree(prop_ret); if (sc->group_nonames != 0) - xfree(sc->group_names); + free(sc->group_names); sc->group_names = strings; sc->group_nonames = n; @@ -502,7 +502,7 @@ group_update_names(struct screen_ctx *sc) static void group_set_names(struct screen_ctx *sc) { - unsigned char *p, *q; + char *p, *q; size_t len = 0, tlen, slen; int i; |