diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:38:40 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:38:40 +0000 |
commit | 1b816ea846aca3ee89e7995373ace609e9518424 (patch) | |
tree | b41cdc8495cae7fa9c2e0f98a5f2e71656b61f9a /xmalloc.h | |
parent | fa585019a79ebcb4e0202b1c33f87ff1c5c9ce1c (diff) | |
parent | 086ea76990b1e6287c24b6db74adffd4605eb3b0 (diff) |
import openssh-4.6p1-gsskex-20070312.patch
Diffstat (limited to 'xmalloc.h')
-rw-r--r-- | xmalloc.h | 13 |
1 files changed, 6 insertions, 7 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: xmalloc.h,v 1.9 2002/06/19 00:27:55 deraadt Exp $ */ | 1 | /* $OpenBSD: xmalloc.h,v 1.13 2006/08/03 03:34:42 deraadt Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -16,12 +16,11 @@ | |||
16 | * called by a name other than "ssh" or "Secure Shell". | 16 | * called by a name other than "ssh" or "Secure Shell". |
17 | */ | 17 | */ |
18 | 18 | ||
19 | #ifndef XMALLOC_H | ||
20 | #define XMALLOC_H | ||
21 | |||
22 | void *xmalloc(size_t); | 19 | void *xmalloc(size_t); |
23 | void *xrealloc(void *, size_t); | 20 | void *xcalloc(size_t, size_t); |
21 | void *xrealloc(void *, size_t, size_t); | ||
24 | void xfree(void *); | 22 | void xfree(void *); |
25 | char *xstrdup(const char *); | 23 | char *xstrdup(const char *); |
26 | 24 | int xasprintf(char **, const char *, ...) | |
27 | #endif /* XMALLOC_H */ | 25 | __attribute__((__format__ (printf, 2, 3))) |
26 | __attribute__((__nonnull__ (2))); | ||