pinosaur
/
dmenu.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
simplified util.c
[dmenu.git]
/
util.c
diff --git
a/util.c
b/util.c
index
0e8828c
..
b7798d2
100644
(file)
--- a/
util.c
+++ b/
util.c
@@
-1,5
+1,4
@@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
* See LICENSE file for license details.
*/
#include "dmenu.h"
* See LICENSE file for license details.
*/
#include "dmenu.h"
@@
-10,28
+9,26
@@
#include <sys/wait.h>
#include <unistd.h>
#include <sys/wait.h>
#include <unistd.h>
-/* static */
+void *
+emalloc(unsigned int size) {
+ void *res = malloc(size);
-static void
-badmalloc(unsigned int size)
-{
- eprint("fatal: could not malloc() %u bytes\n", size);
+ if(!res)
+ eprint("fatal: could not malloc() %u bytes\n", size);
+ return res;
}
}
-/* extern */
+char *
+estrdup(const char *str) {
+ void *res = strdup(str);
-void *
-emalloc(unsigned int size)
-{
- void *res = malloc(size);
if(!res)
if(!res)
-
badmalloc(size
);
+
eprint("fatal: could not malloc() %u bytes\n", strlen(str)
);
return res;
}
void
return res;
}
void
-eprint(const char *errstr, ...)
-{
+eprint(const char *errstr, ...) {
va_list ap;
va_start(ap, errstr);
va_list ap;
va_start(ap, errstr);
@@
-39,12
+36,3
@@
eprint(const char *errstr, ...)
va_end(ap);
exit(EXIT_FAILURE);
}
va_end(ap);
exit(EXIT_FAILURE);
}
-
-char *
-estrdup(const char *str)
-{
- void *res = strdup(str);
- if(!res)
- badmalloc(strlen(str));
- return res;
-}