X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/dc7efebe09e15e0e9e8a7821602c5052f00ef9b9..ea1fd31a3d41352b024fb35a1a781dce6a2f7afe:/sbr/utils.c?ds=sidebyside diff --git a/sbr/utils.c b/sbr/utils.c index 8194f134..3be04e7e 100644 --- a/sbr/utils.c +++ b/sbr/utils.c @@ -12,6 +12,7 @@ #include "makedir.h" #include #include +#include "read_line.h" extern char *mhdocdir; @@ -35,7 +36,7 @@ void *mh_xmalloc(size_t size) size = 1; /* Some mallocs don't like 0. */ p = malloc(size); if (!p) - adios(NULL, "malloc failed, size wanted: %lu", (unsigned long)size); + adios(NULL, "malloc failed, size wanted: %zu", size); return p; } @@ -55,7 +56,7 @@ void *mh_xrealloc(void *ptr, size_t size) new = realloc(ptr, size); if (!new) - adios(NULL, "realloc failed, size wanted: %lu", (unsigned long)size); + adios(NULL, "realloc failed, size wanted: %zu", size); return new; } @@ -70,8 +71,7 @@ void *mh_xcalloc(size_t nelem, size_t elsize) p = calloc(nelem, elsize); if (!p) - adios(NULL, "calloc failed, size wanted: %lu * %lu", - (unsigned long)nelem, (unsigned long)elsize); + adios(NULL, "calloc failed, size wanted: %zu * %zu", nelem, elsize); return p; }