diff options
| author | Eric Sunshine <sunshine@sunshineco.com> | 2014-09-21 05:13:58 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-22 13:46:43 -0700 |
| commit | 85de86a16bd853708658eb13689d913bc377ae3e (patch) | |
| tree | 117cad9a185c2229d5b03fa597d554629533c17e /builtin/mailinfo.c | |
| parent | 2da1f36671c3e3e28eba6a56d92249b6671c07d3 (diff) | |
| download | git-85de86a16bd853708658eb13689d913bc377ae3e.tar.gz | |
mailinfo: work around -Wstring-plus-int warningjk/mbox-from-line
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 <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/mailinfo.c')
| -rw-r--r-- | builtin/mailinfo.c | 3 |
1 files changed, 2 insertions, 1 deletions
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)) |