X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=util.c;h=930b374929580017f220b6b637993ef2eef2c1f6;hp=1d379061238f4e522b6a9f7ad22e7b8ea50fc4bc;hb=dba23062bad40afb1a90f60b6897cf9e1ca5035b;hpb=8b59083eb13c0712e04d9a5b6d7bf4af5913c442

diff --git a/util.c b/util.c
index 1d37906..930b374 100644
--- a/util.c
+++ b/util.c
@@ -6,15 +6,14 @@
 #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"
+#include "dwm.h"
 
 void
-error(char *errstr, ...) {
+eprint(const char *errstr, ...) {
 	va_list ap;
 	va_start(ap, errstr);
 	vfprintf(stderr, errstr, ap);
@@ -39,44 +38,10 @@ 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(Display *dpy, char *argv[])
+spawn(Arg *arg)
 {
+	char **argv = (char **)arg->argv;
 	if(!argv || !argv[0])
 		return;
 	if(fork() == 0) {
@@ -85,7 +50,7 @@ spawn(Display *dpy, char *argv[])
 				close(ConnectionNumber(dpy));
 			setsid();
 			execvp(argv[0], argv);
-			fprintf(stderr, "gridwm: execvp %s", argv[0]);
+			fprintf(stderr, "dwm: execvp %s", argv[0]);
 			perror(" failed");
 		}
 		exit (0);