nostrdb: port everything over to be in as sync as possible

for now

nostrdb/hex.h

@@ -1,84 +1,68 @@
-/* CC0 (Public domain) - see LICENSE file for details */
-#ifndef CCAN_HEX_H
-#define CCAN_HEX_H
-#include "config.h"
-#include <stdbool.h>
+
+#ifndef HEX_H
+#define HEX_H
+
 #include <stdlib.h>
 
-/**
- * hex_decode - Unpack a hex string.
- * @str: the hexadecimal string
- * @slen: the length of @str
- * @buf: the buffer to write the data into
- * @bufsize: the length of
- *
- * Returns false if there are any characters which aren't 0-9, a-f or A-F,
- * of the string wasn't the right length for @bufsize.
- *
- * Example:
- *    unsigned char data[20];
- *
- *    if (!hex_decode(argv[1], strlen(argv[1]), data, 20))
- *        printf("String is malformed!\n");
- */
-bool hex_decode(const char *str, size_t slen, void *buf, size_t bufsize);
+static const char hex_table[256] = {
+    ['0'] = 0, ['1'] = 1, ['2'] = 2, ['3'] = 3,
+    ['4'] = 4, ['5'] = 5, ['6'] = 6, ['7'] = 7,
+    ['8'] = 8, ['9'] = 9, ['a'] = 10, ['b'] = 11,
+    ['c'] = 12, ['d'] = 13, ['e'] = 14, ['f'] = 15,
+    ['A'] = 10, ['B'] = 11, ['C'] = 12, ['D'] = 13,
+    ['E'] = 14, ['F'] = 15
+};
 
-/**
- * hex_encode - Create a nul-terminated hex string
- * @buf: the buffer to read the data from
- * @bufsize: the length of buf
- * @dest: the string to fill
- * @destsize: the max size of the string
- *
- * Returns true if the string, including terminator, fit in @destsize;
- *
- * Example:
- *    unsigned char buf[] = { 0x1F, 0x2F };
- *    char str[5];
- *
- *    if (!hex_encode(buf, sizeof(buf), str, sizeof(str)))
- *        abort();
- */
-bool hex_encode(const void *buf, size_t bufsize, char *dest, size_t destsize);
-
-/**
- * hex_str_size - Calculate how big a nul-terminated hex string is
- * @bytes: bytes of data to represent
- *
- * Example:
- *    unsigned char buf[] = { 0x1F, 0x2F };
- *    char str[hex_str_size(sizeof(buf))];
- *
- *    hex_encode(buf, sizeof(buf), str, sizeof(str));
- */
-static inline size_t hex_str_size(size_t bytes)
+static inline int char_to_hex(unsigned char *val, unsigned char c)
 {
-    return 2 * bytes + 1;
+	if (hex_table[c] || c == '0') {
+		*val = hex_table[c];
+		return 1;
+	}
+	return 0;
 }
 
-/**
- * hex_data_size - Calculate how many bytes of data in a hex string
- * @strlen: the length of the string (with or without NUL)
- *
- * Example:
- *    const char str[] = "1F2F";
- *    unsigned char buf[hex_data_size(sizeof(str))];
- *
- *    hex_decode(str, strlen(str), buf, sizeof(buf));
- */
-static inline size_t hex_data_size(size_t strlen)
+static inline int hex_decode(const char *str, size_t slen, void *buf, size_t bufsize)
 {
-    return strlen / 2;
+	unsigned char v1, v2;
+	unsigned char *p = buf;
+
+	while (slen > 1) {
+		if (!char_to_hex(&v1, str[0]) || !char_to_hex(&v2, str[1]))
+			return 0;
+		if (!bufsize)
+			return 0;
+		*(p++) = (v1 << 4) | v2;
+		str += 2;
+		slen -= 2;
+		bufsize--;
+	}
+	return slen == 0 && bufsize == 0;
 }
 
+
 static inline char hexchar(unsigned int val)
 {
-    if (val < 10)
-        return '0' + val;
-    if (val < 16)
-        return 'a' + val - 10;
-    abort();
+	if (val < 10)
+		return '0' + val;
+	if (val < 16)
+		return 'a' + val - 10;
+	abort();
+}
+
+static int hex_encode(const void *buf, size_t bufsize, char *dest)
+{
+	size_t i;
+
+	for (i = 0; i < bufsize; i++) {
+		unsigned int c = ((const unsigned char *)buf)[i];
+		*(dest++) = hexchar(c >> 4);
+		*(dest++) = hexchar(c & 0xF);
+	}
+	*dest = '\0';
+
+	return 1;
 }
 
 
-#endif /* CCAN_HEX_H */
+#endif