X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/blobdiff_plain/255cabd944c933ce8c346f4fc4aded6311151e99..HEAD:/xmalloc.h

diff --git a/xmalloc.h b/xmalloc.h
index e14d0141..fb217a45 100644
--- a/xmalloc.h
+++ b/xmalloc.h
@@ -1,3 +1,5 @@
+/* $OpenBSD: xmalloc.h,v 1.13 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,14 +16,11 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: xmalloc.h,v 1.7 2001/06/26 17:27:25 markus Exp $"); */
-
-#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 */
+char	*xstrdup(const char *);
+int	 xasprintf(char **, const char *, ...)
+                __attribute__((__format__ (printf, 2, 3)))
+                __attribute__((__nonnull__ (2)));