From 6a8285a984557285d501c60db1e8fc9a3a0adcb5 Mon Sep 17 00:00:00 2001 From: ayin Date: Tue, 18 Dec 2007 01:36:24 +0000 Subject: [PATCH] Move memory allocation wrappers to misc.C. --- src/main.C | 36 ------------------------------------ src/misc.C | 30 ++++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 36 deletions(-) diff --git a/src/main.C b/src/main.C index 8521ea36..6449861b 100644 --- a/src/main.C +++ b/src/main.C @@ -640,42 +640,6 @@ rxvt_init () XrmInitialize (); } -/* ------------------------------------------------------------------------- * - * MEMORY ALLOCATION WRAPPERS * - * ------------------------------------------------------------------------- */ -void * -rxvt_malloc (size_t size) -{ - void *p = malloc (size); - - if (!p) - rxvt_fatal ("memory allocation failure. aborting.\n"); - - return p; -} - -void * -rxvt_calloc (size_t number, size_t size) -{ - void *p = calloc (number, size); - - if (!p) - rxvt_fatal ("memory allocation failure. aborting.\n"); - - return p; -} - -void * -rxvt_realloc (void *ptr, size_t size) -{ - void *p = realloc (ptr, size); - - if (!p) - rxvt_fatal ("memory allocation failure. aborting.\n"); - - return p; -} - /*----------------------------------------------------------------------*/ /* * window size/position calculations for XSizeHint and other storage. diff --git a/src/misc.C b/src/misc.C index 1d4dd0fb..8e5a0f68 100644 --- a/src/misc.C +++ b/src/misc.C @@ -305,5 +305,35 @@ rxvt_freecommastring (char **cs) NOTHROW free (cs); } +void * +rxvt_malloc (size_t size) +{ + void *p = malloc (size); + + if (!p) + rxvt_fatal ("memory allocation failure. aborting.\n"); + + return p; +} + +void * +rxvt_calloc (size_t number, size_t size) +{ + void *p = calloc (number, size); + if (!p) + rxvt_fatal ("memory allocation failure. aborting.\n"); + return p; +} + +void * +rxvt_realloc (void *ptr, size_t size) +{ + void *p = realloc (ptr, size); + + if (!p) + rxvt_fatal ("memory allocation failure. aborting.\n"); + + return p; +} -- 2.34.1