From aed3b0f26563f655af5e3d1bd25879a94fcb05ea Mon Sep 17 00:00:00 2001 From: Jonathan Dieter Date: Sun, 8 Jul 2018 20:54:27 +0100 Subject: [PATCH] Initial work to move buzhash into libzck Signed-off-by: Jonathan Dieter --- src/lib/zck.c | 4 +++- src/lib/zck_private.h | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/lib/zck.c b/src/lib/zck.c index a0c3578..e45c029 100644 --- a/src/lib/zck.c +++ b/src/lib/zck.c @@ -68,7 +68,6 @@ static void zck_clear(zckCtx *zck) { index_free(zck); if(zck->header) free(zck->header); - zck->fd = -1; zck->header = NULL; zck->header_size = 0; if(!comp_close(zck)) @@ -89,6 +88,7 @@ static void zck_clear(zckCtx *zck) { close(zck->temp_fd); zck->temp_fd = 0; } + zck->fd = -1; } static int hex_to_int (char c) { @@ -337,6 +337,8 @@ zckCtx PUBLIC *zck_create() { } zck->prep_hash_type = -1; zck->prep_hdr_size = -1; + zck->buzhash_width = DEFAULT_BUZHASH_WIDTH; + zck->buzhash_match_bits = (2^DEFAULT_BUZHASH_BITS) - 1; return zck; } diff --git a/src/lib/zck_private.h b/src/lib/zck_private.h index 84948b2..61b6a6c 100644 --- a/src/lib/zck_private.h +++ b/src/lib/zck_private.h @@ -12,6 +12,9 @@ #define ZCK_MODE_READ 0 #define ZCK_MODE_WRITE 1 +#define DEFAULT_BUZHASH_WIDTH 48 +#define DEFAULT_BUZHASH_BITS 15 + #define zmalloc(x) calloc(1, x) #define PUBLIC __attribute__((visibility("default"))) @@ -204,6 +207,9 @@ typedef struct zckCtx { char *data; size_t data_size; + + int buzhash_width; + int buzhash_match_bits; } zckCtx; int get_tmp_fd() -- 2.30.2