diff options
author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-01-28 19:57:52 -0800 |
---|---|---|
committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-02-01 19:55:36 -0800 |
commit | d1dbba01539a89e1d56ca261e18ae2e31f075cfe (patch) | |
tree | 420379d0385d9bd7e507ad058134487514c7d8a0 | |
parent | 184f5f3948b98abd21082e0cdc302502d70c3c49 (diff) |
Remove unneeded Malloc function
The only place it was called was in Realloc, if the initial pointer was
NULL, but ANSI C89 already guarantees realloc(NULL, size) will be handled
as malloc(size), so we don't need to handle that case ourselves.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
-rw-r--r-- | dsimple.c | 20 | ||||
-rw-r--r-- | dsimple.h | 1 |
2 files changed, 1 insertions, 20 deletions
@@ -60,31 +60,13 @@ Display *dpy = NULL; int screen = 0; /* - * Malloc: like malloc but handles out of memory using Fatal_Error. - */ -char * -Malloc(unsigned size) -{ - char *data; - - if (!(data = malloc(size))) - Fatal_Error("Out of memory!"); - - return(data); -} - - -/* - * Realloc: like Malloc except for realloc, handles NULL using Malloc. + * Realloc: like realloc but handles out of memory using Fatal_Error. */ char * Realloc(char *ptr, int size) { char *new_ptr; - if (!ptr) - return(Malloc(size)); - if (!(new_ptr = realloc(ptr, size))) Fatal_Error("Out of memory!"); @@ -58,7 +58,6 @@ extern int screen; /* The current screen */ /* Declarations for functions in dsimple.c */ -char *Malloc(unsigned); char *Realloc(char *, int); void Setup_Display_And_Screen(int *, char **); void Close_Display(void); |