From: Jonathan Dieter Date: Fri, 23 Mar 2018 10:48:10 +0000 (+0200) Subject: Change name of compressed length in index to comp_length in preparation X-Git-Tag: archive/raspbian/1.1.9+ds1-1+rpi1~1^2~343 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ef669b996a2092a39736b193ca2bb73a49583c0a;p=zchunk.git Change name of compressed length in index to comp_length in preparation for adding uncompressed length Signed-off-by: Jonathan Dieter --- diff --git a/include/zck.h b/include/zck.h index e841bfa..04758f6 100644 --- a/include/zck.h +++ b/include/zck.h @@ -32,7 +32,7 @@ typedef struct zckIndexItem { int digest_size; int finished; size_t start; - size_t length; + size_t comp_length; struct zckIndexItem *next; } zckIndexItem; diff --git a/src/lib/dl/dl.c b/src/lib/dl/dl.c index 6d4830c..d0851e5 100644 --- a/src/lib/dl/dl.c +++ b/src/lib/dl/dl.c @@ -61,7 +61,7 @@ void zck_dl_free_dl_regex(zckDL *dl) { int zck_dl_write_zero(zckCtx *tgt, zckIndexItem *tgt_idx) { char buf[BUF_SIZE] = {0}; size_t tgt_data_offset = tgt->header_size + tgt->index_size; - size_t to_read = tgt_idx->length; + size_t to_read = tgt_idx->comp_length; if(!zck_seek(tgt->fd, tgt_data_offset + tgt_idx->start, SEEK_SET)) return False; while(to_read > 0) { @@ -149,7 +149,7 @@ int zck_dl_write_range(zckDL *dl, const char *at, size_t length) { while(tgt_idx) { if(tgt_idx->finished) tgt_idx = tgt_idx->next; - if(idx->length == tgt_idx->length && + if(idx->comp_length == tgt_idx->comp_length && memcmp(idx->digest, tgt_idx->digest, idx->digest_size) == 0) { dl->priv->tgt_check = tgt_idx; @@ -157,7 +157,7 @@ int zck_dl_write_range(zckDL *dl, const char *at, size_t length) { if(!zck_hash_init(dl->priv->chunk_hash, &(dl->zck->chunk_hash_type))) return 0; - dl->priv->write_in_chunk = idx->length; + dl->priv->write_in_chunk = idx->comp_length; size_t offset = dl->zck->header_size + dl->zck->index_size; if(!zck_seek(dl->dst_fd, offset + tgt_idx->start, @@ -223,7 +223,7 @@ int zck_dl_write_and_verify(zckRange *info, zckCtx *src, zckCtx *tgt, size_t src_data_offset = src->header_size + src->index_size; size_t tgt_data_offset = tgt->header_size + tgt->index_size; - size_t to_read = src_idx->length; + size_t to_read = src_idx->comp_length; if(!zck_seek(src->fd, src_data_offset + src_idx->start, SEEK_SET)) return False; if(!zck_seek(tgt->fd, tgt_data_offset + tgt_idx->start, SEEK_SET)) @@ -256,8 +256,8 @@ int zck_dl_write_and_verify(zckRange *info, zckCtx *src, zckCtx *tgt, return False; } else { tgt_idx->finished = True; - zck_log(ZCK_LOG_DEBUG, "Writing %lu bytes at %lu\n", tgt_idx->length, - tgt_idx->start); + zck_log(ZCK_LOG_DEBUG, "Writing %lu bytes at %lu\n", + tgt_idx->comp_length, tgt_idx->start); } free(digest); return True; @@ -273,7 +273,7 @@ int zck_dl_copy_src_chunks(zckRange *info, zckCtx *src, zckCtx *tgt) { src_idx = src_info->first; while(src_idx) { - if(tgt_idx->length == src_idx->length && + if(tgt_idx->comp_length == src_idx->comp_length && memcmp(tgt_idx->digest, src_idx->digest, zck_get_chunk_digest_size(tgt)) == 0) { found = True; @@ -380,7 +380,7 @@ int zck_dl_bytes(zckDL *dl, char *url, size_t bytes, size_t start, } zck_log(ZCK_LOG_DEBUG, "Downloading %lu bytes at position %lu\n", start+bytes-*buffer_len, *buffer_len); idx.start = *buffer_len; - idx.length = start+bytes-*buffer_len; + idx.comp_length = start+bytes-*buffer_len; zck_range_close(&(dl->info)); zck_range_add(&(dl->info), &idx, NULL); if(!zck_dl_range_chk_chunk(dl, url, 0)) diff --git a/src/lib/dl/range.c b/src/lib/dl/range.c index 3fc2aaf..57a99b0 100644 --- a/src/lib/dl/range.c +++ b/src/lib/dl/range.c @@ -111,7 +111,7 @@ int zck_range_add(zckRange *info, zckIndexItem *idx, zckCtx *zck) { } size_t start = idx->start + header_len; - size_t end = idx->start + header_len + idx->length - 1; + size_t end = idx->start + header_len + idx->comp_length - 1; zckRangeItem *prev = info->first; for(zckRangeItem *ptr=info->first; ptr;) { prev = ptr; diff --git a/src/lib/hash/hash.c b/src/lib/hash/hash.c index 35057b0..6a6ae84 100644 --- a/src/lib/hash/hash.c +++ b/src/lib/hash/hash.c @@ -139,7 +139,7 @@ int zck_hash_check_data(zckCtx *zck, int dst_fd) { zckIndexItem *idx = zck->index.first; zck_log(ZCK_LOG_INFO, "Checking full hash\n"); while(idx) { - size_t to_read = idx->length; + size_t to_read = idx->comp_length; while(to_read > 0) { size_t rb = BUF_SIZE; if(rb > to_read) diff --git a/src/lib/index/index_create.c b/src/lib/index/index_create.c index 8ecfcb9..f387ef0 100644 --- a/src/lib/index/index_create.c +++ b/src/lib/index/index_create.c @@ -66,7 +66,8 @@ int zck_index_finalize(zckCtx *zck) { while(tmp) { memcpy(index+index_size, tmp->digest, zck->index.digest_size); index_size += zck->index.digest_size; - zck_compint_from_size(index+index_size, tmp->length, &index_size); + zck_compint_from_size(index+index_size, tmp->comp_length, + &index_size); tmp = tmp->next; } } @@ -140,7 +141,7 @@ int zck_index_new_chunk(zckIndex *index, char *digest, int digest_size, memcpy(idx->digest, digest, digest_size); idx->digest_size = digest_size; idx->start = index->length; - idx->length = length; + idx->comp_length = length; idx->finished = finished; if(index->first == NULL) { index->first = idx; diff --git a/src/lib/index/index_read.c b/src/lib/index/index_read.c index 422e0f1..7d9651e 100644 --- a/src/lib/index/index_read.c +++ b/src/lib/index/index_read.c @@ -116,7 +116,7 @@ int zck_index_read(zckCtx *zck, char *data, size_t size) { if(!zck_compint_to_size(&chunk_length, data+length, &length)) return False; new->start = idx_loc; - new->length = chunk_length; + new->comp_length = chunk_length; new->finished = False; idx_loc += chunk_length; diff --git a/src/lib/zck.c b/src/lib/zck.c index c9ffda5..fa35b1c 100644 --- a/src/lib/zck.c +++ b/src/lib/zck.c @@ -343,7 +343,7 @@ int zck_decompress_to_file(zckCtx *zck, int src_fd, int dst_fd) { /* Check if zck file is empty */ for(int count=0; idx; count++) { - size_t csize = idx->length; + size_t csize = idx->comp_length; char *cdata; if(csize == 0) diff --git a/src/zck_delta_size.c b/src/zck_delta_size.c index 05b3ce0..283b5b3 100644 --- a/src/zck_delta_size.c +++ b/src/zck_delta_size.c @@ -102,11 +102,11 @@ int main (int argc, char *argv[]) { src_idx = src_idx->next; } if(!found) { - dl_size += tgt_idx->length; + dl_size += tgt_idx->comp_length; } else { matched_chunks += 1; } - total_size += tgt_idx->length; + total_size += tgt_idx->comp_length; tgt_idx = tgt_idx->next; } printf("Would download %li of %li bytes\n", dl_size, total_size); diff --git a/src/zck_read_header.c b/src/zck_read_header.c index 6ff9e9c..9d01da0 100644 --- a/src/zck_read_header.c +++ b/src/zck_read_header.c @@ -75,7 +75,7 @@ int main (int argc, char *argv[]) { while(idx) { for(int i=0; idigest[i]); - printf(" %12lu %12lu\n", idx->start + zck_get_header_length(zck), idx->length); + printf(" %12lu %12lu %12lu\n", idx->start + zck_get_header_length(zck), idx->comp_length, idx->comp_length); idx = idx->next; }