commit f6027426102430eb80a6df7ce1bf2e31d15cf85d
from: Christian Weisgerber <naddy@mips.inka.de>
date: Sat Feb 12 21:48:46 2022 UTC

consistently match size of hash variables to that returned by murmurhash

ok millert stsp

commit - 32b5305fbed2d1a4c55b0eef6b93349b93ba7db0
commit + f6027426102430eb80a6df7ce1bf2e31d15cf85d
blob - f2d7dcd9fbbaf8769249fff962494d513388a78d
blob + 3580b0e0d35257395481742823e17c91ea06d00c
--- lib/deltify.c
+++ lib/deltify.c
@@ -95,7 +95,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;
@@ -173,7 +173,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;
@@ -403,7 +403,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 {