--- /n/sources/plan9/sys/include/9p.h Sat Jan 10 10:00:05 2015 +++ /sys/include/9p.h Sun Jun 28 00:00:00 2026 @@ -230,8 +230,8 @@ void threadlistensrv(Srv *s, char *addr); */ int hasperm(File*, char*, int); -void* emalloc9p(ulong); -void* erealloc9p(void*, ulong); +void* emalloc9p(uintptr); +void* erealloc9p(void*, uintptr); char* estrdup9p(char*); enum { --- /n/sources/plan9/sys/src/lib9p/mem.c Sat Jan 10 10:00:05 2015 +++ /sys/src/lib9p/mem.c Sun Jun 28 00:00:00 2026 @@ -5,29 +5,32 @@ #include #include "9p.h" +static void +outofmem(vlong sz) +{ + fprint(2, "out of memory allocating %llud\n", sz); + exits("mem"); +} + void* -emalloc9p(ulong sz) +emalloc9p(uintptr sz) { void *v; - if((v = malloc(sz)) == nil) { - fprint(2, "out of memory allocating %lud\n", sz); - exits("mem"); - } + if((v = malloc(sz)) == nil) + outofmem(sz); memset(v, 0, sz); setmalloctag(v, getcallerpc(&sz)); return v; } void* -erealloc9p(void *v, ulong sz) +erealloc9p(void *v, uintptr sz) { void *nv; - if((nv = realloc(v, sz)) == nil) { - fprint(2, "out of memory allocating %lud\n", sz); - exits("mem"); - } + if((nv = realloc(v, sz)) == nil) + outofmem(sz); if(v == nil) setmalloctag(nv, getcallerpc(&v)); setrealloctag(nv, getcallerpc(&v)); @@ -46,4 +49,3 @@ estrdup9p(char *s) setmalloctag(t, getcallerpc(&s)); return t; } -