Merge remote-tracking branch 'origin/dev' into fix/unused-params-and-fnsfix/unused-params-and-fns

70 files changed, 25 insertions, 25 deletions

diff --git a/fuzz/Makefile.am b/fuzz/Makefile.am
index 34180a50f..b49a069d3 100644
--- a/fuzz/Makefile.am
+++ b/fuzz/Makefile.am
@@ -2,7 +2,7 @@ bin_PROGRAMS = fuzz_process_packet fuzz_ndpi_reader fuzz_ndpi_reader_alloc_fail
 #Alghoritms
 bin_PROGRAMS += fuzz_alg_bins fuzz_alg_hll fuzz_alg_hw_rsi_outliers_da fuzz_alg_jitter fuzz_alg_ses_des fuzz_alg_crc32_md5 fuzz_alg_bytestream
 #Data structures
-bin_PROGRAMS += fuzz_ds_patricia fuzz_ds_ahocorasick fuzz_ds_libcache fuzz_ds_tree fuzz_ds_ptree fuzz_ds_hash fuzz_ds_cmsketch fuzz_ds_bitmap64 fuzz_ds_domain_classify
+bin_PROGRAMS += fuzz_ds_patricia fuzz_ds_ahocorasick fuzz_ds_libcache fuzz_ds_tree fuzz_ds_ptree fuzz_ds_hash fuzz_ds_cmsketch fuzz_ds_bitmap64_fuse fuzz_ds_domain_classify
 #Third party
 bin_PROGRAMS += fuzz_libinjection fuzz_binaryfusefilter
 #Internal crypto
@@ -328,20 +328,20 @@ fuzz_ds_cmsketch_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
     $(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
     $(fuzz_ds_cmsketch_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
 
-fuzz_ds_bitmap64_SOURCES = fuzz_ds_bitmap64.cpp fuzz_common_code.c
-fuzz_ds_bitmap64_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
-fuzz_ds_bitmap64_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
-fuzz_ds_bitmap64_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
-fuzz_ds_bitmap64_LDFLAGS = $(LIBS)
+fuzz_ds_bitmap64_fuse_SOURCES = fuzz_ds_bitmap64_fuse.cpp fuzz_common_code.c
+fuzz_ds_bitmap64_fuse_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
+fuzz_ds_bitmap64_fuse_CFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
+fuzz_ds_bitmap64_fuse_LDADD = ../src/lib/libndpi.a $(ADDITIONAL_LIBS)
+fuzz_ds_bitmap64_fuse_LDFLAGS = $(LIBS)
 if HAS_FUZZLDFLAGS
-fuzz_ds_bitmap64_CXXFLAGS += $(LIB_FUZZING_ENGINE)
-fuzz_ds_bitmap64_CFLAGS += $(LIB_FUZZING_ENGINE)
-fuzz_ds_bitmap64_LDFLAGS += $(LIB_FUZZING_ENGINE)
+fuzz_ds_bitmap64_fuse_CXXFLAGS += $(LIB_FUZZING_ENGINE)
+fuzz_ds_bitmap64_fuse_CFLAGS += $(LIB_FUZZING_ENGINE)
+fuzz_ds_bitmap64_fuse_LDFLAGS += $(LIB_FUZZING_ENGINE)
 endif
 # force usage of CXX for linker
-fuzz_ds_bitmap64_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+fuzz_ds_bitmap64_fuse_LINK=$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
     $(LIBTOOLFLAGS) --mode=link $(CXX) @NDPI_CFLAGS@ $(AM_CXXFLAGS) $(CXXFLAGS) \
-    $(fuzz_ds_bitmap64_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
+    $(fuzz_ds_bitmap64_fuse_LDFLAGS) @NDPI_LDFLAGS@ $(LDFLAGS) -o $@
 
 fuzz_ds_domain_classify_SOURCES = fuzz_ds_domain_classify.cpp fuzz_common_code.c
 fuzz_ds_domain_classify_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
@@ -729,15 +729,15 @@ files_corpus_fuzz_readerutils_parseprotolist :=  $(wildcard corpus/fuzz_readerut
 fuzz_readerutils_parseprotolist_seed_corpus.zip: $(files_corpus_fuzz_readerutils_parseprotolist)
 	zip -j fuzz_readerutils_parseprotolist_seed_corpus.zip $(files_corpus_fuzz_readerutils_parseprotolist)
 
-files_corpus_fuzz_ds_bitmap64 :=  $(wildcard corpus/fuzz_ds_bitmap64/*)
-fuzz_ds_bitmap64_seed_corpus.zip: $(files_corpus_fuzz_ds_bitmap64)
-	zip -j fuzz_ds_bitmap64_seed_corpus.zip $(files_corpus_fuzz_ds_bitmap64)
+files_corpus_fuzz_ds_bitmap64_fuse :=  $(wildcard corpus/fuzz_ds_bitmap64_fuse/*)
+fuzz_ds_bitmap64_fuse_seed_corpus.zip: $(files_corpus_fuzz_ds_bitmap64_fuse)
+	zip -j fuzz_ds_bitmap64_fuse_seed_corpus.zip $(files_corpus_fuzz_ds_bitmap64_fuse)
 
 files_corpus_fuzz_ds_domain_classify :=  $(wildcard corpus/fuzz_ds_domain_classify/*)
 fuzz_ds_domain_classify_seed_corpus.zip: $(files_corpus_fuzz_ds_domain_classify)
 	zip -j fuzz_ds_domain_classify_seed_corpus.zip $(files_corpus_fuzz_ds_domain_classify)
 
-corpus: fuzz_ndpi_reader_seed_corpus.zip fuzz_ndpi_reader_alloc_fail_seed_corpus.zip fuzz_ndpi_reader_payload_analyzer_seed_corpus.zip fuzz_quic_get_crypto_data_seed_corpus.zip fuzz_alg_ses_des_seed_corpus.zip fuzz_alg_bins_seed_corpus.zip fuzz_alg_hll_seed_corpus.zip fuzz_alg_jitter_seed_corpus.zip fuzz_ds_libcache_seed_corpus.zip fuzz_community_id_seed_corpus.zip fuzz_serialization_seed_corpus.zip fuzz_ds_ptree_seed_corpus.zip fuzz_alg_crc32_md5_seed_corpus.zip fuzz_alg_bytestream_seed_corpus.zip fuzz_libinjection_seed_corpus.zip fuzz_tls_certificate_seed_corpus.zip fuzz_filecfg_protocols_seed_corpus.zip fuzz_readerutils_workflow_seed_corpus.zip fuzz_readerutils_parseprotolist_seed_corpus.zip fuzz_ds_bitmap64_seed_corpus.zip fuzz_ds_domain_classify_seed_corpus.zip fuzz_filecfg_protocols_seed_corpus.zip fuzz_filecfg_categories_seed_corpus.zip fuzz_filecfg_config_seed_corpus.zip fuzz_filecfg_category_seed_corpus.zip fuzz_is_stun_udp_seed_corpus.zip fuzz_is_stun_tcp_seed_corpus.zip fuzz_filecfg_malicious_sha1_seed_corpus.zip fuzz_filecfg_malicious_ja3_seed_corpus.zip fuzz_filecfg_risk_domains_seed_corpus.zip
+corpus: fuzz_ndpi_reader_seed_corpus.zip fuzz_ndpi_reader_alloc_fail_seed_corpus.zip fuzz_ndpi_reader_payload_analyzer_seed_corpus.zip fuzz_quic_get_crypto_data_seed_corpus.zip fuzz_alg_ses_des_seed_corpus.zip fuzz_alg_bins_seed_corpus.zip fuzz_alg_hll_seed_corpus.zip fuzz_alg_jitter_seed_corpus.zip fuzz_ds_libcache_seed_corpus.zip fuzz_community_id_seed_corpus.zip fuzz_serialization_seed_corpus.zip fuzz_ds_ptree_seed_corpus.zip fuzz_alg_crc32_md5_seed_corpus.zip fuzz_alg_bytestream_seed_corpus.zip fuzz_libinjection_seed_corpus.zip fuzz_tls_certificate_seed_corpus.zip fuzz_filecfg_protocols_seed_corpus.zip fuzz_readerutils_workflow_seed_corpus.zip fuzz_readerutils_parseprotolist_seed_corpus.zip fuzz_ds_bitmap64_fuse_seed_corpus.zip fuzz_ds_domain_classify_seed_corpus.zip fuzz_filecfg_protocols_seed_corpus.zip fuzz_filecfg_categories_seed_corpus.zip fuzz_filecfg_config_seed_corpus.zip fuzz_filecfg_category_seed_corpus.zip fuzz_is_stun_udp_seed_corpus.zip fuzz_is_stun_tcp_seed_corpus.zip fuzz_filecfg_malicious_sha1_seed_corpus.zip fuzz_filecfg_malicious_ja3_seed_corpus.zip fuzz_filecfg_risk_domains_seed_corpus.zip
 	cp corpus/fuzz_*seed_corpus.zip .
 
 #Create dictionaries exactly as expected by oss-fuzz.
@@ -787,7 +787,7 @@ distdir:
 		-o -path './corpus/fuzz_alg_crc32_md5/*' \
 		-o -path './corpus/fuzz_alg_bytestream/*' \
 		-o -path './corpus/fuzz_ds_libcache/*' \
-		-o -path './corpus/fuzz_ds_bitmap64/*' \
+		-o -path './corpus/fuzz_ds_bitmap64_fuse/*' \
 		-o -path './corpus/fuzz_ds_domain_classify/*' \
 		-o -path './corpus/fuzz_ds_ptree/*' | xargs -I'{}' cp -r '{}' '$(distdir)/{}'
 
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/000b6da044c11d100ffecc1c58f236a0c243f2c9 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/000b6da044c11d100ffecc1c58f236a0c243f2c9
index 6e858d125..6e858d125 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/000b6da044c11d100ffecc1c58f236a0c243f2c9
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/000b6da044c11d100ffecc1c58f236a0c243f2c9
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/03191cdd9d39fd9e9481819abe8096d3cd8dcaa9 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/03191cdd9d39fd9e9481819abe8096d3cd8dcaa9
index 2758a2ba4..2758a2ba4 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/03191cdd9d39fd9e9481819abe8096d3cd8dcaa9
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/03191cdd9d39fd9e9481819abe8096d3cd8dcaa9
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/0b085fb6da7814c2e70c22ca0221090b8bf4002c b/fuzz/corpus/fuzz_ds_bitmap64_fuse/0b085fb6da7814c2e70c22ca0221090b8bf4002c
index 1ade82114..1ade82114 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/0b085fb6da7814c2e70c22ca0221090b8bf4002c
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/0b085fb6da7814c2e70c22ca0221090b8bf4002c
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/0c78f9445a26753487132bc34b2fa5526b82357b b/fuzz/corpus/fuzz_ds_bitmap64_fuse/0c78f9445a26753487132bc34b2fa5526b82357b
index 1aa2657a9..1aa2657a9 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/0c78f9445a26753487132bc34b2fa5526b82357b
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/0c78f9445a26753487132bc34b2fa5526b82357b
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/0c9acbe4dba896e14dbaaf1063b4b445d2fd8f53 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/0c9acbe4dba896e14dbaaf1063b4b445d2fd8f53
index 33453b4b8..33453b4b8 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/0c9acbe4dba896e14dbaaf1063b4b445d2fd8f53
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/0c9acbe4dba896e14dbaaf1063b4b445d2fd8f53
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/0ccd0d0397766b982826f7cf9115f97018a62466 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/0ccd0d0397766b982826f7cf9115f97018a62466
index 83dd483d2..83dd483d2 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/0ccd0d0397766b982826f7cf9115f97018a62466
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/0ccd0d0397766b982826f7cf9115f97018a62466
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/0db99f086dca27ead6b42db91de404061b623981 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/0db99f086dca27ead6b42db91de404061b623981
index cdb40da90..cdb40da90 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/0db99f086dca27ead6b42db91de404061b623981
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/0db99f086dca27ead6b42db91de404061b623981
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/0eff7f526d9e547a3fd3fc0bfbaefa1e686ec9ec b/fuzz/corpus/fuzz_ds_bitmap64_fuse/0eff7f526d9e547a3fd3fc0bfbaefa1e686ec9ec
index e21f4ad0f..e21f4ad0f 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/0eff7f526d9e547a3fd3fc0bfbaefa1e686ec9ec
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/0eff7f526d9e547a3fd3fc0bfbaefa1e686ec9ec
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/10c27c41df755669fc42b71d295eda528c02f5b6 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/10c27c41df755669fc42b71d295eda528c02f5b6
index d40472301..d40472301 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/10c27c41df755669fc42b71d295eda528c02f5b6
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/10c27c41df755669fc42b71d295eda528c02f5b6
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/10f0aadbed8649c5917a9d90a1483a30ad83793f b/fuzz/corpus/fuzz_ds_bitmap64_fuse/10f0aadbed8649c5917a9d90a1483a30ad83793f
index 552d70d2a..552d70d2a 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/10f0aadbed8649c5917a9d90a1483a30ad83793f
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/10f0aadbed8649c5917a9d90a1483a30ad83793f
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/2730ef1769e66315391286ab579e13efc1baa670 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/2730ef1769e66315391286ab579e13efc1baa670
index efd0701f9..efd0701f9 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/2730ef1769e66315391286ab579e13efc1baa670
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/2730ef1769e66315391286ab579e13efc1baa670
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/27e24cb43045da83ad481dd8c6cd38de1bd359fc b/fuzz/corpus/fuzz_ds_bitmap64_fuse/27e24cb43045da83ad481dd8c6cd38de1bd359fc
index b0fda9f66..b0fda9f66 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/27e24cb43045da83ad481dd8c6cd38de1bd359fc
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/27e24cb43045da83ad481dd8c6cd38de1bd359fc
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/28005384ac31d00f0dce884ff065f66c76bc391b b/fuzz/corpus/fuzz_ds_bitmap64_fuse/28005384ac31d00f0dce884ff065f66c76bc391b
index 7590bb32c..7590bb32c 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/28005384ac31d00f0dce884ff065f66c76bc391b
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/28005384ac31d00f0dce884ff065f66c76bc391b
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/2ac3872be3ae0f578da110d5580b362374676ef9 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/2ac3872be3ae0f578da110d5580b362374676ef9
index beb9fe490..beb9fe490 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/2ac3872be3ae0f578da110d5580b362374676ef9
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/2ac3872be3ae0f578da110d5580b362374676ef9
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/2e540ffd5bd997876f0d84bb1d760602514437d5 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/2e540ffd5bd997876f0d84bb1d760602514437d5
index 1dd670bae..1dd670bae 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/2e540ffd5bd997876f0d84bb1d760602514437d5
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/2e540ffd5bd997876f0d84bb1d760602514437d5
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/36f01f003e9a03de198ced6ad4ae919a5a9fd039 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/36f01f003e9a03de198ced6ad4ae919a5a9fd039
index 3468266b4..3468266b4 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/36f01f003e9a03de198ced6ad4ae919a5a9fd039
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/36f01f003e9a03de198ced6ad4ae919a5a9fd039
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/375e36427a1552d8ff4d3c496296e4d2e52ae035 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/375e36427a1552d8ff4d3c496296e4d2e52ae035
index fa5bcc95d..fa5bcc95d 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/375e36427a1552d8ff4d3c496296e4d2e52ae035
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/375e36427a1552d8ff4d3c496296e4d2e52ae035
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/3af39359237047d1453f3a843348b1a53a7a480d b/fuzz/corpus/fuzz_ds_bitmap64_fuse/3af39359237047d1453f3a843348b1a53a7a480d
index 2e5040f8c..2e5040f8c 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/3af39359237047d1453f3a843348b1a53a7a480d
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/3af39359237047d1453f3a843348b1a53a7a480d
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/3c2fa67399fcc4c7de379137a631ac8278f5edc7 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/3c2fa67399fcc4c7de379137a631ac8278f5edc7
index c5c3c3c2b..c5c3c3c2b 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/3c2fa67399fcc4c7de379137a631ac8278f5edc7
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/3c2fa67399fcc4c7de379137a631ac8278f5edc7
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/3de96d39842d29fa7c63589ecbfd2b652b329334 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/3de96d39842d29fa7c63589ecbfd2b652b329334
index 937953c59..937953c59 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/3de96d39842d29fa7c63589ecbfd2b652b329334
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/3de96d39842d29fa7c63589ecbfd2b652b329334
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/448fdcde54b118a62f7a53c134a35ca447c0e762 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/448fdcde54b118a62f7a53c134a35ca447c0e762
index 4b77a8573..4b77a8573 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/448fdcde54b118a62f7a53c134a35ca447c0e762
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/448fdcde54b118a62f7a53c134a35ca447c0e762
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/485cc776ea8d113e993d911e39ebbe089669f949 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/485cc776ea8d113e993d911e39ebbe089669f949
index b9d7cf725..b9d7cf725 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/485cc776ea8d113e993d911e39ebbe089669f949
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/485cc776ea8d113e993d911e39ebbe089669f949
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/486f2245c8e26f0f769ab53503d6d7bc5d15c97b b/fuzz/corpus/fuzz_ds_bitmap64_fuse/486f2245c8e26f0f769ab53503d6d7bc5d15c97b
index 82e64f77a..82e64f77a 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/486f2245c8e26f0f769ab53503d6d7bc5d15c97b
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/486f2245c8e26f0f769ab53503d6d7bc5d15c97b
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/4b7cc42c02089c817ff610eb65d149356d96062a b/fuzz/corpus/fuzz_ds_bitmap64_fuse/4b7cc42c02089c817ff610eb65d149356d96062a
index bbc5ce21e..bbc5ce21e 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/4b7cc42c02089c817ff610eb65d149356d96062a
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/4b7cc42c02089c817ff610eb65d149356d96062a
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/539e28d50616971ae880b07df55661945966626c b/fuzz/corpus/fuzz_ds_bitmap64_fuse/539e28d50616971ae880b07df55661945966626c
index 1b5878df0..1b5878df0 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/539e28d50616971ae880b07df55661945966626c
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/539e28d50616971ae880b07df55661945966626c
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/5e3bfa52c5d6a5e3cb2288fa9c58dd09b546f2ba b/fuzz/corpus/fuzz_ds_bitmap64_fuse/5e3bfa52c5d6a5e3cb2288fa9c58dd09b546f2ba
index b7b5c063a..b7b5c063a 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/5e3bfa52c5d6a5e3cb2288fa9c58dd09b546f2ba
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/5e3bfa52c5d6a5e3cb2288fa9c58dd09b546f2ba
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/60c5f54695042fd2d6e0b97bddf3e55f8c9807b7 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/60c5f54695042fd2d6e0b97bddf3e55f8c9807b7
index 55b3b9311..55b3b9311 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/60c5f54695042fd2d6e0b97bddf3e55f8c9807b7
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/60c5f54695042fd2d6e0b97bddf3e55f8c9807b7
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/6886bfb6a9cb9398e4dfbf0fa4fb909148d442a1 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/6886bfb6a9cb9398e4dfbf0fa4fb909148d442a1
index a1a97a72b..a1a97a72b 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/6886bfb6a9cb9398e4dfbf0fa4fb909148d442a1
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/6886bfb6a9cb9398e4dfbf0fa4fb909148d442a1
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/6e97172624f802febb1f68d357254e768810efc6 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/6e97172624f802febb1f68d357254e768810efc6
index 35b9f61ac..35b9f61ac 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/6e97172624f802febb1f68d357254e768810efc6
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/6e97172624f802febb1f68d357254e768810efc6
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/6f103d053753b48191a50676b186154388fd90ce b/fuzz/corpus/fuzz_ds_bitmap64_fuse/6f103d053753b48191a50676b186154388fd90ce
index 7ca663399..7ca663399 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/6f103d053753b48191a50676b186154388fd90ce
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/6f103d053753b48191a50676b186154388fd90ce
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/6fb915c4967d2d8b03c3cbc6e65aa247ea94dde3 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/6fb915c4967d2d8b03c3cbc6e65aa247ea94dde3
index 91aab7e5b..91aab7e5b 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/6fb915c4967d2d8b03c3cbc6e65aa247ea94dde3
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/6fb915c4967d2d8b03c3cbc6e65aa247ea94dde3
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/707c8ca3c49e1519254f90d69626a4cd351b45ca b/fuzz/corpus/fuzz_ds_bitmap64_fuse/707c8ca3c49e1519254f90d69626a4cd351b45ca
index 17fe2b432..17fe2b432 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/707c8ca3c49e1519254f90d69626a4cd351b45ca
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/707c8ca3c49e1519254f90d69626a4cd351b45ca
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/75c56111e67252f6b544aabf055ef7113f44891e b/fuzz/corpus/fuzz_ds_bitmap64_fuse/75c56111e67252f6b544aabf055ef7113f44891e
index 739ceed05..739ceed05 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/75c56111e67252f6b544aabf055ef7113f44891e
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/75c56111e67252f6b544aabf055ef7113f44891e
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/7b1b296a38fa941521b1ae5ada7f53fcb01616c5 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/7b1b296a38fa941521b1ae5ada7f53fcb01616c5
index 72719d434..72719d434 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/7b1b296a38fa941521b1ae5ada7f53fcb01616c5
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/7b1b296a38fa941521b1ae5ada7f53fcb01616c5
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/8bb13e2f178a7da1580dbcf426885e6ac861a609 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/8bb13e2f178a7da1580dbcf426885e6ac861a609
index 15d2ec270..15d2ec270 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/8bb13e2f178a7da1580dbcf426885e6ac861a609
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/8bb13e2f178a7da1580dbcf426885e6ac861a609
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/8dfde24023b6377ec411016db54890ad58370d9c b/fuzz/corpus/fuzz_ds_bitmap64_fuse/8dfde24023b6377ec411016db54890ad58370d9c
index 1b4e0d294..1b4e0d294 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/8dfde24023b6377ec411016db54890ad58370d9c
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/8dfde24023b6377ec411016db54890ad58370d9c
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/90f53e4946ded91eedeffe75747a9118d747d029 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/90f53e4946ded91eedeffe75747a9118d747d029
index 942f79517..942f79517 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/90f53e4946ded91eedeffe75747a9118d747d029
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/90f53e4946ded91eedeffe75747a9118d747d029
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/920da1a4cec774e0de02ebf54087099de7658cdb b/fuzz/corpus/fuzz_ds_bitmap64_fuse/920da1a4cec774e0de02ebf54087099de7658cdb
index c31d9caea..c31d9caea 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/920da1a4cec774e0de02ebf54087099de7658cdb
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/920da1a4cec774e0de02ebf54087099de7658cdb
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/96996a3adf736a9044a04c5d8acd73e385b1bc6b b/fuzz/corpus/fuzz_ds_bitmap64_fuse/96996a3adf736a9044a04c5d8acd73e385b1bc6b
index 1f39c2362..1f39c2362 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/96996a3adf736a9044a04c5d8acd73e385b1bc6b
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/96996a3adf736a9044a04c5d8acd73e385b1bc6b
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/9e55233a97010a5a3f2dfad360e5c8a3e2d9b8ef b/fuzz/corpus/fuzz_ds_bitmap64_fuse/9e55233a97010a5a3f2dfad360e5c8a3e2d9b8ef
index 2c734f55c..2c734f55c 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/9e55233a97010a5a3f2dfad360e5c8a3e2d9b8ef
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/9e55233a97010a5a3f2dfad360e5c8a3e2d9b8ef
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/9f28a467c09155c799c880706286180fc50ee0a2 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/9f28a467c09155c799c880706286180fc50ee0a2
index d70f7fe0e..d70f7fe0e 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/9f28a467c09155c799c880706286180fc50ee0a2
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/9f28a467c09155c799c880706286180fc50ee0a2
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/a8fb1448425ca0cb6871ec51c67332eb2185159e b/fuzz/corpus/fuzz_ds_bitmap64_fuse/a8fb1448425ca0cb6871ec51c67332eb2185159e
index c745c687e..c745c687e 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/a8fb1448425ca0cb6871ec51c67332eb2185159e
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/a8fb1448425ca0cb6871ec51c67332eb2185159e
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/ab870e2c87f40df57d2aeb9a035f6f55b3486261 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/ab870e2c87f40df57d2aeb9a035f6f55b3486261
index 55a73792d..55a73792d 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/ab870e2c87f40df57d2aeb9a035f6f55b3486261
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/ab870e2c87f40df57d2aeb9a035f6f55b3486261
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/aca80cb5b3b214b3273623a383678e3e66eece2b b/fuzz/corpus/fuzz_ds_bitmap64_fuse/aca80cb5b3b214b3273623a383678e3e66eece2b
index 246262c24..246262c24 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/aca80cb5b3b214b3273623a383678e3e66eece2b
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/aca80cb5b3b214b3273623a383678e3e66eece2b
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/afa1100989a7a625fe7bbf39e09a296c53a5572c b/fuzz/corpus/fuzz_ds_bitmap64_fuse/afa1100989a7a625fe7bbf39e09a296c53a5572c
index 55854c0cf..55854c0cf 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/afa1100989a7a625fe7bbf39e09a296c53a5572c
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/afa1100989a7a625fe7bbf39e09a296c53a5572c
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/aff44f8008132c50796911f5f52f1e2307c2a858 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/aff44f8008132c50796911f5f52f1e2307c2a858
index 6c769fd18..6c769fd18 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/aff44f8008132c50796911f5f52f1e2307c2a858
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/aff44f8008132c50796911f5f52f1e2307c2a858
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/b51a60734da64be0e618bacbea2865a8a7dcd669 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/b51a60734da64be0e618bacbea2865a8a7dcd669
index 2f94675b7..2f94675b7 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/b51a60734da64be0e618bacbea2865a8a7dcd669
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/b51a60734da64be0e618bacbea2865a8a7dcd669
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/b5c0fdf0969f9ad91e127670d76df252e6e6b1d9 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/b5c0fdf0969f9ad91e127670d76df252e6e6b1d9
index f1b41d102..f1b41d102 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/b5c0fdf0969f9ad91e127670d76df252e6e6b1d9
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/b5c0fdf0969f9ad91e127670d76df252e6e6b1d9
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/b5d2b5145a6066fd0429e1236dd08fff307122ab b/fuzz/corpus/fuzz_ds_bitmap64_fuse/b5d2b5145a6066fd0429e1236dd08fff307122ab
index fea6e080c..fea6e080c 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/b5d2b5145a6066fd0429e1236dd08fff307122ab
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/b5d2b5145a6066fd0429e1236dd08fff307122ab
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/b5f6e6294cc83f68f906cdc5195a45c30ce11121 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/b5f6e6294cc83f68f906cdc5195a45c30ce11121
index fc66b353c..fc66b353c 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/b5f6e6294cc83f68f906cdc5195a45c30ce11121
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/b5f6e6294cc83f68f906cdc5195a45c30ce11121
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/b8dbebe13b9f719baae6afc13a3ee01846c33089 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/b8dbebe13b9f719baae6afc13a3ee01846c33089
index 13aadd727..13aadd727 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/b8dbebe13b9f719baae6afc13a3ee01846c33089
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/b8dbebe13b9f719baae6afc13a3ee01846c33089
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/c03aa82eaa3d73636a44653b05f2aa83d465ae32 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/c03aa82eaa3d73636a44653b05f2aa83d465ae32
index 9d44a9f94..9d44a9f94 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/c03aa82eaa3d73636a44653b05f2aa83d465ae32
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/c03aa82eaa3d73636a44653b05f2aa83d465ae32
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/c4fcead253b3a6ea0ebb48397751d2439b1f489f b/fuzz/corpus/fuzz_ds_bitmap64_fuse/c4fcead253b3a6ea0ebb48397751d2439b1f489f
index dbeb7ca0c..dbeb7ca0c 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/c4fcead253b3a6ea0ebb48397751d2439b1f489f
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/c4fcead253b3a6ea0ebb48397751d2439b1f489f
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/c50e5229c745fc00ea982d7e31a21501362ae054 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/c50e5229c745fc00ea982d7e31a21501362ae054
index 84cb14d22..84cb14d22 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/c50e5229c745fc00ea982d7e31a21501362ae054
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/c50e5229c745fc00ea982d7e31a21501362ae054
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/cedb4282204e8a6469f370e6ed6b082ba0017b54 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/cedb4282204e8a6469f370e6ed6b082ba0017b54
index 17f2335a0..17f2335a0 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/cedb4282204e8a6469f370e6ed6b082ba0017b54
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/cedb4282204e8a6469f370e6ed6b082ba0017b54
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/d39a8fafd0e4a957003dcbc8ca23e48e9640aaba b/fuzz/corpus/fuzz_ds_bitmap64_fuse/d39a8fafd0e4a957003dcbc8ca23e48e9640aaba
index f97878f51..f97878f51 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/d39a8fafd0e4a957003dcbc8ca23e48e9640aaba
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/d39a8fafd0e4a957003dcbc8ca23e48e9640aaba
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/d58f4b573cd04c2ff3df7487ca8c5bc942335a30 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/d58f4b573cd04c2ff3df7487ca8c5bc942335a30
index f5d4f9dff..f5d4f9dff 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/d58f4b573cd04c2ff3df7487ca8c5bc942335a30
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/d58f4b573cd04c2ff3df7487ca8c5bc942335a30
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/d9739412222ab242871c5292f12e5556e779a9c8 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/d9739412222ab242871c5292f12e5556e779a9c8
index 7a8739c9a..7a8739c9a 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/d9739412222ab242871c5292f12e5556e779a9c8
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/d9739412222ab242871c5292f12e5556e779a9c8
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/e20b515e8276f7bb16141e37b25d231266840ce3 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/e20b515e8276f7bb16141e37b25d231266840ce3
index 19600110d..19600110d 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/e20b515e8276f7bb16141e37b25d231266840ce3
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/e20b515e8276f7bb16141e37b25d231266840ce3
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/e4e2d81d9c15ac2493c5014d584721366dd38af8 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/e4e2d81d9c15ac2493c5014d584721366dd38af8
index f305e39c3..f305e39c3 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/e4e2d81d9c15ac2493c5014d584721366dd38af8
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/e4e2d81d9c15ac2493c5014d584721366dd38af8
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/e54dbe399501a4027fdd3e2bcd547b4ba8699d00 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/e54dbe399501a4027fdd3e2bcd547b4ba8699d00
index 672a551ff..672a551ff 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/e54dbe399501a4027fdd3e2bcd547b4ba8699d00
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/e54dbe399501a4027fdd3e2bcd547b4ba8699d00
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/eefc0d805828e9bd300c2ce9370e32554a93d79a b/fuzz/corpus/fuzz_ds_bitmap64_fuse/eefc0d805828e9bd300c2ce9370e32554a93d79a
index 8faa665d5..8faa665d5 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/eefc0d805828e9bd300c2ce9370e32554a93d79a
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/eefc0d805828e9bd300c2ce9370e32554a93d79a
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/ef1f8773349d15d2c581642068b3b06206a2b43e b/fuzz/corpus/fuzz_ds_bitmap64_fuse/ef1f8773349d15d2c581642068b3b06206a2b43e
index ad35998e3..ad35998e3 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/ef1f8773349d15d2c581642068b3b06206a2b43e
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/ef1f8773349d15d2c581642068b3b06206a2b43e
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/f0c957104bb1b80c9d125d9c8cbb3f06fbf2ab1a b/fuzz/corpus/fuzz_ds_bitmap64_fuse/f0c957104bb1b80c9d125d9c8cbb3f06fbf2ab1a
index ded2df2a5..ded2df2a5 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/f0c957104bb1b80c9d125d9c8cbb3f06fbf2ab1a
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/f0c957104bb1b80c9d125d9c8cbb3f06fbf2ab1a
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/f1c09f190bf77d120a0e539412bbd9fa70af062f b/fuzz/corpus/fuzz_ds_bitmap64_fuse/f1c09f190bf77d120a0e539412bbd9fa70af062f
index ef42a3e51..ef42a3e51 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/f1c09f190bf77d120a0e539412bbd9fa70af062f
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/f1c09f190bf77d120a0e539412bbd9fa70af062f
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/f4643e6de35a287e7ccc44126aabd147f86bff26 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/f4643e6de35a287e7ccc44126aabd147f86bff26
index 46351556b..46351556b 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/f4643e6de35a287e7ccc44126aabd147f86bff26
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/f4643e6de35a287e7ccc44126aabd147f86bff26
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/fa5b31c6f43981ff6a304189345466790de5a10b b/fuzz/corpus/fuzz_ds_bitmap64_fuse/fa5b31c6f43981ff6a304189345466790de5a10b
index 8fb85d223..8fb85d223 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/fa5b31c6f43981ff6a304189345466790de5a10b
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/fa5b31c6f43981ff6a304189345466790de5a10b
diff --git a/fuzz/corpus/fuzz_ds_bitmap64/fb8f2cb93bb8e3215593ea1395a6ec62c627ed87 b/fuzz/corpus/fuzz_ds_bitmap64_fuse/fb8f2cb93bb8e3215593ea1395a6ec62c627ed87
index 20d96d851..20d96d851 100644
--- a/fuzz/corpus/fuzz_ds_bitmap64/fb8f2cb93bb8e3215593ea1395a6ec62c627ed87
+++ b/fuzz/corpus/fuzz_ds_bitmap64_fuse/fb8f2cb93bb8e3215593ea1395a6ec62c627ed87
diff --git a/fuzz/fuzz_ds_bitmap64.cpp b/fuzz/fuzz_ds_bitmap64_fuse.cpp
index 18a3fcb34..381c16b5c 100644
--- a/fuzz/fuzz_ds_bitmap64.cpp
+++ b/fuzz/fuzz_ds_bitmap64_fuse.cpp
@@ -7,23 +7,23 @@
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
   FuzzedDataProvider fuzzed_data(data, size);
   u_int16_t i, num_iteration, is_added = 0;
-  ndpi_bitmap64 *b;
+  ndpi_bitmap64_fuse *b;
   bool rc;
   u_int64_t value, value_added;
 
   /* To allow memory allocation failures */
   fuzz_set_alloc_callbacks_and_seed(size);
 
-  b = ndpi_bitmap64_alloc();
+  b = ndpi_bitmap64_fuse_alloc();
 
   if(fuzzed_data.ConsumeBool())
-    ndpi_bitmap64_compress(b);
+    ndpi_bitmap64_fuse_compress(b);
 
   num_iteration = fuzzed_data.ConsumeIntegral<u_int16_t>();
   for (i = 0; i < num_iteration; i++) {
     value = fuzzed_data.ConsumeIntegral<u_int64_t>();
 
-    rc = ndpi_bitmap64_set(b, value);
+    rc = ndpi_bitmap64_fuse_set(b, value);
     /* Keep one random entry really added */
     if (rc == true && is_added == 0 && fuzzed_data.ConsumeBool()) {
       value_added = value;
@@ -32,23 +32,23 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
   }
 
   if(fuzzed_data.ConsumeBool())
-    ndpi_bitmap64_compress(b);
+    ndpi_bitmap64_fuse_compress(b);
 
   /* "Random" search */
   num_iteration = fuzzed_data.ConsumeIntegral<u_int8_t>();
   for (i = 0; i < num_iteration; i++) {
     value = fuzzed_data.ConsumeIntegral<u_int64_t>();
 
-    ndpi_bitmap64_isset(b, value);
+    ndpi_bitmap64_fuse_isset(b, value);
   }
   /* Search of an added entry */
   if (is_added) {
-    ndpi_bitmap64_isset(b, value_added);
+    ndpi_bitmap64_fuse_isset(b, value_added);
   }
 
-  ndpi_bitmap64_size(b);
+  ndpi_bitmap64_fuse_size(b);
 
-  ndpi_bitmap64_free(b);
+  ndpi_bitmap64_fuse_free(b);
 
   return 0;
 }