unroll XCALLOC/XMALLOC macros; since we use xcalloc/xmalloc all over the

place anyway, this makes things a bit more consistent; from Thomas Pfaff

ok oga@
This commit is contained in:
okan
2009-06-20 00:22:39 +00:00
parent 18c7d89c98
commit 58d12134b1
9 changed files with 17 additions and 21 deletions

View File

@@ -132,7 +132,7 @@ main : FONTNAME STRING {
YYERROR;
}
XCALLOC(aw, struct autogroupwin);
aw = xcalloc(1, sizeof(*aw));
if ((p = strchr($3, ',')) == NULL) {
aw->name = NULL;
@@ -151,7 +151,7 @@ main : FONTNAME STRING {
| IGNORE STRING {
struct winmatch *wm;
XCALLOC(wm, struct winmatch);
wm = xcalloc(1, sizeof(*wm));
strlcpy(wm->title, $2, sizeof(wm->title));
TAILQ_INSERT_TAIL(&conf->ignoreq, wm, entry);
@@ -503,7 +503,7 @@ parse_config(const char *filename, struct conf *xconf)
{
int errors = 0;
XCALLOC(conf, struct conf);
conf = xcalloc(1, sizeof(*conf));
if ((file = pushfile(filename)) == NULL) {
free(conf);