From: Matthias-Christian Ott <ott@enolink.de>
Date: Fri, 4 Jul 2008 16:18:51 +0000 (+0200)
Subject: remove emallocz()
X-Git-Url: https://jasonwoof.com/gitweb/?p=st.git;a=commitdiff_plain;h=b3902ca1782515ee8b9cd38af10e51bc3ba2fc98

remove emallocz()
---

diff --git a/Makefile b/Makefile
index ddf1952..72154e9 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 
 include config.mk
 
-SRC = st.c std.c util.c pty.c
+SRC = st.c std.c pty.c
 OBJ = ${SRC:.c=.o}
 
 all: options st std
@@ -21,11 +21,11 @@ options:
 
 ${OBJ}: config.mk
 
-st: st.o util.o
+st: st.o
 	@echo CC -o $@
 	@${CC} -o $@ $^ ${LDFLAGS} ${X11LDFLAGS}
 
-std: std.o pty.o util.o
+std: std.o pty.o
 	@echo CC -o $@
 	@${CC} -o $@ $^ ${LDFLAGS}
 
diff --git a/pty.c b/pty.c
index a173dab..3efaa7f 100644
--- a/pty.c
+++ b/pty.c
@@ -1,5 +1,4 @@
 /* See LICENSE file for copyright and license details. */
-#include "util.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/std.c b/std.c
index daf759e..5b430b8 100644
--- a/std.c
+++ b/std.c
@@ -1,5 +1,4 @@
 /* See LICENSE file for copyright and license details. */
-#include "util.h"
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <ctype.h>
diff --git a/util.c b/util.c
deleted file mode 100644
index 2e33fbd..0000000
--- a/util.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include "util.h"
-#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-void *
-emallocz(unsigned int size) {
-	void *res = calloc(1, size);
-
-	if(!res)
-		err(EXIT_FAILURE, "could not malloc() %u bytes\n", size);
-	return res;
-}
diff --git a/util.h b/util.h
deleted file mode 100644
index 9d87a95..0000000
--- a/util.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-
-void *emallocz(unsigned int size);