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

7
conf.c
View File

@ -41,8 +41,7 @@ conf_cmd_add(struct conf *c, char *image, char *label, int flags)
else if (strcmp(label, "lock") == 0)
strlcpy(c->lockpath, image, sizeof(c->lockpath));
else {
struct cmd *cmd;
XMALLOC(cmd, struct cmd);
struct cmd *cmd = xmalloc(sizeof(*cmd));
cmd->flags = flags;
strlcpy(cmd->image, image, sizeof(cmd->image));
strlcpy(cmd->label, label, sizeof(cmd->label));
@ -429,7 +428,7 @@ conf_bindname(struct conf *c, char *name, char *binding)
char *substring;
int iter;
XCALLOC(current_binding, struct keybinding);
current_binding = xcalloc(1, sizeof(*current_binding));
if (strchr(name, 'C') != NULL &&
strchr(name, 'C') < strchr(name, '-'))
@ -541,7 +540,7 @@ conf_mousebind(struct conf *c, char *name, char *binding)
const char *errstr;
int iter;
XCALLOC(current_binding, struct mousebinding);
current_binding = xcalloc(1, sizeof(*current_binding));
if (strchr(name, 'C') != NULL &&
strchr(name, 'C') < strchr(name, '-'))