X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=malloc.c;h=a7fa7c5adc862fb73fd35bea36be457025609c0d;hb=de67801b0fd3dfa11777c1ef86cd617baf376b7b;hp=5e11ac0c94894f3014bdbc988c9bfca69f3272f7;hpb=96dbb537ee14f992459a8359a113a78414addf9d;p=sgt-puzzles.git diff --git a/malloc.c b/malloc.c index 5e11ac0..a7fa7c5 100644 --- a/malloc.c +++ b/malloc.c @@ -3,13 +3,14 @@ */ #include +#include #include "puzzles.h" /* * smalloc should guarantee to return a useful pointer - Halibut * can do nothing except die when it's out of memory anyway. */ -void *smalloc(int size) { +void *smalloc(size_t size) { void *p; p = malloc(size); if (!p) @@ -29,7 +30,7 @@ void sfree(void *p) { /* * srealloc should guaranteeably be able to realloc NULL */ -void *srealloc(void *p, int size) { +void *srealloc(void *p, size_t size) { void *q; if (p) { q = realloc(p, size); @@ -45,7 +46,7 @@ void *srealloc(void *p, int size) { * dupstr is like strdup, but with the never-return-NULL property * of smalloc (and also reliably defined in all environments :-) */ -char *dupstr(char *s) { +char *dupstr(const char *s) { char *r = smalloc(1+strlen(s)); strcpy(r,s); return r;