From: Christian Couder Date: Wed, 11 May 2016 13:16:17 GMT Subject: [PATCH v2 06/94] builtin/apply: move 'options' variable into cmd_apply() Message-ID: <20160511131745.2914-7-chriscool@tuxfamily.org> In-Reply-To: <20160511131745.2914-1-chriscool@tuxfamily.org> The 'options' variable doesn't need to be static and global to the file. It can be local to cmd_apply(), so let's move it there. This will make it easier to libify the apply functionality. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/apply.c b/builtin/apply.c index 7bab466..5a1d65a 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -79,7 +79,6 @@ static enum ws_ignore { static const char *patch_input_file; static struct strbuf root = STRBUF_INIT; static int read_stdin = 1; -static int options; static void parse_whitespace_option(const char *option) { @@ -4517,6 +4516,7 @@ int cmd_apply(int argc, const char **argv, const char *prefix_) int errs = 0; int is_not_gitdir = !startup_info->have_repository; int force_apply = 0; + int options = 0; const char *whitespace_option = NULL; -- 2.8.2.490.g3dabe57