From 0845e79650c9257aa0ddef8ff99fd815b5edffac Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Mon, 26 Sep 2011 20:13:07 +0930
Subject: [PATCH] str: fix warnings.
Firstly, -Wwrite-strings makes string literals const, secondly, we mustn't
define str_strstr etc in terms of themselves!
---
ccan/str/debug.c | 3 +++
ccan/str/test/run.c | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/ccan/str/debug.c b/ccan/str/debug.c
index 9ef75676..027915bc 100644
--- a/ccan/str/debug.c
+++ b/ccan/str/debug.c
@@ -86,6 +86,9 @@ int str_isxdigit(int i)
return isxdigit(i);
}
+#undef strstr
+#undef strchr
+#undef strrchr
char *str_strstr(const char *haystack, const char *needle)
{
diff --git a/ccan/str/test/run.c b/ccan/str/test/run.c
index 3ccadbe5..0f00ea32 100644
--- a/ccan/str/test/run.c
+++ b/ccan/str/test/run.c
@@ -6,7 +6,8 @@
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
-static char *substrings[] = { "far", "bar", "baz", "b", "ba", "z", "ar", NULL };
+static const char *substrings[] = { "far", "bar", "baz", "b", "ba", "z", "ar",
+ NULL };
#define NUM_SUBSTRINGS (ARRAY_SIZE(substrings) - 1)
--
2.30.9