Fix zckdl

Signed-off-by: Jonathan Dieter <jdieter@gmail.com>

diff --git a/src/lib/dl/dl.c b/src/lib/dl/dl.c
index 66f708cc3fbdfb3ad82f13ae1ee96eb146ee7b6e..a82adb4a07d77b27848d0ac559a4c32048fda085 100644 (file)
--- a/src/lib/dl/dl.c
+++ b/src/lib/dl/dl.c
@@ -120,7 +120,7 @@ static int write_and_verify_chunk(zckCtx *src, zckCtx *tgt,
                                   zckChunk *src_idx,
                                   zckChunk *tgt_idx) {
     VALIDATE_READ_BOOL(src);
-    VALIDATE_WRITE_BOOL(tgt);
+    VALIDATE_READ_BOOL(tgt);
 
     static char buf[BUF_SIZE] = {0};
 

diff --git a/src/lib/dl/range.c b/src/lib/dl/range.c
index 027a1ac921e4381d41f45725a1f181f91b6ec94a..bd0fc613ce6ef25d24c36cf11c5f99e97ecbadfb 100644 (file)
--- a/src/lib/dl/range.c
+++ b/src/lib/dl/range.c
@@ -57,8 +57,8 @@ static zckRangeItem *range_insert_new(zckCtx *zck, zckRangeItem *prev,
         next->prev = new;
     }
     if(add_index)
-        if(!index_new_chunk(&(info->index), idx->digest, idx->digest_size,
-                                end-start+1, end-start+1, False, NULL)) {
+        if(!index_new_chunk(zck, &(info->index), idx->digest, idx->digest_size,
+                                end-start+1, end-start+1, False)) {
             free(new);
             return NULL;
         }

diff --git a/src/lib/index/index_create.c b/src/lib/index/index_create.c
index 3923b01eee98e578da4e4819aebb0b4b955070dc..6b4af9358fba9f90caefde9529bfe33b90747758 100644 (file)
--- a/src/lib/index/index_create.c
+++ b/src/lib/index/index_create.c
@@ -133,9 +133,8 @@ int index_create(zckCtx *zck) {
     return True;
 }
 
-int index_new_chunk(zckIndex *index, char *digest, int digest_size,
-                    size_t comp_size, size_t orig_size, int finished,
-                    zckCtx *zck) {
+int index_new_chunk(zckCtx *zck, zckIndex *index, char *digest, int digest_size,
+                    size_t comp_size, size_t orig_size, int finished) {
     VALIDATE_BOOL(zck);
 
     if(index == NULL) {

diff --git a/src/lib/io.c b/src/lib/io.c
index 651521ee99e86785b829624e514f3f9c923a2e3b..0ae1692659b2e64175d82821b2e1813ca4da02b6 100644 (file)
--- a/src/lib/io.c
+++ b/src/lib/io.c
@@ -51,7 +51,7 @@ ssize_t read_data(zckCtx *zck, char *data, size_t length) {
 }
 
 int write_data(zckCtx *zck, int fd, const char *data, size_t length) {
-    VALIDATE_WRITE_INT(zck);
+    VALIDATE_INT(zck);
 
     if(length == 0)
         return True;

diff --git a/src/lib/zck_private.h b/src/lib/zck_private.h
index 4ce806d49864a81a534b48c514c4280f149e93e0..25cc8c3493c2420fe86da9fd7a01e8d3aa3c4a48 100644 (file)
--- a/src/lib/zck_private.h
+++ b/src/lib/zck_private.h
@@ -324,9 +324,8 @@ int index_read(zckCtx *zck, char *data, size_t size, size_t max_length)
     __attribute__ ((warn_unused_result));
 int index_create(zckCtx *zck)
     __attribute__ ((warn_unused_result));
-int index_new_chunk(zckIndex *index, char *digest, int digest_size,
-                    size_t comp_size, size_t orig_size, int valid,
-                    zckCtx *zck)
+int index_new_chunk(zckCtx *zck, zckIndex *index, char *digest, int digest_size,
+                    size_t comp_size, size_t orig_size, int valid)
     __attribute__ ((warn_unused_result));
 int index_add_to_chunk(zckCtx *zck, char *data, size_t comp_size,
                         size_t orig_size)