venti: fix memory layers

[plan9front.git] / sys / src / cmd / venti / srv / utils.c

diff --git a/sys/src/cmd/venti/srv/utils.c b/sys/src/cmd/venti/srv/utils.c
index d810c53d8926fbf925fdbd6157257d9d4a8458b0..0c4cb45176ea17cb53891644012e2630c0729d3f 100644 (file)
--- a/sys/src/cmd/venti/srv/utils.c
+++ b/sys/src/cmd/venti/srv/utils.c
@@ -136,70 +136,6 @@ now(void)
        return time(nil);
 }
 
-int abortonmem = 1;
-
-void *
-emalloc(ulong n)
-{
-       void *p;
-
-       p = malloc(n);
-       if(p == nil){
-               if(abortonmem)
-                       abort();
-               sysfatal("out of memory allocating %lud", n);
-       }
-       memset(p, 0xa5, n);
-       setmalloctag(p, getcallerpc(&n));
-if(0)print("emalloc %p-%p by %#p\n", p, (char*)p+n, getcallerpc(&n));
-       return p;
-}
-
-void *
-ezmalloc(ulong n)
-{
-       void *p;
-
-       p = malloc(n);
-       if(p == nil){
-               if(abortonmem)
-                       abort();
-               sysfatal("out of memory allocating %lud", n);
-       }
-       memset(p, 0, n);
-       setmalloctag(p, getcallerpc(&n));
-if(0)print("ezmalloc %p-%p by %#p\n", p, (char*)p+n, getcallerpc(&n));
-       return p;
-}
-
-void *
-erealloc(void *p, ulong n)
-{
-       p = realloc(p, n);
-       if(p == nil){
-               if(abortonmem)
-                       abort();
-               sysfatal("out of memory allocating %lud", n);
-       }
-       setrealloctag(p, getcallerpc(&p));
-if(0)print("erealloc %p-%p by %#p\n", p, (char*)p+n, getcallerpc(&p));
-       return p;
-}
-
-char *
-estrdup(char *s)
-{
-       char *t;
-       int n;
-
-       n = strlen(s) + 1;
-       t = emalloc(n);
-       memmove(t, s, n);
-       setmalloctag(t, getcallerpc(&s));
-if(0)print("estrdup %p-%p by %#p\n", t, (char*)t+n, getcallerpc(&s));
-       return t;
-}
-
 /*
  * return floor(log2(v))
  */