===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/xmalloc.h,v
retrieving revision 1.9
retrieving revision 1.9.16.1
diff -u -r1.9 -r1.9.16.1
--- src/usr.bin/ssh/xmalloc.h	2002/06/19 00:27:55	1.9
+++ src/usr.bin/ssh/xmalloc.h	2006/09/30 04:06:51	1.9.16.1
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xmalloc.h,v 1.9 2002/06/19 00:27:55 deraadt Exp $	*/
+/* $OpenBSD: xmalloc.h,v 1.9.16.1 2006/09/30 04:06:51 brad Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -16,12 +16,11 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-#ifndef XMALLOC_H
-#define XMALLOC_H
-
 void	*xmalloc(size_t);
-void	*xrealloc(void *, size_t);
+void	*xcalloc(size_t, size_t);
+void	*xrealloc(void *, size_t, size_t);
 void     xfree(void *);
 char	*xstrdup(const char *);
-
-#endif				/* XMALLOC_H */
+int	 xasprintf(char **, const char *, ...)
+                __attribute__((__format__ (printf, 2, 3)))
+                __attribute__((__nonnull__ (2)));