commit 90dfa2bf41872a0f074ac2cea3b45d6ba3c77de6 from: Christian Weisgerber via: Thomas Adam date: Sun Feb 13 00:43:46 2022 UTC consistently match size of hash variables to that returned by murmurhash ok millert stsp commit - ebdfb05bcdd625d0722a8b72220647eb014997fb commit + 90dfa2bf41872a0f074ac2cea3b45d6ba3c77de6 blob - f12135df2db1ceee67a5a57b7514abaf2d1b9486 blob + d5520525766e78cecee67d07825051e7b8848320 --- lib/deltify.c +++ lib/deltify.c @@ -93,7 +93,7 @@ hashblk(const unsigned char *p, off_t n) static const struct got_error * addblk(struct got_delta_table *dt, FILE *f, off_t file_offset0, off_t len, - off_t offset, uint64_t h) + off_t offset, uint32_t h) { const struct got_error *err = NULL; int i; @@ -171,7 +171,7 @@ addblk(struct got_delta_table *dt, FILE *f, off_t file static const struct got_error * addblk_mem(struct got_delta_table *dt, uint8_t *data, off_t file_offset0, - off_t len, off_t offset, uint64_t h) + off_t len, off_t offset, uint32_t h) { const struct got_error *err = NULL; int i; @@ -401,7 +401,7 @@ got_deltify_init_mem(struct got_delta_table **dt, uint off_t fileoffset, off_t filesize) { const struct got_error *err = NULL; - uint64_t h; + uint32_t h; const off_t offset0 = fileoffset; *dt = calloc(1, sizeof(**dt)); blob - c4588452586bfd92c6a9ee768ff7581c4c29edb3 blob + 7684d9c73d840e516657120dba99af61a25b5bc0 --- lib/got_lib_deltify.h +++ lib/got_lib_deltify.h @@ -18,7 +18,7 @@ struct got_delta_block { off_t len; off_t offset; - uint64_t hash; + uint32_t hash; }; struct got_delta_table {