merge 6.3p1

1 files changed, 1 insertions, 9 deletions

diff --git a/xmalloc.c b/xmalloc.c
index 9985b4cc2..92f781fd0 100644
--- a/xmalloc.c
+++ b/xmalloc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xmalloc.c,v 1.27 2006/08/03 03:34:42 deraadt Exp $ */
+/* $OpenBSD: xmalloc.c,v 1.28 2013/05/17 00:13:14 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -73,14 +73,6 @@ xrealloc(void *ptr, size_t nmemb, size_t size)
         return new_ptr;
 }
 
-void
-xfree(void *ptr)
-{
-        if (ptr == NULL)
-                fatal("xfree: NULL pointer given as argument");
-        free(ptr);
-}
-
 char *
 xstrdup(const char *str)
 {