From 76d0af5599554d11f104d582cdac8fbaa8569fcc Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Fri, 4 Mar 2016 23:50:00 +0100 Subject: Clean up, add zerror and zperror, fix bugs and add more tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/zload.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/zload.c') diff --git a/src/zload.c b/src/zload.c index ff54afb..a77ae57 100644 --- a/src/zload.c +++ b/src/zload.c @@ -6,15 +6,14 @@ size_t zload(z_t a, const void *buffer) { const char *buf = buffer; - size_t alloced; a->sign = *((const int *)buf), buf += sizeof(int); a->used = *((const size_t *)buf), buf += sizeof(size_t); - alloced = *((const size_t *)buf), buf += sizeof(size_t); - if (alloced) - ENSURE_SIZE(a, alloced); + a->alloced = 0; + if (a->sign) + ENSURE_SIZE(a, a->used); else a->chars = 0; if (!zzero(a)) zmemcpy(a->chars, buf, a->used); - return sizeof(z_t) - sizeof(a->chars) + (zzero(a) ? 0 : a->used * sizeof(*(a->chars))); + return sizeof(int) + sizeof(size_t) + (zzero(a) ? 0 : a->used * sizeof(zahl_char_t)); } -- cgit v1.2.3-70-g09d2