From: Eric Sunshine Date: Sun, 21 Sep 2014 09:13:58 +0000 (-0400) Subject: mailinfo: work around -Wstring-plus-int warning X-Git-Tag: v2.1.3~7^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=85de86a16bd853708658eb13689d913bc377ae3e;p=thirdparty%2Fgit.git mailinfo: work around -Wstring-plus-int warning 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 Signed-off-by: Junio C Hamano --- diff --git a/builtin/mailinfo.c b/builtin/mailinfo.c index 2632fb037a..6a14d2985d 100644 --- 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))