drw: cleanup drw_text, prevent gcc warning false-positive of unused var

[dmenu.git] / util.c

diff --git a/util.c b/util.c
index ff943d0..6b703e9 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1,34 +1,33 @@
 /* See LICENSE file for copyright and license details. */
 /* See LICENSE file for copyright and license details. */

-#include "dmenu.h"

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

+#include "util.h"
+

 void *
 void *

-emalloc(unsigned int size) {
-       void *res = malloc(size);
+ecalloc(size_t nmemb, size_t size)
+{
+       void *p;

 
 

-       if(!res)
-               eprint("fatal: could not malloc() %u bytes\n", size);
-       return res;
+       if (!(p = calloc(nmemb, size)))
+               perror(NULL);
+       return p;

 }
 
 void
 }
 
 void

-eprint(const 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);

-       exit(EXIT_FAILURE);
-}

 
 

-char *
-estrdup(const char *str) {
-       void *res = strdup(str);
+       if (fmt[0] && fmt[strlen(fmt)-1] == ':') {
+               fputc(' ', stderr);
+               perror(NULL);
+       }

 
 

-       if(!res)
-               eprint("fatal: could not malloc() %u bytes\n", strlen(str));
-       return res;
+       exit(1);

 }
 }