fix compilation warnings in Simon's latest GSSAPI patch

[gssapi-openssh.git] / openssh / xmalloc.c

diff --git a/openssh/xmalloc.c b/openssh/xmalloc.c
index 9985b4cc2a3494cc89c1c6e3242b95de88712246..99c6ac3301ae9494c23ce59eedfc1722e7d2ed86 100644 (file)
--- a/openssh/xmalloc.c
+++ b/openssh/xmalloc.c
@@ -1,4 +1,3 @@
-/* $OpenBSD: xmalloc.c,v 1.27 2006/08/03 03:34:42 deraadt Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -14,12 +13,7 @@
  */
 
 #include "includes.h"
-
-#include <sys/param.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+RCSID("$OpenBSD: xmalloc.c,v 1.16 2001/07/23 18:21:46 stevesk Exp $");
 
 #include "xmalloc.h"
 #include "log.h"
@@ -38,38 +32,18 @@ xmalloc(size_t size)
 }
 
 void *
-xcalloc(size_t nmemb, size_t size)
-{
-       void *ptr;
-
-       if (size == 0 || nmemb == 0)
-               fatal("xcalloc: zero size");
-       if (SIZE_T_MAX / nmemb < size)
-               fatal("xcalloc: nmemb * size > SIZE_T_MAX");
-       ptr = calloc(nmemb, size);
-       if (ptr == NULL)
-               fatal("xcalloc: out of memory (allocating %lu bytes)",
-                   (u_long)(size * nmemb));
-       return ptr;
-}
-
-void *
-xrealloc(void *ptr, size_t nmemb, size_t size)
+xrealloc(void *ptr, size_t new_size)
 {
        void *new_ptr;
-       size_t new_size = nmemb * size;
 
        if (new_size == 0)
                fatal("xrealloc: zero size");
-       if (SIZE_T_MAX / nmemb < size)
-               fatal("xrealloc: nmemb * size > SIZE_T_MAX");
        if (ptr == NULL)
                new_ptr = malloc(new_size);
        else
                new_ptr = realloc(ptr, new_size);
        if (new_ptr == NULL)
-               fatal("xrealloc: out of memory (new_size %lu bytes)",
-                   (u_long) new_size);
+               fatal("xrealloc: out of memory (new_size %lu bytes)", (u_long) new_size);
        return new_ptr;
 }
 
@@ -92,19 +66,3 @@ xstrdup(const char *str)
        strlcpy(cp, str, len);
        return cp;
 }
-
-int
-xasprintf(char **ret, const char *fmt, ...)
-{
-       va_list ap;
-       int i;
-
-       va_start(ap, fmt);
-       i = vasprintf(ret, fmt, ap);
-       va_end(ap);
-
-       if (i < 0 || *ret == NULL)
-               fatal("xasprintf: could not allocate memory");
-
-       return (i);
-}