Update test cases to use new error functions
authorJonathan Dieter <jdieter@gmail.com>
Tue, 24 Jul 2018 21:30:05 +0000 (22:30 +0100)
committerJonathan Dieter <jdieter@gmail.com>
Tue, 24 Jul 2018 21:30:05 +0000 (22:30 +0100)
Signed-off-by: Jonathan Dieter <jdieter@gmail.com>
test/empty.c
test/lib/util.c

index 79936bd268cf2d447191ad3e83e8ab4c691987f1..6d03247b9912d850317165341fe4ca01849169e0 100644 (file)
@@ -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) {
index fd63d29ccf8fe25057260dc31e9eb910db65078a..5134770c0f857c2622aeb41c7971dc63fff2fe23 100644 (file)
 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);
 }