iUse local variable - dedup - deduplicating backup program Err bitreich.org 70 hgit clone git://bitreich.org/dedup/ git://enlrupgkhuxnvlhsf6lc3fziv5h2hhfrinws65d7roiv6bfj7d652fid.onion/dedup/ URL:git://bitreich.org/dedup/ git://enlrupgkhuxnvlhsf6lc3fziv5h2hhfrinws65d7roiv6bfj7d652fid.onion/dedup/ bitreich.org 70 1Log /scm/dedup/log.gph bitreich.org 70 1Files /scm/dedup/files.gph bitreich.org 70 1Refs /scm/dedup/refs.gph bitreich.org 70 1Tags /scm/dedup/tag bitreich.org 70 1README /scm/dedup/file/README.gph bitreich.org 70 1LICENSE /scm/dedup/file/LICENSE.gph bitreich.org 70 i--- Err bitreich.org 70 1commit 6fa8f387de8c032029f8a3e9994d5ac5be5c7670 /scm/dedup/commit/6fa8f387de8c032029f8a3e9994d5ac5be5c7670.gph bitreich.org 70 1parent 41eca06f70153b7adc9364f35ece24fd628a96dd /scm/dedup/commit/41eca06f70153b7adc9364f35ece24fd628a96dd.gph bitreich.org 70 hAuthor: sin URL:mailto:sin@2f30.org bitreich.org 70 iDate: Mon, 25 Feb 2019 09:51:58 +0000 Err bitreich.org 70 i Err bitreich.org 70 iUse local variable Err bitreich.org 70 i Err bitreich.org 70 iDiffstat: Err bitreich.org 70 i M dedup.c | 21 ++++++++++++--------- Err bitreich.org 70 i Err bitreich.org 70 i1 file changed, 12 insertions(+), 9 deletions(-) Err bitreich.org 70 i--- Err bitreich.org 70 1diff --git a/dedup.c b/dedup.c /scm/dedup/file/dedup.c.gph bitreich.org 70 i@@ -295,11 +295,12 @@ extract(struct snapshot *snap, void *arg) Err bitreich.org 70 i buf[0] = alloc_buf(BLKSIZE_MAX); Err bitreich.org 70 i buf[1] = alloc_buf(comp_size(BLKSIZE_MAX)); Err bitreich.org 70 i for (i = 0; i < snap->nr_blk_descs; i++) { Err bitreich.org 70 i+ struct blk_desc *blk_desc; Err bitreich.org 70 i size_t blksize; Err bitreich.org 70 i Err bitreich.org 70 i- read_blk(buf[1], &snap->blk_desc[i]); Err bitreich.org 70 i- blksize = decomp(buf[1], buf[0], snap->blk_desc[i].size, Err bitreich.org 70 i- BLKSIZE_MAX); Err bitreich.org 70 i+ blk_desc = &snap->blk_desc[i]; Err bitreich.org 70 i+ read_blk(buf[1], blk_desc); Err bitreich.org 70 i+ blksize = decomp(buf[1], buf[0], blk_desc->size, BLKSIZE_MAX); Err bitreich.org 70 i xwrite(args->fd, buf[0], blksize); Err bitreich.org 70 i } Err bitreich.org 70 i free_buf(buf[1]); Err bitreich.org 70 i@@ -321,14 +322,16 @@ check(struct snapshot *snap, void *arg) Err bitreich.org 70 i * against snapshot entry block descriptor Err bitreich.org 70 i */ Err bitreich.org 70 i for (i = 0; i < snap->nr_blk_descs; i++) { Err bitreich.org 70 i- read_blk(buf, &snap->blk_desc[i]); Err bitreich.org 70 i+ struct blk_desc *blk_desc; Err bitreich.org 70 i+ Err bitreich.org 70 i+ blk_desc = &snap->blk_desc[i]; Err bitreich.org 70 i+ read_blk(buf, blk_desc); Err bitreich.org 70 i Err bitreich.org 70 i SHA256_Init(&ctx); Err bitreich.org 70 i- SHA256_Update(&ctx, buf, snap->blk_desc[i].size); Err bitreich.org 70 i+ SHA256_Update(&ctx, buf, blk_desc->size); Err bitreich.org 70 i SHA256_Final(md, &ctx); Err bitreich.org 70 i Err bitreich.org 70 i- if (memcmp(snap->blk_desc[i].md, md, Err bitreich.org 70 i- sizeof(snap->blk_desc[i]).md) == 0) Err bitreich.org 70 i+ if (memcmp(blk_desc->md, md, sizeof(blk_desc->md)) == 0) Err bitreich.org 70 i continue; Err bitreich.org 70 i Err bitreich.org 70 i fprintf(stderr, "Block hash mismatch\n"); Err bitreich.org 70 i@@ -339,9 +342,9 @@ check(struct snapshot *snap, void *arg) Err bitreich.org 70 i print_md(stderr, md, sizeof(md)); Err bitreich.org 70 i fputc('\n', stderr); Err bitreich.org 70 i fprintf(stderr, " Offset: %llu\n", Err bitreich.org 70 i- (unsigned long long)snap->blk_desc[i].offset); Err bitreich.org 70 i+ (unsigned long long)blk_desc->offset); Err bitreich.org 70 i fprintf(stderr, " Size: %llu\n", Err bitreich.org 70 i- (unsigned long long)snap->blk_desc[i].size); Err bitreich.org 70 i+ (unsigned long long)blk_desc->size); Err bitreich.org 70 i } Err bitreich.org 70 i free_buf(buf); Err bitreich.org 70 i return WALK_CONTINUE; Err bitreich.org 70 .