X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/650a1fb4e1a798aca48a53739f5bb2649191bc1c..0cf3ba0eab1e3b05515907b29fbb739321a7cbed:/util.c

diff --git a/util.c b/util.c
index 0a5bd96..6eb19b4 100644
--- a/util.c
+++ b/util.c
@@ -2,81 +2,49 @@
  * (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 "wm.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);
+	eprint("fatal: could not malloc() %u bytes\n", size);
 }
 
+/* extern */
+
 void *
 emallocz(unsigned int size)
 {
 	void *res = calloc(1, size);
-	if(!res)
-		bad_malloc(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;
-}
+void
+eprint(const char *errstr, ...) {
+	va_list ap;
 
-char *
-estrdup(const char *str)
-{
-	char *res = strdup(str);
-	if(!res)
-		bad_malloc(strlen(str));
-	return res;
+	va_start(ap, errstr);
+	vfprintf(stderr, errstr, ap);
+	va_end(ap);
+	exit(EXIT_FAILURE);
 }
 
 void
-swap(void **p1, void **p2)
+spawn(Arg *arg)
 {
-	void *tmp = *p1;
-	*p1 = *p2;
-	*p2 = tmp;
-}
+	char **argv = (char **)arg->argv;
 
-void
-spawn(char *argv[])
-{
 	if(!argv || !argv[0])
 		return;
 	if(fork() == 0) {
@@ -88,7 +56,7 @@ spawn(char *argv[])
 			fprintf(stderr, "dwm: execvp %s", argv[0]);
 			perror(" failed");
 		}
-		exit (0);
+		exit(0);
 	}
 	wait(0);
 }