[PATCH 2/3] combine-diff: suppress a clang warning
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 <john@keeping.me.uk>
---
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
John Keeping <john@keeping.me.uk>