From 3d25a327aad95e38ecd1642af58a49fc555a9d01 Mon Sep 17 00:00:00 2001
From: "Anselm R. Garbe" <arg@10kloc.org>
Date: Thu, 12 Oct 2006 12:58:34 +0200
Subject: simplified util.c
---
util.c | 29 ++++++++++-------------------
1 file changed, 10 insertions(+), 19 deletions(-)
diff --git a/util.c b/util.c
index b4b163a..b7798d2 100644
--- a/util.c
+++ b/util.c
@@ -9,21 +9,21 @@
#include <sys/wait.h>
#include <unistd.h>
-/* static */
-
-static void
-badmalloc(unsigned int size) {
- eprint("fatal: could not malloc() %u bytes\n", size);
-}
-
-/* extern */
-
void *
emalloc(unsigned int size) {
void *res = malloc(size);
if(!res)
- badmalloc(size);
+ eprint("fatal: could not malloc() %u bytes\n", size);
+ return res;
+}
+
+char *
+estrdup(const char *str) {
+ void *res = strdup(str);
+
+ if(!res)
+ eprint("fatal: could not malloc() %u bytes\n", strlen(str));
return res;
}
@@ -36,12 +36,3 @@ eprint(const char *errstr, ...) {
va_end(ap);
exit(EXIT_FAILURE);
}
-
-char *
-estrdup(const char *str) {
- void *res = strdup(str);
-
- if(!res)
- badmalloc(strlen(str));
- return res;
-}
--
cgit v1.2.3