diff options
| author | Okan Demirmen <okan@cvs.openbsd.org> | 2009-06-20 00:22:40 +0000 |
|---|---|---|
| committer | Okan Demirmen <okan@cvs.openbsd.org> | 2009-06-20 00:22:40 +0000 |
| commit | 6fc03fb607ca82bdbaaaacc755bbf3e4392aa94d (patch) | |
| tree | 8b7c632c6cd06149dbf84e88758ee96b62e95cc2 /app/cwm/parse.y | |
| parent | 493230bc11f8a7bb6455832459da2f3a2a91cb0c (diff) | |
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@
Diffstat (limited to 'app/cwm/parse.y')
| -rw-r--r-- | app/cwm/parse.y | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/cwm/parse.y b/app/cwm/parse.y index 72489fa4a..9c501bcab 100644 --- a/app/cwm/parse.y +++ b/app/cwm/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.20 2009/05/17 23:40:57 okan Exp $ */ +/* $OpenBSD: parse.y,v 1.21 2009/06/20 00:22:39 okan Exp $ */ /* * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -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); |