JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sometimes I have tomatoes on my eyes (or is it the CRT monitor?)

Browse Source 
make SIZE_MAX portable, 10x to Jonathan “ciruZ” Schleifer for the hint
This commit is contained in:
tg 2009-03-23 10:31:15 +00:00
parent 004b3b1e08
commit a8e3154b7a
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lalloc.c
View File

@ -1,6 +1,14 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/lalloc.c,v 1.2 2009/03/23 09:08:35 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/lalloc.c,v 1.3 2009/03/23 10:31:15 tg Exp $");
#ifndef SIZE_MAX
#ifdef SIZE_T_MAX
#define SIZE_MAX SIZE_T_MAX
#else
#define SIZE_MAX ((size_t)-1)
#endif
#endif
struct lalloc { struct lalloc {
struct lalloc *next; /* entry pointer, must be first */ struct lalloc *next; /* entry pointer, must be first */
@ -33,10 +41,8 @@ aresize(void *ptr, size_t numb, Area *ap)
{ {
struct lalloc *lp, *pp; struct lalloc *lp, *pp;
#ifdef SIZE_MAX
if (numb >= SIZE_MAX - sizeof (struct lalloc)) if (numb >= SIZE_MAX - sizeof (struct lalloc))
goto failure; goto failure;
#endif
if (ptr == NULL) { if (ptr == NULL) {
pp = (struct lalloc *)ap; pp = (struct lalloc *)ap;
@ -46,9 +52,7 @@ aresize(void *ptr, size_t numb, Area *ap)
lp = realloc(lp, numb + sizeof (struct lalloc)); lp = realloc(lp, numb + sizeof (struct lalloc));
} }
if (lp == NULL) { if (lp == NULL) {
#ifdef SIZE_MAX
failure: failure:
#endif
internal_errorf("cannot allocate %lu data bytes", internal_errorf("cannot allocate %lu data bytes",
(unsigned long)numb); (unsigned long)numb);
} }