aboutsummaryrefslogtreecommitdiffstats
path: root/src/zstr.c
diff options
context:
space:
mode:
authorMattias Andrée <maandree@kth.se>2016-03-13 23:54:56 +0100
committerMattias Andrée <maandree@kth.se>2016-03-13 23:54:56 +0100
commit5b10b24044b3350a19ab3d3c0b37b5e9c12365b1 (patch)
tree3f6aa8de29becc5d7511fcca50e6d31982c1b64b /src/zstr.c
parentOptimisations (diff)
downloadlibzahl-5b10b24044b3350a19ab3d3c0b37b5e9c12365b1.tar.gz
libzahl-5b10b24044b3350a19ab3d3c0b37b5e9c12365b1.tar.bz2
libzahl-5b10b24044b3350a19ab3d3c0b37b5e9c12365b1.tar.xz
Multiple changes:
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 <maandree@kth.se>
Diffstat (limited to 'src/zstr.c')
-rw-r--r--src/zstr.c19
1 files changed, 6 insertions, 13 deletions
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;