From: John Keeping Date: Sun, 03 Feb 2013 14:37:10 GMT Subject: [PATCH 2/3] combine-diff: suppress a clang warning Message-ID: <6995fd5e4d9cb3320ab80c983f1b25ae8a399284.1359901732.git.john@keeping.me.uk> In-Reply-To: When compiling combine-diff.c, clang 3.2 says: combine-diff.c:1006:19: warning: adding 'int' to a string does not append to the string [-Wstring-plus-int] prefix = COLONS + offset; ~~~~~~~^~~~~~~~ combine-diff.c:1006:19: note: use array indexing to silence this warning prefix = COLONS + offset; ^ & [ ] Suppress this by making the suggested change. Signed-off-by: John Keeping --- combine-diff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/combine-diff.c b/combine-diff.c index bb1cc96..dba4748 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -1003,7 +1003,7 @@ static void show_raw_diff(struct combine_diff_path *p, int num_parent, struct re offset = strlen(COLONS) - num_parent; if (offset < 0) offset = 0; - prefix = COLONS + offset; + prefix = &COLONS[offset]; /* Show the modes */ for (i = 0; i < num_parent; i++) { -- 1.8.1.2