aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornoname <noname@inventati.org>2014-05-24 23:09:56 +0400
committerChristoph Lohmann <20h@r-36.net>2014-06-01 16:13:21 +0200
commit9d1d6d9409df1a7045806c1e802d89d08b0ae0a7 (patch)
tree4e446d6ea3812606b340526952d726363ac7a3f1
parentc778de59e30fd65556209623aec5f8544a3e0e2f (diff)
Replace emallocz with ecalloc.
Signed-off-by: Christoph Lohmann <20h@r-36.net>
-rw-r--r--tabbed.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/tabbed.c b/tabbed.c
index 2341998..ba22f9a 100644
--- a/tabbed.c
+++ b/tabbed.c
@@ -97,7 +97,7 @@ static void destroynotify(const XEvent *e);
static void die(const char *errstr, ...);
static void drawbar(void);
static void drawtext(const char *text, unsigned long col[ColLast]);
-static void *emallocz(size_t size);
+static void *ecalloc(size_t n, size_t size);
static void *erealloc(void *o, size_t size);
static void expose(const XEvent *e);
static void focus(int c);
@@ -399,11 +399,11 @@ drawtext(const char *text, unsigned long col[ColLast]) {
}
void *
-emallocz(size_t size) {
+ecalloc(size_t n, size_t size) {
void *p;
- if(!(p = calloc(1, size)))
- die("tabbed: cannot malloc\n");
+ if(!(p = calloc(n, size)))
+ die("tabbed: cannot calloc\n");
return p;
}
@@ -713,7 +713,7 @@ manage(Window w) {
}
}
- c = emallocz(sizeof(*c));
+ c = ecalloc(1, sizeof *c);
c->win = w;
nclients++;
@@ -921,7 +921,7 @@ void
setcmd(int argc, char *argv[], int replace) {
int i;
- cmd = emallocz((argc+3) * sizeof(*cmd));
+ cmd = ecalloc(argc + 3, sizeof *cmd);
if (argc == 0)
return;
for(i = 0; i < argc; i++)