From 85ed2c67731744f3f1403ea3bea66f28c0cf0bbc Mon Sep 17 00:00:00 2001 From: Jonathan Dieter Date: Tue, 24 Jul 2018 22:30:05 +0100 Subject: [PATCH] Update test cases to use new error functions Signed-off-by: Jonathan Dieter --- test/empty.c | 12 ++++++++++-- test/lib/util.c | 12 ++++++++---- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/test/empty.c b/test/empty.c index 79936bd..6d03247 100644 --- a/test/empty.c +++ b/test/empty.c @@ -45,9 +45,13 @@ int main (int argc, char *argv[]) { perror("Unable to open empty.zck for writing"); exit(1); } - zckCtx *zck = zck_init_write(out); + zckCtx *zck = zck_create(); if(zck == NULL) exit(1); + if(!zck_init_write(zck, out)) { + printf(zck_get_error(zck)); + exit(1); + } if(!zck_close(zck)) exit(1); @@ -83,9 +87,13 @@ int main (int argc, char *argv[]) { perror("Unable to seek to beginning of empty.zck"); exit(1); } - zck = zck_init_read(in); + zck = zck_create(); if(zck == NULL) exit(1); + if(!zck_init_read(zck, in)) { + printf(zck_get_error(zck)); + exit(1); + } memset(data, 0, 1000); len = zck_read(zck, data, 1000); if(len > 0) { diff --git a/test/lib/util.c b/test/lib/util.c index fd63d29..5134770 100644 --- a/test/lib/util.c +++ b/test/lib/util.c @@ -31,15 +31,19 @@ char *get_hash(char *data, size_t length, int type) { zckHashType hash_type = {0}; zckHash hash = {0}; - if(!hash_setup(&hash_type, type)) + zckCtx *zck = zck_create(); + if(zck == NULL) return NULL; - if(!hash_init(&hash, &hash_type)) + if(!hash_setup(zck, &hash_type, type)) return NULL; - if(!hash_update(&hash, data, length)) + if(!hash_init(zck, &hash, &hash_type)) return NULL; - char *digest = hash_finalize(&hash); + if(!hash_update(zck, &hash, data, length)) + return NULL; + char *digest = hash_finalize(zck, &hash); if(digest == NULL) return NULL; + zck_free(&zck); return get_digest_string(digest, hash_type.digest_size); } -- 2.30.2