circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-05 18:38:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2016-04-04 18:01:11 +01:00
commit ad2532c3f4
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
xmalloc.c
View File

@ -5,7 +5,7 @@
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved * All rights reserved
* Versions of malloc and friends that check their results, and never return * Versions of malloc and friends that check their results, and never return
* failure (they call fatal if they encounter an error). * failure (they call fatalx if they encounter an error).
* *
* As far as I am concerned, the code I have written for this software * 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 * can be used freely for any purpose. Any derived versions of this
@ -29,10 +29,10 @@ xmalloc(size_t size)
void *ptr; void *ptr;
if (size == 0) if (size == 0)
fatal("xmalloc: zero size"); fatalx("xmalloc: zero size");
ptr = malloc(size); ptr = malloc(size);
if (ptr == NULL) if (ptr == NULL)
fatal("xmalloc: allocating %zu bytes: %s", fatalx("xmalloc: allocating %zu bytes: %s",
size, strerror(errno)); size, strerror(errno));
return ptr; return ptr;
} }
@ -43,10 +43,10 @@ xcalloc(size_t nmemb, size_t size)
void *ptr; void *ptr;
if (size == 0 || nmemb == 0) if (size == 0 || nmemb == 0)
fatal("xcalloc: zero size"); fatalx("xcalloc: zero size");
ptr = calloc(nmemb, size); ptr = calloc(nmemb, size);
if (ptr == NULL) if (ptr == NULL)
fatal("xcalloc: allocating %zu * %zu bytes: %s", fatalx("xcalloc: allocating %zu * %zu bytes: %s",
nmemb, size, strerror(errno)); nmemb, size, strerror(errno));
return ptr; return ptr;
} }
@ -63,10 +63,10 @@ xreallocarray(void *ptr, size_t nmemb, size_t size)
void *new_ptr; void *new_ptr;
if (nmemb == 0 || size == 0) if (nmemb == 0 || size == 0)
fatal("xreallocarray: zero size"); fatalx("xreallocarray: zero size");
new_ptr = reallocarray(ptr, nmemb, size); new_ptr = reallocarray(ptr, nmemb, size);
if (new_ptr == NULL) if (new_ptr == NULL)
fatal("xreallocarray: allocating %zu * %zu bytes: %s", fatalx("xreallocarray: allocating %zu * %zu bytes: %s",
nmemb, size, strerror(errno)); nmemb, size, strerror(errno));
return new_ptr; return new_ptr;
} }
@ -77,7 +77,7 @@ xstrdup(const char *str)
char *cp; char *cp;
if ((cp = strdup(str)) == NULL) if ((cp = strdup(str)) == NULL)
fatal("xstrdup: %s", strerror(errno)); fatalx("xstrdup: %s", strerror(errno));
return cp; return cp;
} }
@ -102,7 +102,7 @@ xvasprintf(char **ret, const char *fmt, va_list ap)
i = vasprintf(ret, fmt, ap); i = vasprintf(ret, fmt, ap);
if (i < 0 || *ret == NULL) if (i < 0 || *ret == NULL)
fatal("xasprintf: %s", strerror(errno)); fatalx("xasprintf: %s", strerror(errno));
return i; return i;
} }
@ -126,12 +126,12 @@ xvsnprintf(char *str, size_t len, const char *fmt, va_list ap)
int i; int i;
if (len > INT_MAX) if (len > INT_MAX)
fatal("xsnprintf: len > INT_MAX"); fatalx("xsnprintf: len > INT_MAX");
i = vsnprintf(str, len, fmt, ap); i = vsnprintf(str, len, fmt, ap);
if (i < 0 || i >= (int)len) if (i < 0 || i >= (int)len)
fatal("xsnprintf: overflow"); fatalx("xsnprintf: overflow");
return i; return i;
} }