X-Git-Url: https://git.danieliu.xyz/?p=dwm.git;a=blobdiff_plain;f=util.c;h=6b703e9b8180fb32ce3e3e018a2bf0124748c797;hp=99842e9c2032b16a095f34ca92fd06ebf02affe3;hb=56a31dc4a7be459e3a1ea06d45427e1a4087a1a6;hpb=39677ec76616fe4165ef92afb14db2bef2488e30

diff --git a/util.c b/util.c
index 99842e9..6b703e9 100644
--- a/util.c
+++ b/util.c
@@ -1,77 +1,33 @@
-/*
- * (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>
 
-void
-error(char *errstr, ...) {
-	va_list ap;
-	va_start(ap, errstr);
-	vfprintf(stderr, errstr, ap);
-	va_end(ap);
-	exit(1);
-}
-
-static void
-bad_malloc(unsigned int size)
-{
-	fprintf(stderr, "fatal: could not malloc() %d bytes\n",
-			(int) size);
-	exit(1);
-}
+#include "util.h"
 
 void *
-emallocz(unsigned int size)
+ecalloc(size_t nmemb, size_t size)
 {
-	void *res = calloc(1, size);
-	if(!res)
-		bad_malloc(size);
-	return res;
-}
+	void *p;
 
-void *
-emalloc(unsigned int size)
-{
-	void *res = malloc(size);
-	if(!res)
-		bad_malloc(size);
-	return res;
+	if (!(p = calloc(nmemb, size)))
+		perror(NULL);
+	return p;
 }
 
-void *
-erealloc(void *ptr, unsigned int size)
-{
-	void *res = realloc(ptr, size);
-	if(!res)
-		bad_malloc(size);
-	return res;
-}
+void
+die(const char *fmt, ...) {
+	va_list ap;
 
-char *
-estrdup(const char *str)
-{
-	void *res = strdup(str);
-	if(!res)
-		bad_malloc(strlen(str));
-	return res;
-}
+	va_start(ap, fmt);
+	vfprintf(stderr, fmt, ap);
+	va_end(ap);
 
-void
-failed_assert(char *a, char *file, int line)
-{
-	fprintf(stderr, "Assertion \"%s\" failed at %s:%d\n", a, file, line);
-	abort();
-}
+	if (fmt[0] && fmt[strlen(fmt)-1] == ':') {
+		fputc(' ', stderr);
+		perror(NULL);
+	}
 
-void
-swap(void **p1, void **p2)
-{
-	void *tmp = *p1;
-	*p1 = *p2;
-	*p2 = tmp;
+	exit(1);
 }