summaryrefslogtreecommitdiff
path: root/bin/csh
diff options
context:
space:
mode:
Diffstat (limited to 'bin/csh')
-rw-r--r--bin/csh/alloc.c14
-rw-r--r--bin/csh/csh.h3
-rw-r--r--bin/csh/extern.h3
3 files changed, 3 insertions, 17 deletions
diff --git a/bin/csh/alloc.c b/bin/csh/alloc.c
index 3683e2fc514..9fcb27bd2d0 100644
--- a/bin/csh/alloc.c
+++ b/bin/csh/alloc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: alloc.c,v 1.12 2014/10/16 19:43:31 deraadt Exp $ */
+/* $OpenBSD: alloc.c,v 1.13 2014/10/17 06:17:37 deraadt Exp $ */
/* $NetBSD: alloc.c,v 1.6 1995/03/21 09:02:23 cgd Exp $ */
/*-
@@ -51,18 +51,6 @@ Malloc(size_t n)
}
ptr_t
-Realloc(ptr_t p, size_t n)
-{
- ptr_t ptr;
-
- if ((ptr = realloc(p, n)) == (ptr_t) 0) {
- child++;
- stderror(ERR_NOMEM);
- }
- return (ptr);
-}
-
-ptr_t
Reallocarray(ptr_t p, size_t c, size_t n)
{
ptr_t ptr;
diff --git a/bin/csh/csh.h b/bin/csh/csh.h
index e700778e9f3..ed4d0ef99cc 100644
--- a/bin/csh/csh.h
+++ b/bin/csh/csh.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: csh.h,v 1.18 2014/10/16 19:43:31 deraadt Exp $ */
+/* $OpenBSD: csh.h,v 1.19 2014/10/17 06:17:37 deraadt Exp $ */
/* $NetBSD: csh.h,v 1.9 1995/03/21 09:02:40 cgd Exp $ */
/*-
@@ -85,7 +85,6 @@ typedef void *ptr_t;
#include "error.h"
#define xmalloc(i) Malloc(i)
-#define xrealloc(p, i) Realloc(p, i)
#define xreallocarray(p, i, j) Reallocarray(p, i, j)
#define xcalloc(n, s) Calloc(n, s)
#define xfree(p) Free(p)
diff --git a/bin/csh/extern.h b/bin/csh/extern.h
index cc382a6ace3..207851ff101 100644
--- a/bin/csh/extern.h
+++ b/bin/csh/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.18 2014/10/16 19:43:31 deraadt Exp $ */
+/* $OpenBSD: extern.h,v 1.19 2014/10/17 06:17:37 deraadt Exp $ */
/* $NetBSD: extern.h,v 1.8 1996/10/31 23:50:54 christos Exp $ */
/*-
@@ -296,7 +296,6 @@ void psecs(long);
*/
void Free(ptr_t);
ptr_t Malloc(size_t);
-ptr_t Realloc(ptr_t, size_t);
ptr_t Reallocarray(ptr_t, size_t, size_t);
ptr_t Calloc(size_t, size_t);