Commit dddaaab62 ("apply: convert root string to strbuf", 24-09-2015) converted a <char *str, int len> combination of variables into a single 'struct strbuf' variable. In doing so, it unintentionally increased the visibility of the variable. In order to reduce the visibility to file local, add the static keyword to the declaration of the 'root' symbol. Signed-off-by: Ramsay Jones <ramsay@xxxxxxxxxxxxxxxxxxxx> --- Hi Jeff, If you need to re-roll your 'jk/war-on-sprintf' series, could you please squash this into the relevant patch. Thanks! ATB, Ramsay Jones builtin/apply.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/apply.c b/builtin/apply.c index 5dc908a..ec49658 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -77,7 +77,7 @@ static enum ws_ignore { static const char *patch_input_file; -struct strbuf root = STRBUF_INIT; +static struct strbuf root = STRBUF_INIT; static int read_stdin = 1; static int options; -- 2.5.0 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html