diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2016-07-01 15:01:28 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-06 08:11:47 -0700 |
| commit | 08aade7080ef7955eb356c6590187be3b55dcbcd (patch) | |
| tree | a3bfa54e4001651f1822fb3aab894a4ed186b7ea | |
| parent | 5ce5f5fa5ad3de3c36fdd00df2d5c045ad1d7f04 (diff) | |
| download | git-jk/common-main-2.8.tar.gz | |
mingw: declare main()'s argv as constjk/common-main-2.8
In 84d32bf (sparse: Fix mingw_main() argument number/type errors,
2013-04-27), we addressed problems identified by the 'sparse' tool where
argv was declared inconsistently. The way we addressed it was by casting
from the non-const version to the const-version.
This patch is long overdue, fixing compat/mingw.h's declaration to
make the "argv" parameter const. This also allows us to lose the
"const" trickery introduced earlier to common-main.c:main().
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | common-main.c | 8 | ||||
| -rw-r--r-- | compat/mingw.h | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/common-main.c b/common-main.c index 3be5ad18e1..44a29e8b13 100644 --- a/common-main.c +++ b/common-main.c @@ -22,15 +22,9 @@ static void restore_sigpipe_to_default(void) signal(SIGPIPE, SIG_DFL); } -int main(int argc, char **av) +int main(int argc, const char **argv) { /* - * This const trickery is explained in - * 84d32bf7678259c08406571cd6ce4b7a6724dcba - */ - const char **argv = (const char **)av; - - /* * Always open file descriptors 0/1/2 to avoid clobbering files * in die(). It also avoids messing up when the pipes are dup'ed * onto stdin/stdout/stderr in the child processes we spawn. diff --git a/compat/mingw.h b/compat/mingw.h index 69bb43dc35..1ac9086a82 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -535,7 +535,7 @@ extern CRITICAL_SECTION pinfo_cs; void mingw_startup(); #define main(c,v) dummy_decl_mingw_main(); \ static int mingw_main(c,v); \ -int main(int argc, char **argv) \ +int main(int argc, const char **argv) \ { \ mingw_startup(); \ return mingw_main(__argc, (void *)__argv); \ |