X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=util.c;h=124bcd59aec1a9c93297d8c05d4c288dc0322a7a;hb=a1913a6af7c9cd6de18e15e989050690fdaa6600;hp=dff7af72ad89391e93ef3889a5825e8a4ba844de;hpb=7817523a685f0dbba2e074a448099558a54b1b9c;p=dmenu.git

diff --git a/util.c b/util.c
index dff7af7..124bcd5 100644
--- a/util.c
+++ b/util.c
@@ -1,5 +1,4 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 #include "dmenu.h"
@@ -7,41 +6,18 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/wait.h>
-#include <unistd.h>
-
-/* static */
-
-static void
-bad_malloc(unsigned int size)
-{
-	eprint("fatal: could not malloc() %u bytes\n", size);
-}
-
-/* extern */
 
 void *
-emalloc(unsigned int size)
-{
+emalloc(unsigned int size) {
 	void *res = malloc(size);
-	if(!res)
-		bad_malloc(size);
-	return res;
-}
-
-void *
-emallocz(unsigned int size)
-{
-	void *res = calloc(1, size);
 
 	if(!res)
-		bad_malloc(size);
+		eprint("fatal: could not malloc() %u bytes\n", size);
 	return res;
 }
 
 void
-eprint(const char *errstr, ...)
-{
+eprint(const char *errstr, ...) {
 	va_list ap;
 
 	va_start(ap, errstr);
@@ -51,18 +27,10 @@ eprint(const char *errstr, ...)
 }
 
 char *
-estrdup(const char *str)
-{
+estrdup(const char *str) {
 	void *res = strdup(str);
+
 	if(!res)
-		bad_malloc(strlen(str));
+		eprint("fatal: could not malloc() %u bytes\n", strlen(str));
 	return res;
 }
-
-void
-swap(void **p1, void **p2)
-{
-	void *tmp = *p1;
-	*p1 = *p2;
-	*p2 = tmp;
-}