rearranged several stuff

[dwm.git] / util.c

diff --git a/util.c b/util.c
index d8e6612..930b374 100644 (file)
--- a/util.c
+++ b/util.c
@@ -6,7 +6,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
@@ -14,7 +13,7 @@
 #include "dwm.h"
 
 void
-error(const char *errstr, ...) {
+eprint(const char *errstr, ...) {
        va_list ap;
        va_start(ap, errstr);
        vfprintf(stderr, errstr, ap);
@@ -39,41 +38,6 @@ emallocz(unsigned int size)
        return res;
 }
 
-void *
-emalloc(unsigned int size)
-{
-       void *res = malloc(size);
-       if(!res)
-               bad_malloc(size);
-       return res;
-}
-
-void *
-erealloc(void *ptr, unsigned int size)
-{
-       void *res = realloc(ptr, size);
-       if(!res)
-               bad_malloc(size);
-       return res;
-}
-
-char *
-estrdup(const char *str)
-{
-       char *res = strdup(str);
-       if(!res)
-               bad_malloc(strlen(str));
-       return res;
-}
-
-void
-swap(void **p1, void **p2)
-{
-       void *tmp = *p1;
-       *p1 = *p2;
-       *p2 = tmp;
-}
-
 void
 spawn(Arg *arg)
 {