From 2cef0ddb014622fe96ad38614b540325911a8696 Mon Sep 17 00:00:00 2001 From: Anselm R Garbe Date: Sat, 21 Jun 2008 16:43:12 +0100 Subject: removed emalloc, used only once so obsolete --- dmenu.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/dmenu.c b/dmenu.c index bf74edb..fa7bbe8 100644 --- a/dmenu.c +++ b/dmenu.c @@ -52,7 +52,6 @@ static char *cistrstr(const char *s, const char *sub); static void cleanup(void); static void drawmenu(void); static void drawtext(const char *text, ulong col[ColLast]); -static void *emalloc(uint size); static void eprint(const char *errstr, ...); static ulong getcolor(const char *colstr); static Bool grabkeyboard(void); @@ -252,15 +251,6 @@ drawtext(const char *text, ulong col[ColLast]) { XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len); } -void * -emalloc(uint size) { - void *res = malloc(size); - - if(!res) - eprint("fatal: could not malloc() %u bytes\n", size); - return res; -} - void eprint(const char *errstr, ...) { va_list ap; @@ -563,7 +553,8 @@ readstdin(void) { maxname = p; max = len; } - new = emalloc(sizeof(Item)); + if((new = (Item *)malloc(sizeof(Item))) == NULL) + eprint("fatal: could not malloc() %u bytes\n", sizeof(Item)); new->next = new->left = new->right = NULL; new->text = p; if(!i) -- cgit v1.2.3