From 12e320a0d6d6b43a8101a1979f4f14a32703177c Mon Sep 17 00:00:00 2001 From: fredrik Date: Tue, 1 May 2007 00:07:53 +0000 Subject: [PATCH] Log OOM with proper size_t. git-svn-id: svn+ssh://svn.dolda2000.com/srv/svn/repos/src/doldaconnect@984 959494ce-11ee-0310-bf91-de5d638817bd --- include/utils.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/utils.h b/include/utils.h index 3e41b8b..3f3dfd3 100644 --- a/include/utils.h +++ b/include/utils.h @@ -34,9 +34,9 @@ struct wcspair { /* "Safe" functions */ #ifdef DAEMON -#define LOGOOM(size) flog(LOG_CRIT, "%s (%s:%i): out of memory (alloc %i)", __FUNCTION__, __FILE__, __LINE__, (size)) -#define smalloc(size) ({void *__result__; ((__result__ = malloc(size)) == NULL)?({LOGOOM(size); abort(); (void *)0;}):__result__;}) -#define srealloc(ptr, size) ({void *__result__; ((__result__ = realloc((ptr), (size))) == NULL)?({LOGOOM(size); abort(); (void *)0;}):__result__;}) +#define LOGOOM(size) flog(LOG_CRIT, "%s (%s:%i): out of memory (alloc %zi)", __FUNCTION__, __FILE__, __LINE__, (size)) +#define smalloc(size) ({void *__result__; ((__result__ = malloc(size)) == NULL)?({LOGOOM((ssize_t)(size)); abort(); (void *)0;}):__result__;}) +#define srealloc(ptr, size) ({void *__result__; ((__result__ = realloc((ptr), (size))) == NULL)?({LOGOOM((ssize_t)(size)); abort(); (void *)0;}):__result__;}) #define swcsdup(wcs) ((wchar_t *)wcscpy(smalloc(sizeof(wchar_t) * (wcslen(wcs) + 1)), (wcs))) #define sstrdup(str) ((char *)strcpy(smalloc(strlen(str) + 1), (str))) #else -- 2.11.0