X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=util.c;h=e95dfc5f946c623774a30e41105af613d8f36b36;hb=6475be926bef4916ce632988a2fa408a637babc7;hp=09fd872066ea892145ebfe96acf0baf13ab3e840;hpb=d7e17087ed2fc5eed57efa03e81460e3e41f7238;p=dwm.git

diff --git a/util.c b/util.c
index 09fd872..e95dfc5 100644
--- a/util.c
+++ b/util.c
@@ -6,12 +6,11 @@
 #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(const char *errstr, ...) {
@@ -39,33 +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)
 {
@@ -75,8 +47,9 @@ swap(void **p1, void **p2)
 }
 
 void
-spawn(char *argv[])
+spawn(Arg *arg)
 {
+	char **argv = (char **)arg->argv;
 	if(!argv || !argv[0])
 		return;
 	if(fork() == 0) {
@@ -85,7 +58,7 @@ spawn(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);