fix mem leak in cleanup()

[dwm.git] / util.c

diff --git a/util.c b/util.c
index 3553f5d..fe044fc 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1,18 +1,35 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
-
+/* See LICENSE file for copyright and license details. */

 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>

+#include <string.h>
+
+#include "util.h"
+
+void *
+ecalloc(size_t nmemb, size_t size)
+{
+       void *p;
+
+       if (!(p = calloc(nmemb, size)))
+               die("calloc:");
+       return p;
+}

 
 void
 
 void

-error(char *errstr, ...) {
+die(const char *fmt, ...) {

        va_list ap;
        va_list ap;

-       va_start(ap, errstr);
-       vfprintf(stderr, errstr, ap);
+
+       va_start(ap, fmt);
+       vfprintf(stderr, fmt, ap);

        va_end(ap);
        va_end(ap);

+
+       if (fmt[0] && fmt[strlen(fmt)-1] == ':') {
+               fputc(' ', stderr);
+               perror(NULL);
+       } else {
+               fputc('\n', stderr);
+       }
+

        exit(1);
 }
        exit(1);
 }

-