From d6987458f21cf1890045f2606d0f8ec4d2225b44 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Thu, 3 Mar 2016 23:02:59 +0100 Subject: Cleanup and fix bug in ztrunc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/zand.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'src/zand.c') diff --git a/src/zand.c b/src/zand.c index 950ad8e..a75abc5 100644 --- a/src/zand.c +++ b/src/zand.c @@ -1,9 +1,6 @@ /* See LICENSE file for copyright and license details. */ #include "internals" -#include -#include - void zand(z_t a, z_t b, z_t c) @@ -15,7 +12,7 @@ zand(z_t a, z_t b, z_t c) return; } - n = b->used < c->used ? b->used : c->used; + n = MIN(b->used, c->used); while (n--) if (b->chars[n] & c->chars[n]) goto found_highest; @@ -31,11 +28,9 @@ found_highest: while (n--) a->chars[n] &= b->chars[n]; } else { - if (a->alloced < a->used) { - a->alloced = a->used; - a->chars = realloc(a->chars, a->used * sizeof(*(a->chars))); - } - memcpy(a->chars, c->chars, a->used * sizeof(*(a->chars))); + if (a->alloced < a->used) + zahl_realloc(a, a->used); + zmemcpy(a->chars, c->chars, a->used); while (n--) a->chars[n] &= b->chars[n]; } -- cgit v1.2.3-70-g09d2