From 8499353982cefb51a5680141048fe3c7018376ed Mon Sep 17 00:00:00 2001
From: Graham Keeling <grke@grke.net>
Date: Wed, 22 Jun 2022 08:42:46 +1000
Subject: [PATCH] Delete more unused code (from hexmap.c).

Change-Id: I44357245484605d05fe73cfc880db2ef1dd7ba35
---
 src/hexmap.c                      | 107 -------------------
 src/hexmap.h                      |  11 --
 src/prog.c                        |   1 -
 utest/client/test_backup_phase2.c |   1 -
 utest/server/monitor/test_cache.c |   1 -
 utest/server/test_backup_phase2.c |   2 -
 utest/server/test_dpth.c          |   1 -
 utest/server/test_manio.c         |   2 -
 utest/server/test_restore.c       |   1 -
 utest/server/test_resume.c        |   3 -
 utest/test_hexmap.c               | 164 +-----------------------------
 11 files changed, 5 insertions(+), 289 deletions(-)

diff --git a/src/hexmap.c b/src/hexmap.c
index 8fc798f1a..043b64c22 100644
--- a/src/hexmap.c
+++ b/src/hexmap.c
@@ -1,65 +1,6 @@
 #include "burp.h"
 #include "hexmap.h"
 
-// FIX THIS: Should be set in configure somewhere.
-#include <openssl/md5.h>
-
-#define HEXMAP_SIZE	256
-
-static uint8_t hexmap1[HEXMAP_SIZE];
-static uint8_t hexmap2[HEXMAP_SIZE];
-
-uint8_t md5sum_of_empty_string[MD5_DIGEST_LENGTH];
-
-static void do_hexmap_init(uint8_t *hexmap, uint8_t shift)
-{
-	uint8_t i;
-	uint8_t h;
-	memset(hexmap, 0, HEXMAP_SIZE);
-	for(i='0', h=0x00; i<='9'; i++, h++) hexmap[i]=h<<shift;
-	for(i='a', h=0x0A; i<='f'; i++, h++) hexmap[i]=h<<shift;
-	for(i='A', h=0x0A; i<='F'; i++, h++) hexmap[i]=h<<shift;
-}
-
-void hexmap_init(void)
-{
-	do_hexmap_init(hexmap1, 4);
-	do_hexmap_init(hexmap2, 0);
-	md5str_to_bytes("D41D8CD98F00B204E9800998ECF8427E",
-		md5sum_of_empty_string);
-}
-
-static void str_to_bytes(const char *str, uint8_t *bytes, size_t len)
-{
-	static uint8_t bpos;
-	static uint8_t spos;
-
-	for(bpos=0, spos=0; bpos<len && str[spos]; )
-	{
-		if(str[spos]=='/')
-		{
-			spos++;
-			continue;
-		}
-#if BYTE_ORDER == LITTLE_ENDIAN
-		bytes[bpos++] = hexmap1[(uint8_t)str[spos]]
-			| hexmap2[(uint8_t)str[spos+1]];
-#elif BYTE_ORDER == BIG_ENDIAN
-		bytes[bpos-bpos%4+3-bpos%4] = hexmap1[(uint8_t)str[spos]]
-			| hexmap2[(uint8_t)str[spos+1]];
-		bpos+=1;
-#else
-		#error byte order not supported
-#endif
-		spos+=2;
-	}
-}
-
-void md5str_to_bytes(const char *md5str, uint8_t *bytes)
-{
-	str_to_bytes(md5str, bytes, MD5_DIGEST_LENGTH);
-}
-
 char *bytes_to_md5str(uint8_t *bytes)
 {
         static char str[64];
@@ -67,51 +8,3 @@ char *bytes_to_md5str(uint8_t *bytes)
 		htobe64(*(uint64_t *)bytes), htobe64(*(uint64_t *)(bytes+8)));
         return str;
 }
-
-uint64_t savepathstr_with_sig_to_uint64(const char *savepathstr)
-{
-	uint8_t b[sizeof(uint64_t)];
-	str_to_bytes(savepathstr, b, sizeof(b));
-	return htobe64(*(uint64_t *)&b);
-}
-
-static char *savepathstr_make(uint64_t *be_bytes)
-{
-        static char str[15];
-	uint8_t *b=(uint8_t *)be_bytes;
-        snprintf(str, sizeof(str), "%02X%02X/%02X%02X/%02X%02X",
-                b[0], b[1], b[2], b[3], b[4], b[5]);
-	return str;
-}
-
-char *uint64_to_savepathstr(uint64_t bytes)
-{
-	uint64_t be_bytes=htobe64(bytes);
-	return savepathstr_make(&be_bytes);
-}
-
-char *uint64_to_savepathstr_with_sig(uint64_t bytes)
-{
-        static char str[20];
-	uint64_t be_bytes=htobe64(bytes);
-	uint8_t *b=(uint8_t *)&be_bytes;
-        snprintf(str, sizeof(str), "%02X%02X/%02X%02X/%02X%02X/%02X%02X",
-                b[0], b[1], b[2], b[3], b[4], b[5], b[6], b[7]);
-        return str;
-}
-
-char *uint64_to_savepathstr_with_sig_uint(uint64_t bytes, uint16_t *sig)
-{
-	char *str;
-	uint64_t be_bytes=htobe64(bytes);
-	uint8_t *b=(uint8_t *)&be_bytes;
-	str=savepathstr_make(&be_bytes);
-	*sig = b[6] << 8;
-	*sig |= b[7];
-        return str;
-}
-
-uint64_t uint64_to_savepath_hash_key(uint64_t bytes)
-{
-	return bytes & 0xFFFFFFFFFFFF0000;
-}
diff --git a/src/hexmap.h b/src/hexmap.h
index 57fc2e651..a524432ba 100644
--- a/src/hexmap.h
+++ b/src/hexmap.h
@@ -3,17 +3,6 @@
 
 #include "burp.h"
 
-extern uint8_t md5sum_of_empty_string[];
-
-extern void hexmap_init(void);
-
-extern void md5str_to_bytes(const char *md5str, uint8_t *bytes);
 extern char *bytes_to_md5str(uint8_t *bytes);
 
-extern uint64_t savepathstr_with_sig_to_uint64(const char *savepathstr);
-extern char *uint64_to_savepathstr(uint64_t bytes);
-extern char *uint64_to_savepathstr_with_sig(uint64_t bytes);
-extern char *uint64_to_savepathstr_with_sig_uint(uint64_t bytes, uint16_t *sig);
-extern uint64_t uint64_to_savepath_hash_key(uint64_t bytes);
-
 #endif
diff --git a/src/prog.c b/src/prog.c
index 4d7395b20..2e45479ef 100644
--- a/src/prog.c
+++ b/src/prog.c
@@ -528,7 +528,6 @@ int real_main(int argc, char *argv[])
 		goto end;
 
 	base64_init();
-	hexmap_init();
 
 	if(mode==BURP_MODE_SERVER)
 	{
diff --git a/utest/client/test_backup_phase2.c b/utest/client/test_backup_phase2.c
index 6cb2eb556..daf80418b 100644
--- a/utest/client/test_backup_phase2.c
+++ b/utest/client/test_backup_phase2.c
@@ -282,7 +282,6 @@ static void run_test(int expected_ret,
 
 	prng_init(0);
 	base64_init();
-	hexmap_init();
 
 	as=setup_async();
 	confs=setup_conf();
diff --git a/utest/server/monitor/test_cache.c b/utest/server/monitor/test_cache.c
index b6318972b..8096ddcfa 100644
--- a/utest/server/monitor/test_cache.c
+++ b/utest/server/monitor/test_cache.c
@@ -36,7 +36,6 @@ static struct sdirs *setup(void)
 	struct sdirs *sdirs;
 	prng_init(0);
 	base64_init();
-	hexmap_init();
 	fail_unless(!recursive_delete(BASE));
 	fail_unless((sdirs=sdirs_alloc())!=NULL);
 	do_sdirs_init(sdirs);
diff --git a/utest/server/test_backup_phase2.c b/utest/server/test_backup_phase2.c
index 323437d51..68efbbc70 100644
--- a/utest/server/test_backup_phase2.c
+++ b/utest/server/test_backup_phase2.c
@@ -248,7 +248,6 @@ static void run_test(int expected_ret,
 	struct slist *slist=NULL;
 	prng_init(0);
 	base64_init();
-	hexmap_init();
 	setup(&as, &sdirs, &confs);
 	asfd=asfd_mock_setup(&reads, &writes);
 	as->asfd_add(as, asfd);
@@ -349,7 +348,6 @@ static void run_test_changed(int expected_ret,
 	struct slist *slist=NULL;
 	prng_init(0);
 	base64_init();
-	hexmap_init();
 	setup(&as, &sdirs, &confs);
 	asfd=asfd_mock_setup(&reads, &writes);
 	as->asfd_add(as, asfd);
diff --git a/utest/server/test_dpth.c b/utest/server/test_dpth.c
index d60e58770..6e7f6beb1 100644
--- a/utest/server/test_dpth.c
+++ b/utest/server/test_dpth.c
@@ -26,7 +26,6 @@ static void assert_components(struct dpth *dpth,
 static struct dpth *setup(void)
 {
 	struct dpth *dpth;
-	hexmap_init();
 	fail_unless(recursive_delete(basepath)==0);
 	fail_unless((dpth=dpth_alloc())!=NULL);
 	assert_components(dpth, 0, 0, 0);
diff --git a/utest/server/test_manio.c b/utest/server/test_manio.c
index cb217e422..f31cf1584 100644
--- a/utest/server/test_manio.c
+++ b/utest/server/test_manio.c
@@ -80,7 +80,6 @@ static void test_manifest(int phase)
 	int entries=1000;
 	prng_init(0);
 	base64_init();
-	hexmap_init();
 	recursive_delete(path);
 
 	slist=build_manifest(path, entries, phase);
@@ -124,7 +123,6 @@ static void test_manifest_tell_seek(int phase)
 	int entries=1000;
 	prng_init(0);
 	base64_init();
-	hexmap_init();
 	recursive_delete(path);
 
 	slist=build_manifest(path, entries, phase);
diff --git a/utest/server/test_restore.c b/utest/server/test_restore.c
index 29c757916..74270648c 100644
--- a/utest/server/test_restore.c
+++ b/utest/server/test_restore.c
@@ -137,7 +137,6 @@ static void run_test(int expected_ret,
 	char *dir_for_notify=NULL;
         prng_init(0);
         base64_init();
-        hexmap_init();
         setup(&as, &sdirs, &confs);
 	set_string(confs[OPT_BACKUP], "1");
         asfd=asfd_mock_setup(&reads, &writes);
diff --git a/utest/server/test_resume.c b/utest/server/test_resume.c
index 5ad913a16..c0f1b6866 100644
--- a/utest/server/test_resume.c
+++ b/utest/server/test_resume.c
@@ -216,7 +216,6 @@ static void last_good_entry(void setup_slist(struct slist *, int *))
 
 	prng_init(0);
 	base64_init();
-	hexmap_init();
 	fail_unless(!recursive_delete(path));
 
 	fail_unless((slist=slist_alloc())!=NULL);
@@ -430,7 +429,6 @@ static void go_past_entry(void setup_slist(struct slist *, int *))
 
 	prng_init(0);
 	base64_init();
-	hexmap_init();
 	fail_unless(!recursive_delete(path));
 
 	fail_unless((slist=slist_alloc())!=NULL);
@@ -616,7 +614,6 @@ static void go_before_entry(
 
 	prng_init(0);
 	base64_init();
-	hexmap_init();
 	fail_unless(!recursive_delete(path));
 
 	fail_unless((slist=slist_alloc())!=NULL);
diff --git a/utest/test_hexmap.c b/utest/test_hexmap.c
index 5048aa049..b0ac14de5 100644
--- a/utest/test_hexmap.c
+++ b/utest/test_hexmap.c
@@ -7,57 +7,29 @@
 #include "../src/alloc.h"
 #include "../src/hexmap.h"
 
-START_TEST(test_md5sum_of_empty_string)
-{
-	MD5_CTX *md5=NULL;
-	uint8_t checksum[MD5_DIGEST_LENGTH];
-
-	md5=(MD5_CTX *)calloc_w(1, sizeof(MD5_CTX), __func__);
-	fail_unless(md5!=NULL);
-	MD5_Init(md5);
-	MD5_Final(checksum, md5);
-	hexmap_init();
-	fail_unless(!memcmp(md5sum_of_empty_string, md5, MD5_DIGEST_LENGTH));
-	free_v((void **)&md5);
-}
-END_TEST
-
 struct md5data
 {
-        const char *str;
+	const char *str;
 	uint8_t bytes[MD5_DIGEST_LENGTH];
 };
 
 static struct md5data m[] = {
 	{ "d41d8cd98f00b204e9800998ecf8427e",
 		{ 0xD4, 0x1D, 0x8C, 0xD9, 0x8F, 0x00, 0xB2, 0x04,
-		  0xE9, 0x80, 0x09, 0x98, 0xEC, 0xF8, 0x42, 0x7E } },
+			0xE9, 0x80, 0x09, 0x98, 0xEC, 0xF8, 0x42, 0x7E } },
 	{ "00000000000000000000000000000000",
 		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },
 	{ "ffffffffffffffffffffffffffffffff",
 		{ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-		  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF } },
+			0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF } },
 	{ "0123456789abcdef0123456789abcdef",
 		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF,
-		  0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF } },
+			0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF } },
 };
 
-START_TEST(test_md5str_to_bytes)
-{
-	hexmap_init();
-	FOREACH(m)
-	{
-		uint8_t bytes[MD5_DIGEST_LENGTH];
-		md5str_to_bytes(m[i].str, bytes);
-		fail_unless(!memcmp(bytes, m[i].bytes, MD5_DIGEST_LENGTH));
-	}
-}
-END_TEST
-
 START_TEST(test_bytes_to_md5str)
 {
-	hexmap_init();
 	FOREACH(m)
 	{
 		const char *str;
@@ -67,125 +39,6 @@ START_TEST(test_bytes_to_md5str)
 }
 END_TEST
 
-struct savepathdata
-{
-        const char *str;
-	uint64_t bytes;
-};
-
-static struct savepathdata ssavepath[] = {
-	{ "0011/2233/4455", 0x0011223344550000 },
-	{ "0000/0000/0000", 0x0000000000000000 },
-	{ "0000/0000/0001", 0x0000000000010000 },
-	{ "FFFF/FFFF/FFFF", 0xFFFFFFFFFFFF0000 }
-};
-static struct savepathdata ssavepathsig[] = {
-	{ "0000/0000/0000/0000", 0x0000000000000000 },
-	{ "0000/0000/0000/0001", 0x0000000000000001 },
-	{ "0011/2233/4455/6789", 0x0011223344556789 },
-	{ "AA00/BB11/CC22/DD33", 0xAA00BB11CC22DD33 },
-	{ "FFFF/FFFF/FFFF/FFFF", 0xFFFFFFFFFFFFFFFF }
-};
-
-static void do_savepath_str_to_uint64(struct savepathdata *d, size_t s)
-{
-	size_t i;
-	uint64_t bytes;
-	for(i=0; i<s; i++)
-	{
-		bytes=savepathstr_with_sig_to_uint64(d[i].str);
-		fail_unless(bytes==d[i].bytes);
-	}
-}
-
-START_TEST(test_savepathstr_to_uint64)
-{
-	hexmap_init();
-	do_savepath_str_to_uint64(ssavepathsig,
-		sizeof(ssavepathsig)/sizeof(*ssavepathsig));
-}
-END_TEST
-
-START_TEST(test_uint64_to_savepathstr)
-{
-	hexmap_init();
-	FOREACH(ssavepath)
-	{
-		const char *str;
-		str=uint64_to_savepathstr(ssavepath[i].bytes);
-		fail_unless(!strcmp(ssavepath[i].str, str));
-	}
-}
-END_TEST
-
-START_TEST(test_uint64_to_savepathstr_with_sig)
-{
-	hexmap_init();
-	FOREACH(ssavepathsig)
-	{
-		const char *str;
-		str=uint64_to_savepathstr_with_sig(ssavepathsig[i].bytes);
-		fail_unless(!strcmp(ssavepathsig[i].str, str));
-	}
-}
-END_TEST
-
-struct savepathdatauint
-{
-        const char *str;
-	uint64_t bytes;
-	uint16_t datno;
-};
-
-static struct savepathdatauint ssavepathsiguint[] = {
-	{ "0000/0000/0000", 0x0000000000000000, 0x0000 },
-	{ "0000/0000/0000", 0x0000000000000001, 0x0001 },
-	{ "0011/2233/4455", 0x0011223344556789, 0x6789 },
-	{ "AA00/BB11/CC22", 0xAA00BB11CC22DD33, 0xDD33 },
-	{ "FFFF/FFFF/FFFF", 0xFFFFFFFFFFFFFFFF, 0xFFFF }
-};
-
-START_TEST(test_uint64_to_savepathstr_with_sig_uint)
-{
-	hexmap_init();
-	FOREACH(ssavepathsiguint)
-	{
-		const char *str;
-		uint16_t datno;
-		str=uint64_to_savepathstr_with_sig_uint(
-			ssavepathsiguint[i].bytes, &datno);
-		fail_unless(!strcmp(ssavepathsiguint[i].str, str));
-		fail_unless(ssavepathsiguint[i].datno==datno);
-	}
-}
-END_TEST
-
-struct savepathhashkey
-{
-	uint64_t bytes;
-	uint64_t hash_key;
-};
-
-static struct savepathhashkey savepathhashkey[] = {
-	{ 0x0000000000000000, 0x0000000000000000 },
-	{ 0xABD234F2348349DF, 0xABD234F234830000 },
-	{ 0x0123179123909822, 0x0123179123900000 },
-	{ 0xFFFFFFFFFFFF0000, 0xFFFFFFFFFFFF0000 },
-	{ 0xFFFFFFFFFFFFFFFF, 0xFFFFFFFFFFFF0000 },
-};
-
-START_TEST(test_uint64_to_savepath_hash_key)
-{
-	hexmap_init();
-	FOREACH(savepathhashkey)
-	{
-		uint64_t hash_key;
-		hash_key=uint64_to_savepath_hash_key(savepathhashkey[i].bytes);
-		fail_unless(savepathhashkey[i].hash_key==hash_key);
-	}
-}
-END_TEST
-
 Suite *suite_hexmap(void)
 {
 	Suite *s;
@@ -195,14 +48,7 @@ Suite *suite_hexmap(void)
 
 	tc_core=tcase_create("Core");
 
-	tcase_add_test(tc_core, test_md5sum_of_empty_string);
-	tcase_add_test(tc_core, test_md5str_to_bytes);
 	tcase_add_test(tc_core, test_bytes_to_md5str);
-	tcase_add_test(tc_core, test_savepathstr_to_uint64);
-	tcase_add_test(tc_core, test_uint64_to_savepathstr);
-	tcase_add_test(tc_core, test_uint64_to_savepathstr_with_sig);
-	tcase_add_test(tc_core, test_uint64_to_savepathstr_with_sig_uint);
-	tcase_add_test(tc_core, test_uint64_to_savepath_hash_key);
 	suite_add_tcase(s, tc_core);
 
 	return s;