From 5b10b24044b3350a19ab3d3c0b37b5e9c12365b1 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sun, 13 Mar 2016 23:54:56 +0100 Subject: Multiple changes: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1) Compile test with -O0, it takes too long otherwise. 2) Add error codes: ZERROR_0_POW_0, ZERROR_0_DIV_0, ZERROR_DIV_0, ZERROR_NEGATIVE. 3) Add workaround for a bug in clang (src/allocator.c). 4) Cleanups. 5) Minor optimisations. 6) Add inclusion guard for zahl.h. Signed-off-by: Mattias Andrée --- src/zerror.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'src/zerror.c') diff --git a/src/zerror.c b/src/zerror.c index c59b092..e4ed427 100644 --- a/src/zerror.c +++ b/src/zerror.c @@ -2,6 +2,13 @@ #include "internals.h" +#define LIST_ERRORS\ + X(ZERROR_0_POW_0, "indeterminate form: 0:th power of 0")\ + X(ZERROR_0_DIV_0, "indeterminate form: 0 divided by 0")\ + X(ZERROR_DIV_0, "undefined result: division by 0")\ + X(ZERROR_NEGATIVE, "argument must be non-negative") + + enum zerror zerror(const char **desc) { @@ -10,10 +17,16 @@ zerror(const char **desc) *desc = strerror(libzahl_error); errno = libzahl_error; return ZERROR_ERRNO_SET; - } else { - /* Current, we should not be able to get here. */ - if (desc) + } + + if (desc) { + switch (-libzahl_error) { +#define X(V, D) case V: *desc = D; break; + LIST_ERRORS +#undef X + default: abort(); - return -libzahl_error; + } } + return -libzahl_error; } -- cgit v1.2.3-70-g09d2