diff options
| author |   deraadt <deraadt@openbsd.org> | 2009-10-26 21:42:04 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2009-10-26 21:42:04 +0000 |
| commit | 3abb34e338a756ee0ca5032884c166e0282ede7b (patch) | |
| tree | b55bf38f0b9e21525f858d727afce6a5675cd8aa /usr.bin/tmux/xmalloc.c | |
| parent | Clear signal flags /before/ taking action and continue afterwards to reduce (diff) | |
| download | wireguard-openbsd-3abb34e338a756ee0ca5032884c166e0282ede7b.tar.xz wireguard-openbsd-3abb34e338a756ee0ca5032884c166e0282ede7b.zip | |
tabs are better; ok nicm
Diffstat (limited to 'usr.bin/tmux/xmalloc.c')
| -rw-r--r-- | usr.bin/tmux/xmalloc.c | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/usr.bin/tmux/xmalloc.c b/usr.bin/tmux/xmalloc.c index 13eac93dd6b..797144e4015 100644 --- a/usr.bin/tmux/xmalloc.c +++ b/usr.bin/tmux/xmalloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xmalloc.c,v 1.2 2009/10/26 21:10:24 nicm Exp $ */ +/* $OpenBSD: xmalloc.c,v 1.3 2009/10/26 21:42:04 deraadt Exp $ */ /* * Copyright (c) 2004 Nicholas Marriott <nicm@users.sourceforge.net> @@ -42,16 +42,16 @@ xstrdup(const char *s) void * xcalloc(size_t nmemb, size_t size) { - void *ptr; + void *ptr; - if (size == 0 || nmemb == 0) + if (size == 0 || nmemb == 0) fatalx("zero size"); - if (SIZE_MAX / nmemb < size) - fatalx("nmemb * size > SIZE_MAX"); - if ((ptr = calloc(nmemb, size)) == NULL) + if (SIZE_MAX / nmemb < size) + fatalx("nmemb * size > SIZE_MAX"); + if ((ptr = calloc(nmemb, size)) == NULL) fatal("xcalloc failed"); - return (ptr); + return (ptr); } void * @@ -59,12 +59,12 @@ xmalloc(size_t size) { void *ptr; - if (size == 0) - fatalx("zero size"); - if ((ptr = malloc(size)) == NULL) + if (size == 0) + fatalx("zero size"); + if ((ptr = malloc(size)) == NULL) fatal("xmalloc failed"); - return (ptr); + return (ptr); } void * @@ -74,13 +74,13 @@ xrealloc(void *oldptr, size_t nmemb, size_t size) void *newptr; if (newsize == 0) - fatalx("zero size"); - if (SIZE_MAX / nmemb < size) - fatalx("nmemb * size > SIZE_MAX"); - if ((newptr = realloc(oldptr, newsize)) == NULL) + fatalx("zero size"); + if (SIZE_MAX / nmemb < size) + fatalx("nmemb * size > SIZE_MAX"); + if ((newptr = realloc(oldptr, newsize)) == NULL) fatal("xrealloc failed"); - return (newptr); + return (newptr); } void @@ -94,12 +94,12 @@ xfree(void *ptr) int printflike2 xasprintf(char **ret, const char *fmt, ...) { - va_list ap; - int i; + va_list ap; + int i; - va_start(ap, fmt); - i = xvasprintf(ret, fmt, ap); - va_end(ap); + va_start(ap, fmt); + i = xvasprintf(ret, fmt, ap); + va_end(ap); return (i); } @@ -110,21 +110,21 @@ xvasprintf(char **ret, const char *fmt, va_list ap) int i; i = vasprintf(ret, fmt, ap); - if (i < 0 || *ret == NULL) - fatal("xvasprintf failed"); + if (i < 0 || *ret == NULL) + fatal("xvasprintf failed"); - return (i); + return (i); } int printflike3 xsnprintf(char *buf, size_t len, const char *fmt, ...) { - va_list ap; - int i; + va_list ap; + int i; - va_start(ap, fmt); - i = xvsnprintf(buf, len, fmt, ap); - va_end(ap); + va_start(ap, fmt); + i = xvsnprintf(buf, len, fmt, ap); + va_end(ap); return (i); } @@ -138,8 +138,8 @@ xvsnprintf(char *buf, size_t len, const char *fmt, va_list ap) fatalx("len > INT_MAX"); i = vsnprintf(buf, len, fmt, ap); - if (i < 0) - fatal("vsnprintf failed"); + if (i < 0) + fatal("vsnprintf failed"); - return (i); + return (i); } |