mirror of
git://git.tartarus.org/simon/puzzles.git
synced 2025-04-20 07:31:30 -07:00
Files
57fbcd2b29
I don't expect this to actually come up in any circumstance, but it prevents a warning in some versions of gcc that would otherwise arise from the use of 'int' to compute the input size: if gcc isn't confident that the int is positive, then it complains that possible inputs to malloc might be in the region of 2^64 - (small multiple of a negative 32-bit int). I would hope malloc would fail in any case on such an input, so failing a couple of lines earlier makes no important difference. Annoyingly, stdint.h is missing in my NestedVM build setup (though it has stdbool.h - it's not _totally_ C90). So I have to check that at cmake time. Also, removed the #defines for smalloc and friends from the tree234 test mode. These were needed in the old build system, when tree234-test was built ad-hoc without being linked against malloc.c. But now tree234-test links against the same utils library as everything else, and can use the real smalloc - and doing so prevents another of these warnings when compiling with -flto.
65 lines
1.2 KiB
C
65 lines
1.2 KiB
C
/*
|
|
* malloc.c: safe wrappers around malloc, realloc, free, strdup
|
|
*/
|
|
|
|
#ifndef NO_STDINT_H
|
|
#include <stdint.h>
|
|
#endif
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include "puzzles.h"
|
|
|
|
/*
|
|
* smalloc should guarantee to return a useful pointer - we
|
|
* can do nothing except die when it's out of memory anyway.
|
|
*/
|
|
void *smalloc(size_t size) {
|
|
void *p;
|
|
#ifdef PTRDIFF_MAX
|
|
if (size > PTRDIFF_MAX)
|
|
fatal("allocation too large");
|
|
#endif
|
|
p = malloc(size);
|
|
if (!p)
|
|
fatal("out of memory");
|
|
return p;
|
|
}
|
|
|
|
/*
|
|
* sfree should guaranteeably deal gracefully with freeing NULL
|
|
*/
|
|
void sfree(void *p) {
|
|
if (p) {
|
|
free(p);
|
|
}
|
|
}
|
|
|
|
/*
|
|
* srealloc should guaranteeably be able to realloc NULL
|
|
*/
|
|
void *srealloc(void *p, size_t size) {
|
|
void *q;
|
|
#ifdef PTRDIFF_MAX
|
|
if (size > PTRDIFF_MAX)
|
|
fatal("allocation too large");
|
|
#endif
|
|
if (p) {
|
|
q = realloc(p, size);
|
|
} else {
|
|
q = malloc(size);
|
|
}
|
|
if (!q)
|
|
fatal("out of memory");
|
|
return q;
|
|
}
|
|
|
|
/*
|
|
* dupstr is like strdup, but with the never-return-NULL property
|
|
* of smalloc (and also reliably defined in all environments :-)
|
|
*/
|
|
char *dupstr(const char *s) {
|
|
char *r = smalloc(1+strlen(s));
|
|
strcpy(r,s);
|
|
return r;
|
|
}
|