prepared 0.3

[dwm.git] / util.c

diff --git a/util.c b/util.c
index d8e6612..1e36b25 100644 (file)
--- a/util.c
+++ b/util.c
@@ -2,34 +2,26 @@
  * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
+#include "dwm.h"
 
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include "dwm.h"
-
-void
-error(const char *errstr, ...) {
-       va_list ap;
-       va_start(ap, errstr);
-       vfprintf(stderr, errstr, ap);
-       va_end(ap);
-       exit(1);
-}
+/* static */
 
 static void
 bad_malloc(unsigned int size)
 {
        fprintf(stderr, "fatal: could not malloc() %d bytes\n",
                        (int) size);
-       exit(1);
+       exit(EXIT_FAILURE);
 }
 
+/* extern */
+
 void *
 emallocz(unsigned int size)
 {
@@ -39,39 +31,13 @@ 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;
+eprint(const char *errstr, ...) {
+       va_list ap;
+       va_start(ap, errstr);
+       vfprintf(stderr, errstr, ap);
+       va_end(ap);
+       exit(EXIT_FAILURE);
 }
 
 void
@@ -89,7 +55,7 @@ spawn(Arg *arg)
                        fprintf(stderr, "dwm: execvp %s", argv[0]);
                        perror(" failed");
                }
-               exit (0);
+               exit(EXIT_FAILURE);
        }
        wait(0);
 }