X-Git-Url: https://git.armaanb.net/?p=dmenu.git;a=blobdiff_plain;f=util.c;h=6b703e9b8180fb32ce3e3e018a2bf0124748c797;hp=ff943d03b17ff9a8a29a33fd5885d7c8fba4b9b9;hb=5a20b409c673a6736c3f9326cb54edc32908f717;hpb=d27e3c1092bb53e82c2781798082c354313dde21

diff --git a/util.c b/util.c
index ff943d0..6b703e9 100644
--- a/util.c
+++ b/util.c
@@ -1,34 +1,33 @@
 /* See LICENSE file for copyright and license details. */
-#include "dmenu.h"
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "util.h"
+
 void *
-emalloc(unsigned int size) {
-	void *res = malloc(size);
+ecalloc(size_t nmemb, size_t size)
+{
+	void *p;
 
-	if(!res)
-		eprint("fatal: could not malloc() %u bytes\n", size);
-	return res;
+	if (!(p = calloc(nmemb, size)))
+		perror(NULL);
+	return p;
 }
 
 void
-eprint(const char *errstr, ...) {
+die(const char *fmt, ...) {
 	va_list ap;
 
-	va_start(ap, errstr);
-	vfprintf(stderr, errstr, ap);
+	va_start(ap, fmt);
+	vfprintf(stderr, fmt, ap);
 	va_end(ap);
-	exit(EXIT_FAILURE);
-}
 
-char *
-estrdup(const char *str) {
-	void *res = strdup(str);
+	if (fmt[0] && fmt[strlen(fmt)-1] == ':') {
+		fputc(' ', stderr);
+		perror(NULL);
+	}
 
-	if(!res)
-		eprint("fatal: could not malloc() %u bytes\n", strlen(str));
-	return res;
+	exit(1);
 }