X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fcommon%2Ftry_malloc.c;h=053d4306e460b5f319a9ff5eee7804027b15a8b9;hb=d87585beaacf5ad82f661cc577d3dfbeedfde398;hp=70392be27618c8c3a0dba5c4cc40dd4118702721;hpb=483f25751ae49c810456faf0bb7a375bc437df10;p=plomrogue diff --git a/src/common/try_malloc.c b/src/common/try_malloc.c index 70392be..053d430 100644 --- a/src/common/try_malloc.c +++ b/src/common/try_malloc.c @@ -1,4 +1,9 @@ -/* src/common/try_malloc.c */ +/* src/common/try_malloc.c + * + * This file is part of PlomRogue. PlomRogue is licensed under the GPL version 3 + * or any later version. For details on its copyright, license, and warranties, + * see the file NOTICE in the root directory of the PlomRogue source package. + */ #include "try_malloc.h" #include /* for malloc */ @@ -9,16 +14,16 @@ -extern void * try_malloc(size_t size, char * f) +extern void * try_malloc(size_t size, const char * f) { - char * prefix = "Trouble with malloc() in "; + char * prefix = "Trouble with malloc in "; char * msg = malloc(strlen(prefix) + strlen(f) + 1 + 1); - exit_err(NULL == msg, - "Trouble in try_malloc() with malloc() for error message string."); + exit_err(!msg, + "Trouble in try_malloc with malloc for error message string."); int test = sprintf(msg, "%s%s.", prefix, f); - exit_err(test < 0, "Trouble in try_malloc() with sprintf()."); + exit_err(test < 0, "Trouble in try_malloc with sprintf."); void * p = malloc(size); - exit_err(NULL == p, msg); /* Bypass exit_trouble() calling try_malloc(). */ + exit_err(!p, msg); /* Bypass exit_trouble() calling try_malloc(). */ free(msg); return p; }