readded draw.c again (except getcolor and setfont)

[dmenu.git] / util.c

diff --git a/util.c b/util.c
index 0e8828c..124bcd5 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1,5 +1,4 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 #include "dmenu.h"
@@ -7,31 +6,18 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/wait.h>
-#include <unistd.h>
-
-/* static */
-
-static void
-badmalloc(unsigned int size)
-{
-       eprint("fatal: could not malloc() %u bytes\n", size);
-}
-
-/* extern */
 
 void *
-emalloc(unsigned int size)
-{
+emalloc(unsigned int size) {
        void *res = malloc(size);
+
        if(!res)
-               badmalloc(size);
+               eprint("fatal: could not malloc() %u bytes\n", size);
        return res;
 }
 
 void
-eprint(const char *errstr, ...)
-{
+eprint(const char *errstr, ...) {
        va_list ap;
 
        va_start(ap, errstr);
@@ -41,10 +27,10 @@ eprint(const char *errstr, ...)
 }
 
 char *
-estrdup(const char *str)
-{
+estrdup(const char *str) {
        void *res = strdup(str);
+
        if(!res)
-               badmalloc(strlen(str));
+               eprint("fatal: could not malloc() %u bytes\n", strlen(str));
        return res;
 }