commit 958a8a84b5c4e6d1ab262c01ece70f2ca5f4db3b
parent 43efda619f814bff0f3ab3bd89a65ca0cb792d79
Author: Rusty Russell <rusty@rustcorp.com.au>
Date: Sun, 18 Aug 2024 11:28:37 +0930
Makefile: fix missing dependencies on bolt11 headers.
I wondered by `make check` was giving strange errors, until I realized it wasn't fully rebuilding.
Also, remove leftover CCAN files I missed previously.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat:
3 files changed, 2 insertions(+), 259 deletions(-)
diff --git a/Makefile b/Makefile
@@ -1,7 +1,8 @@
CFLAGS = -Wall -Wno-misleading-indentation -Wno-unused-function -Werror -O2 -g -Isrc -Ideps/secp256k1/include -Ideps/lmdb -Ideps/flatcc/include -Isrc/bolt11/ -Iccan/ -DCCAN_TAL_NEVER_RETURN_NULL=1
+BOLT11_HDRS := src/bolt11/amount.h src/bolt11/bech32.h src/bolt11/bech32_util.h src/bolt11/bolt11.h src/bolt11/debug.h src/bolt11/error.h src/bolt11/hash_u5.h src/bolt11/node_id.h src/bolt11/overflows.h
CCAN_SRCS := ccan/ccan/utf8/utf8.c ccan/ccan/tal/tal.c ccan/ccan/tal/str/str.c ccan/ccan/list/list.c ccan/ccan/mem/mem.c ccan/ccan/crypto/sha256/sha256.c ccan/ccan/take/take.c
CCAN_HDRS := ccan/ccan/utf8/utf8.h ccan/ccan/container_of/container_of.h ccan/ccan/check_type/check_type.h ccan/ccan/str/str.h ccan/ccan/tal/str/str.h ccan/ccan/tal/tal.h ccan/ccan/list/list.h ccan/ccan/structeq/structeq.h ccan/ccan/typesafe_cb/typesafe_cb.h ccan/ccan/short_types/short_types.h ccan/ccan/mem/mem.h ccan/ccan/likely/likely.h ccan/ccan/alignof/alignof.h ccan/ccan/crypto/sha256/sha256.h ccan/ccan/array_size/array_size.h ccan/ccan/endian/endian.h ccan/ccan/take/take.h ccan/ccan/build_assert/build_assert.h ccan/ccan/cppmagic/cppmagic.h
-HEADERS = deps/lmdb/lmdb.h deps/secp256k1/include/secp256k1.h src/nostrdb.h src/cursor.h src/hex.h src/jsmn.h src/config.h src/random.h src/memchr.h src/cpu.h src/nostr_bech32.h src/block.h src/str_block.h $(C_BINDINGS) $(CCAN_HDRS)
+HEADERS = deps/lmdb/lmdb.h deps/secp256k1/include/secp256k1.h src/nostrdb.h src/cursor.h src/hex.h src/jsmn.h src/config.h src/random.h src/memchr.h src/cpu.h src/nostr_bech32.h src/block.h src/str_block.h $(C_BINDINGS) $(CCAN_HDRS) $(BOLT11_HDRS)
FLATCC_SRCS=deps/flatcc/src/runtime/json_parser.c deps/flatcc/src/runtime/verifier.c deps/flatcc/src/runtime/builder.c deps/flatcc/src/runtime/emitter.c deps/flatcc/src/runtime/refmap.c
BOLT11_SRCS = src/bolt11/bolt11.c src/bolt11/bech32.c src/bolt11/amount.c src/bolt11/hash_u5.c
SRCS = src/nostrdb.c src/invoice.c src/nostr_bech32.c src/content_parser.c src/block.c $(BOLT11_SRCS) $(FLATCC_SRCS) $(CCAN_SRCS)
diff --git a/src/bolt11/str.h b/src/bolt11/str.h
@@ -1,228 +0,0 @@
-/* CC0 (Public domain) - see LICENSE file for details */
-#ifndef CCAN_STR_H
-#define CCAN_STR_H
-#include "../config.h"
-#include <string.h>
-#include <stdbool.h>
-#include <limits.h>
-#include <ctype.h>
-
-/**
- * streq - Are two strings equal?
- * @a: first string
- * @b: first string
- *
- * This macro is arguably more readable than "!strcmp(a, b)".
- *
- * Example:
- * if (streq(somestring, ""))
- * printf("String is empty!\n");
- */
-#define streq(a,b) (strcmp((a),(b)) == 0)
-
-/**
- * strstarts - Does this string start with this prefix?
- * @str: string to test
- * @prefix: prefix to look for at start of str
- *
- * Example:
- * if (strstarts(somestring, "foo"))
- * printf("String %s begins with 'foo'!\n", somestring);
- */
-#define strstarts(str,prefix) (strncmp((str),(prefix),strlen(prefix)) == 0)
-
-/**
- * strends - Does this string end with this postfix?
- * @str: string to test
- * @postfix: postfix to look for at end of str
- *
- * Example:
- * if (strends(somestring, "foo"))
- * printf("String %s end with 'foo'!\n", somestring);
- */
-static inline bool strends(const char *str, const char *postfix)
-{
- if (strlen(str) < strlen(postfix))
- return false;
-
- return streq(str + strlen(str) - strlen(postfix), postfix);
-}
-
-/**
- * stringify - Turn expression into a string literal
- * @expr: any C expression
- *
- * Example:
- * #define PRINT_COND_IF_FALSE(cond) \
- * ((cond) || printf("%s is false!", stringify(cond)))
- */
-#define stringify(expr) stringify_1(expr)
-/* Double-indirection required to stringify expansions */
-#define stringify_1(expr) #expr
-
-/**
- * strcount - Count number of (non-overlapping) occurrences of a substring.
- * @haystack: a C string
- * @needle: a substring
- *
- * Example:
- * assert(strcount("aaa aaa", "a") == 6);
- * assert(strcount("aaa aaa", "ab") == 0);
- * assert(strcount("aaa aaa", "aa") == 2);
- */
-size_t strcount(const char *haystack, const char *needle);
-
-/**
- * STR_MAX_CHARS - Maximum possible size of numeric string for this type.
- * @type_or_expr: a pointer or integer type or expression.
- *
- * This provides enough space for a nul-terminated string which represents the
- * largest possible value for the type or expression.
- *
- * Note: The implementation adds extra space so hex values or negative
- * values will fit (eg. sprintf(... "%p"). )
- *
- * Example:
- * char str[STR_MAX_CHARS(int)];
- *
- * sprintf(str, "%i", 7);
- */
-#define STR_MAX_CHARS(type_or_expr) \
- ((sizeof(type_or_expr) * CHAR_BIT + 8) / 9 * 3 + 2 \
- + STR_MAX_CHARS_TCHECK_(type_or_expr))
-
-#if HAVE_TYPEOF
-/* Only a simple type can have 0 assigned, so test that. */
-#define STR_MAX_CHARS_TCHECK_(type_or_expr) \
- (sizeof(({ typeof(type_or_expr) x = 0; x; }))*0)
-#else
-#define STR_MAX_CHARS_TCHECK_(type_or_expr) 0
-#endif
-
-/**
- * cisalnum - isalnum() which takes a char (and doesn't accept EOF)
- * @c: a character
- *
- * Surprisingly, the standard ctype.h isalnum() takes an int, which
- * must have the value of EOF (-1) or an unsigned char. This variant
- * takes a real char, and doesn't accept EOF.
- */
-static inline bool cisalnum(char c)
-{
- return isalnum((unsigned char)c);
-}
-static inline bool cisalpha(char c)
-{
- return isalpha((unsigned char)c);
-}
-static inline bool cisascii(char c)
-{
- return isascii((unsigned char)c);
-}
-#if HAVE_ISBLANK
-static inline bool cisblank(char c)
-{
- return isblank((unsigned char)c);
-}
-#endif
-static inline bool ciscntrl(char c)
-{
- return iscntrl((unsigned char)c);
-}
-static inline bool cisdigit(char c)
-{
- return isdigit((unsigned char)c);
-}
-static inline bool cisgraph(char c)
-{
- return isgraph((unsigned char)c);
-}
-static inline bool cislower(char c)
-{
- return islower((unsigned char)c);
-}
-static inline bool cisprint(char c)
-{
- return isprint((unsigned char)c);
-}
-static inline bool cispunct(char c)
-{
- return ispunct((unsigned char)c);
-}
-static inline bool cisspace(char c)
-{
- return isspace((unsigned char)c);
-}
-static inline bool cisupper(char c)
-{
- return isupper((unsigned char)c);
-}
-static inline bool cisxdigit(char c)
-{
- return isxdigit((unsigned char)c);
-}
-
-#include "str_debug.h"
-
-/* These checks force things out of line, hence they are under DEBUG. */
-#ifdef CCAN_STR_DEBUG
-#include <ccan/build_assert/build_assert.h>
-
-/* These are commonly misused: they take -1 or an *unsigned* char value. */
-#undef isalnum
-#undef isalpha
-#undef isascii
-#undef isblank
-#undef iscntrl
-#undef isdigit
-#undef isgraph
-#undef islower
-#undef isprint
-#undef ispunct
-#undef isspace
-#undef isupper
-#undef isxdigit
-
-/* You can use a char if char is unsigned. */
-#if HAVE_BUILTIN_TYPES_COMPATIBLE_P && HAVE_TYPEOF
-#define str_check_arg_(i) \
- ((i) + BUILD_ASSERT_OR_ZERO(!__builtin_types_compatible_p(typeof(i), \
- char) \
- || (char)255 > 0))
-#else
-#define str_check_arg_(i) (i)
-#endif
-
-#define isalnum(i) str_isalnum(str_check_arg_(i))
-#define isalpha(i) str_isalpha(str_check_arg_(i))
-#define isascii(i) str_isascii(str_check_arg_(i))
-#if HAVE_ISBLANK
-#define isblank(i) str_isblank(str_check_arg_(i))
-#endif
-#define iscntrl(i) str_iscntrl(str_check_arg_(i))
-#define isdigit(i) str_isdigit(str_check_arg_(i))
-#define isgraph(i) str_isgraph(str_check_arg_(i))
-#define islower(i) str_islower(str_check_arg_(i))
-#define isprint(i) str_isprint(str_check_arg_(i))
-#define ispunct(i) str_ispunct(str_check_arg_(i))
-#define isspace(i) str_isspace(str_check_arg_(i))
-#define isupper(i) str_isupper(str_check_arg_(i))
-#define isxdigit(i) str_isxdigit(str_check_arg_(i))
-
-#if HAVE_TYPEOF
-/* With GNU magic, we can make const-respecting standard string functions. */
-#undef strstr
-#undef strchr
-#undef strrchr
-
-/* + 0 is needed to decay array into pointer. */
-#define strstr(haystack, needle) \
- ((typeof((haystack) + 0))str_strstr((haystack), (needle)))
-#define strchr(haystack, c) \
- ((typeof((haystack) + 0))str_strchr((haystack), (c)))
-#define strrchr(haystack, c) \
- ((typeof((haystack) + 0))str_strrchr((haystack), (c)))
-#endif
-#endif /* CCAN_STR_DEBUG */
-
-#endif /* CCAN_STR_H */
diff --git a/src/bolt11/str_debug.h b/src/bolt11/str_debug.h
@@ -1,30 +0,0 @@
-/* CC0 (Public domain) - see LICENSE file for details */
-#ifndef CCAN_STR_DEBUG_H
-#define CCAN_STR_DEBUG_H
-
-/* #define CCAN_STR_DEBUG 1 */
-
-#ifdef CCAN_STR_DEBUG
-/* Because we mug the real ones with macros, we need our own wrappers. */
-int str_isalnum(int i);
-int str_isalpha(int i);
-int str_isascii(int i);
-#if HAVE_ISBLANK
-int str_isblank(int i);
-#endif
-int str_iscntrl(int i);
-int str_isdigit(int i);
-int str_isgraph(int i);
-int str_islower(int i);
-int str_isprint(int i);
-int str_ispunct(int i);
-int str_isspace(int i);
-int str_isupper(int i);
-int str_isxdigit(int i);
-
-char *str_strstr(const char *haystack, const char *needle);
-char *str_strchr(const char *s, int c);
-char *str_strrchr(const char *s, int c);
-#endif /* CCAN_STR_DEBUG */
-
-#endif /* CCAN_STR_DEBUG_H */
