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

diff --git a/util.c b/util.c
index 1d37906..51acd1a 100644
--- a/util.c
+++ b/util.c
@@ -1,94 +1,17 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
-
+/* See LICENSE file for copyright and license details. */
 #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 "util.h"
 
 void
-error(char *errstr, ...) {
+die(const char *errstr, ...) {
 	va_list ap;
+
 	va_start(ap, errstr);
 	vfprintf(stderr, errstr, ap);
 	va_end(ap);
-	exit(1);
+	exit(EXIT_FAILURE);
 }
 
-static void
-bad_malloc(unsigned int size)
-{
-	fprintf(stderr, "fatal: could not malloc() %d bytes\n",
-			(int) size);
-	exit(1);
-}
-
-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;
-}
-
-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[])
-{
-	if(!argv || !argv[0])
-		return;
-	if(fork() == 0) {
-		if(fork() == 0) {
-			if(dpy)
-				close(ConnectionNumber(dpy));
-			setsid();
-			execvp(argv[0], argv);
-			fprintf(stderr, "gridwm: execvp %s", argv[0]);
-			perror(" failed");
-		}
-		exit (0);
-	}
-	wait(0);
-}