Cleanup and fix bug in ztrunc

Signed-off-by: Mattias Andrée <maandree@kth.se>

1 files changed, 11 insertions, 19 deletions

diff --git a/src/zor.c b/src/zor.c
index 96a4565..1c78c86 100644
--- a/src/zor.c
+++ b/src/zor.c
@@ -1,9 +1,6 @@
 /* See LICENSE file for copyright and license details. */
 #include "internals"
 
-#include <stdlib.h>
-#include <string.h>
-
 
 void
 zor(z_t a, z_t b, z_t c)
@@ -11,41 +8,36 @@ zor(z_t a, z_t b, z_t c)
 	size_t n, m;
 
 	if (zzero(b)) {
-		if (zzero(c)) {
+		if (zzero(c))
 			SET_SIGNUM(a, 0);
-		} else {
-			if (a != c)
-				zset(a, c);
-		}
+		else
+			SET(a, c);
 		return;
 	} else if (zzero(c)) {
-		if (a != b)
-			zset(a, b);
+		SET(a, b);
 		return;
 	}
 
-	m = b->used > c->used ? b->used : c->used;
+	m = MAX(b->used, c->used);
 	n = b->used + c->used - m;
 
-	if (a->alloced < m) {
-		a->alloced = m;
-		a->chars = realloc(a->chars, m * sizeof(*(a->chars)));
-	}
+	if (a->alloced < m)
+		zahl_realloc(a, m);
 
 	if (a == b) {
-		memcpy(a->chars + n, m == b->used ? b->chars : c->chars, (m - n) * sizeof(*(a->chars)));
+		zmemcpy(a->chars + n, m == b->used ? b->chars : c->chars, m - n);
 		while (n--)
 			a->chars[n] |= c->chars[n];
 	} else if (a == c) {
-		memcpy(a->chars + n, m == b->used ? b->chars : c->chars, (m - n) * sizeof(*(a->chars)));
+		zmemcpy(a->chars + n, m == b->used ? b->chars : c->chars, m - n);
 		while (n--)
 			a->chars[n] |= b->chars[n];
 	} else if (m == b->used) {
-		memcpy(a->chars, b->chars, m * sizeof(*(a->chars)));
+		zmemcpy(a->chars, b->chars, m);
 		while (n--)
 			a->chars[n] |= c->chars[n];
 	} else {
-		memcpy(a->chars, c->chars, m * sizeof(*(a->chars)));
+		zmemcpy(a->chars, c->chars, m);
 		while (n--)
 			a->chars[n] |= b->chars[n];
 	}