From: Jonathan Dieter <jdieter@gmail.com>
Date: Sat, 18 Sep 2021 15:41:47 +0000 (+0100)
Subject: Remove unneeded digest_size_uncompressed attribute
X-Git-Tag: archive/raspbian/1.2.1+ds1-1+rpi1^2~7^2~1^2~18^2~4
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=38c060919af5dc68608aa55920412ab63bb95569;p=zchunk.git

Remove unneeded digest_size_uncompressed attribute

The uncompressed digest size is the same as the compressed, so no reason
to need an extra attribute

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

diff --git a/src/lib/hash/hash.c b/src/lib/hash/hash.c
index b4e6c2c..34cb59e 100644
--- a/src/lib/hash/hash.c
+++ b/src/lib/hash/hash.c
@@ -551,7 +551,7 @@ char PUBLIC *zck_get_chunk_digest_uncompressed(zckChunk *item) {
     if (!item->zck->has_uncompressed_source) {
         return NULL;
     }
-    return get_digest_string(item->digest_uncompressed, item->digest_size_uncompressed);
+    return get_digest_string(item->digest_uncompressed, item->digest_size);
 }
 
 
diff --git a/src/lib/index/index_create.c b/src/lib/index/index_create.c
index 5405f22..956d11c 100644
--- a/src/lib/index/index_create.c
+++ b/src/lib/index/index_create.c
@@ -66,7 +66,6 @@ static bool finish_chunk(zckIndex *index, zckChunk *item, char *digest,
     }
     if(digest_uncompressed) {
         memcpy(item->digest_uncompressed, digest_uncompressed, index->digest_size);
-        item->digest_size_uncompressed = index->digest_size;
     }
     item->start = index->length;
     item->valid = valid;
diff --git a/src/lib/index/index_read.c b/src/lib/index/index_read.c
index fe0ee13..8c90137 100644
--- a/src/lib/index/index_read.c
+++ b/src/lib/index/index_read.c
@@ -105,7 +105,6 @@ bool index_read(zckCtx *zck, char *data, size_t size, size_t max_length) {
                 return false;
             }
             memcpy(new->digest_uncompressed, data+length, zck->index.digest_size);
-            new->digest_size_uncompressed = zck->index.digest_size;
             HASH_FIND(hh, zck->index.ht, new->digest, new->digest_size, tmp);
             if(!tmp)
                HASH_ADD_KEYPTR(hhuncomp, zck->index_uncomp.ht, new->digest_uncompressed, new->digest_size,
diff --git a/src/lib/zck_private.h b/src/lib/zck_private.h
index d21f8c5..019bdb2 100644
--- a/src/lib/zck_private.h
+++ b/src/lib/zck_private.h
@@ -149,9 +149,8 @@ struct zckDL {
 /* Contains an index item pointing to a chunk */
 struct zckChunk {
     char *digest;
-    int digest_size;
     char *digest_uncompressed;
-    int digest_size_uncompressed;
+    int digest_size;
     int valid;
     size_t number;
     size_t start;