Rename zckIndexItem.finished to zckIndexItem.valid

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

diff --git a/include/zck.h b/include/zck.h
index dffdcd591f6409c5f2d7844d519a5e2cf256835d..e3e5a6a56bd149c17315fbaaf424cdb1362fe47a 100644 (file)
--- a/include/zck.h
+++ b/include/zck.h
@@ -48,7 +48,7 @@ typedef struct zckHash zckHash;
 typedef struct zckIndexItem {
     char *digest;
     int digest_size;
-    int finished;
+    int valid;
     size_t start;
     size_t comp_length;
     size_t length;

diff --git a/src/lib/dl/dl.c b/src/lib/dl/dl.c
index acbbd9e1c84cd1b0e22b9e82b2528d74c1c319f7..02015e158778ed6dcbc5d5ee2f0335c3bb1c4413 100644 (file)
--- a/src/lib/dl/dl.c
+++ b/src/lib/dl/dl.c
@@ -117,7 +117,7 @@ int zck_dl_write_chunk(zckDL *dl) {
         if(!zck_dl_write_zero(dl->zck, dl->priv->tgt_check))
             return False;
     } else {
-        dl->priv->tgt_check->finished = True;
+        dl->priv->tgt_check->valid = True;
     }
     dl->priv->tgt_check = NULL;
     dl->priv->chunk_hash = NULL;
@@ -146,7 +146,7 @@ int zck_dl_write_range(zckDL *dl, const char *at, size_t length) {
             if(dl->priv->dl_chunk_data == idx->start) {
                 zckIndexItem *tgt_idx = dl->zck->index.first;
                 while(tgt_idx) {
-                    if(tgt_idx->finished)
+                    if(tgt_idx->valid)
                         tgt_idx = tgt_idx->next;
                     if(idx->comp_length == tgt_idx->comp_length &&
                        memcmp(idx->digest, tgt_idx->digest,
@@ -253,7 +253,7 @@ int zck_dl_write_and_verify(zckRange *info, zckCtx *src, zckCtx *tgt,
         if(!zck_range_add(info, tgt_idx, tgt))
             return False;
     } else {
-        tgt_idx->finished = True;
+        tgt_idx->valid = True;
         zck_log(ZCK_LOG_DEBUG, "Writing %lu bytes at %lu\n",
                 tgt_idx->comp_length, tgt_idx->start);
     }

diff --git a/src/lib/index/index_create.c b/src/lib/index/index_create.c
index 10708810b0a29f038fbd0aad4b40d0d1ea5b71de..ce721e63e9785bb92d6cadbc50db10088e04ae12 100644 (file)
--- a/src/lib/index/index_create.c
+++ b/src/lib/index/index_create.c
@@ -93,7 +93,7 @@ int index_create(zckCtx *zck) {
 }
 
 static int finish_chunk(zckIndex *index, zckIndexItem *item, char *digest,
-                        int finished) {
+                        int valid) {
     VALIDATE(index);
     VALIDATE(item);
 
@@ -108,7 +108,7 @@ static int finish_chunk(zckIndex *index, zckIndexItem *item, char *digest,
         item->digest_size = index->digest_size;
     }
     item->start = index->length;
-    item->finished = finished;
+    item->valid = valid;
     if(index->first == NULL) {
         index->first = item;
     } else {

diff --git a/src/lib/index/index_read.c b/src/lib/index/index_read.c
index e600f97e8d326e9818dd9e1c3e432d9f8dd0dc2c..a5d18d744705a8a0f8adb3b57d6a7e42af6389d0 100644 (file)
--- a/src/lib/index/index_read.c
+++ b/src/lib/index/index_read.c
@@ -88,7 +88,7 @@ int zck_index_read(zckCtx *zck, char *data, size_t size, size_t max_length) {
             return False;
         new->length = chunk_length;
 
-        new->finished = False;
+        new->valid = False;
         idx_loc += new->comp_length;
         zck->index.length = idx_loc;
 

diff --git a/src/lib/zck_private.h b/src/lib/zck_private.h
index c29a94f3ffa1ded737a12548658fedd8bce6d356..725ff106db3f89cf91c27f2425adfcd2ab43c507 100644 (file)
--- a/src/lib/zck_private.h
+++ b/src/lib/zck_private.h
@@ -195,7 +195,7 @@ int zck_index_read(zckCtx *zck, char *data, size_t size, size_t max_length)
 int index_create(zckCtx *zck)
     __attribute__ ((warn_unused_result));
 int zck_index_new_chunk(zckIndex *index, char *digest, int digest_size,
-                        size_t comp_size, size_t orig_size, int finished)
+                        size_t comp_size, size_t orig_size, int valid)
     __attribute__ ((warn_unused_result));
 int zck_index_add_to_chunk(zckCtx *zck, char *data, size_t comp_size,
                         size_t orig_size)