===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/xmalloc.c,v
retrieving revision 1.6.2.4
retrieving revision 1.7
diff -u -r1.6.2.4 -r1.7
--- src/usr.bin/ssh/xmalloc.c	2001/03/21 18:53:21	1.6.2.4
+++ src/usr.bin/ssh/xmalloc.c	2000/06/20 01:39:45	1.7
@@ -2,32 +2,22 @@
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
+ * Created: Mon Mar 20 21:23:10 1995 ylo
  * Versions of malloc and friends that check their results, and never return
  * failure (they call fatal if they encounter an error).
- *
- * As far as I am concerned, the code I have written for this software
- * can be used freely for any purpose.  Any derived versions of this
- * software must be clearly marked as such, and if the derived work is
- * incompatible with the protocol description in the RFC file, it must be
- * called by a name other than "ssh" or "Secure Shell".
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: xmalloc.c,v 1.6.2.4 2001/03/21 18:53:21 jason Exp $");
+RCSID("$OpenBSD: xmalloc.c,v 1.7 2000/06/20 01:39:45 markus Exp $");
 
-#include "xmalloc.h"
-#include "log.h"
+#include "ssh.h"
 
 void *
 xmalloc(size_t size)
 {
-	void *ptr;
-
-	if (size == 0)
-		fatal("xmalloc: zero size");
-	ptr = malloc(size);
+	void *ptr = malloc(size);
 	if (ptr == NULL)
-		fatal("xmalloc: out of memory (allocating %lu bytes)", (u_long) size);
+		fatal("xmalloc: out of memory (allocating %d bytes)", (int) size);
 	return ptr;
 }
 
@@ -36,13 +26,11 @@
 {
 	void *new_ptr;
 
-	if (new_size == 0)
-		fatal("xrealloc: zero size");
 	if (ptr == NULL)
 		fatal("xrealloc: NULL pointer given as argument");
 	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 %d bytes)", (int) new_size);
 	return new_ptr;
 }
 
@@ -57,12 +45,9 @@
 char *
 xstrdup(const char *str)
 {
-	size_t len = strlen(str) + 1;
-	char *cp;
+	int len = strlen(str) + 1;
 
-	if (len == 0)
-		fatal("xstrdup: zero size");
-	cp = xmalloc(len);
+	char *cp = xmalloc(len);
 	strlcpy(cp, str, len);
 	return cp;
 }