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/zstr.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'src/zstr.c') diff --git a/src/zstr.c b/src/zstr.c index 81a9674..dfcdf23 100644 --- a/src/zstr.c +++ b/src/zstr.c @@ -16,16 +16,12 @@ char * zstr(z_t a, char *b) { char buf[19 + 1]; - size_t n, len; + size_t n, len, neg; char overridden = 0; - int neg; if (zzero(a)) { - if (!b) { - b = malloc(2); - if (!b) - FAILURE(errno); - } + if (!b && !(b = malloc(2))) + libzahl_failure(errno); b[0] = '0'; b[1] = 0; return b; @@ -33,13 +29,10 @@ zstr(z_t a, char *b) n = zstr_length(a, 10); - if (!b) { - b = malloc(n + 1); - if (!b) - FAILURE(errno); - } + if (!b && !(b = malloc(n + 1))) + libzahl_failure(errno); - neg = zsignum(a) < 0; + neg = znegative(a); zabs(num, a); b[0] = '-'; b += neg; -- cgit v1.2.3-70-g09d2