aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--xmalloc.c13
-rw-r--r--xsnprintf.c5
2 files changed, 5 insertions, 13 deletions
diff --git a/xmalloc.c b/xmalloc.c
index e7693d3a..e60c1c6e 100644
--- a/xmalloc.c
+++ b/xmalloc.c
@@ -8,19 +8,14 @@
static void *
check_alloc(void *alloc)
{
- if (unlikely(alloc == NULL)) {
- FATAL_ERROR(__func__, ENOMEM);
- }
+ FATAL_ERROR_ON(alloc == NULL, ENOMEM);
return alloc;
}
void *
xmalloc(size_t size)
{
- if (unlikely(size == 0)) {
- size = 1;
- }
- return check_alloc(malloc(size));
+ return check_alloc(malloc(likely(size) ? size : 1));
}
void *
@@ -72,9 +67,7 @@ xvasprintf_(char **strp, const char *format, va_list ap)
va_list ap2;
va_copy(ap2, ap);
int n = vsnprintf(NULL, 0, format, ap2);
- if (unlikely(n < 0)) {
- FATAL_ERROR("vsnprintf", EILSEQ);
- }
+ FATAL_ERROR_ON(n < 0, EILSEQ);
va_end(ap2);
*strp = xmalloc(n + 1);
return vsnprintf(*strp, n + 1, format, ap);
diff --git a/xsnprintf.c b/xsnprintf.c
index 2f6f8493..495f4539 100644
--- a/xsnprintf.c
+++ b/xsnprintf.c
@@ -38,9 +38,8 @@ static size_t
xvsnprintf(char *restrict buf, size_t n, const char *restrict format, va_list ap)
{
int len = vsnprintf(buf, n, format, ap);
- if (unlikely(len < 0 || len >= (int)n)) {
- FATAL_ERROR(__func__, (len < 0) ? errno : ENOBUFS);
- }
+ FATAL_ERROR_ON(len < 0, errno);
+ FATAL_ERROR_ON(len >= (int)n, ENOBUFS);
return (size_t)len;
}