mailinfo: work around -Wstring-plus-int warning

sunshineco · gitster · commit 85de86a16bd8 · 2014-09-22T13:46:43.000-07:00
The just-released Apple Xcode 6.0.1 has -Wstring-plus-int enabled by
default which complains about pointer arithmetic applied to a string
literal:

    builtin/mailinfo.c:303:24: warning:
        adding 'long' to a string does not append to the string
            return !memcmp(SAMPLE + (cp - line), cp, strlen(SAMPLE) ...
                           ~~~~~~~^~~~~~~~~~~~~

Signed-off-by: Eric Sunshine &lt;sunshine@sunshineco.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/mailinfo.c b/builtin/mailinfo.c
@@ -288,9 +288,10 @@ static inline int cmp_header(const struct strbuf *line, const char *hdr)
 			line->buf[len] == ':' && isspace(line->buf[len + 1]);
 }
 
-#define SAMPLE "From e6807f3efca28b30decfecb1732a56c7db1137ee Mon Sep 17 00:00:00 2001\n"
 static int is_format_patch_separator(const char *line, int len)
 {
+	static const char SAMPLE[] =
+		"From e6807f3efca28b30decfecb1732a56c7db1137ee Mon Sep 17 00:00:00 2001\n";
 	const char *cp;
 
 	if (len != strlen(SAMPLE))

Original file line number	Diff line number	Diff line change
`@@ -288,9 +288,10 @@ static inline int cmp_header(const struct strbuf line, const char hdr)`
`288`	`288`	`line->buf[len] == ':' && isspace(line->buf[len + 1]);`
`289`	`289`	`}`
`290`	`290`
`291`		`-#define SAMPLE "From e6807f3efca28b30decfecb1732a56c7db1137ee Mon Sep 17 00:00:00 2001\n"`
`292`	`291`	`static int is_format_patch_separator(const char *line, int len)`
`293`	`292`	`{`
	`293`	`+ static const char SAMPLE[] =`
	`294`	`+ "From e6807f3efca28b30decfecb1732a56c7db1137ee Mon Sep 17 00:00:00 2001\n";`
`294`	`295`	`const char *cp;`
`295`	`296`
`296`	`297`	`if (len != strlen(SAMPLE))`