simplified util.c

dmenubar/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;
-}