diff options
author | okan <okan> | 2009-06-20 00:22:39 +0000 |
---|---|---|
committer | okan <okan> | 2009-06-20 00:22:39 +0000 |
commit | 58d12134b1679a9172a7131abffc27769780b9c5 (patch) | |
tree | ffd2aa13b869b39db64f2a18488c87bfc2aa9882 /parse.y | |
parent | 18c7d89c985cda7a9a5fa7de7c13ae177509380b (diff) | |
download | cwm-58d12134b1679a9172a7131abffc27769780b9c5.tar.gz cwm-58d12134b1679a9172a7131abffc27769780b9c5.tar.xz cwm-58d12134b1679a9172a7131abffc27769780b9c5.zip |
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 'parse.y')
-rw-r--r-- | parse.y | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/parse.y b/parse.y index 272b587..435c2a2 100644 --- a/parse.y +++ b/parse.y @@ -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); |