X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=util.c;h=f7e3e6fe5fae37a933a93f0b930b508b41515e22;hp=d8e661256ee38f37a6a6adc41462d95395263a89;hb=adaa28a6e600f636f5e86244ccef69e98419ba1a;hpb=c47da143bdf5b4e3924a411f42648d4b3e86ff00

diff --git a/util.c b/util.c
index d8e6612..f7e3e6f 100644
--- a/util.c
+++ b/util.c
@@ -2,25 +2,15 @@
  * (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 functions */
 
 static void
 bad_malloc(unsigned int size)
@@ -30,6 +20,8 @@ bad_malloc(unsigned int size)
 	exit(1);
 }
 
+/* extern functions */
+
 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(1);
 }
 
 void