mingw: declare main()'s argv as const
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>
Johannes Schindelin committed
Jul 1, 2016 at 15:01 UTC
08aade7080ef7955eb356c6590187be3b55dcbcd
2 files changed
+2
-8
common-main.c
+1
-7
@@ -22,14 +22,8 @@ static void restore_sigpipe_to_default(void)
22
signal(SIGPIPE, SIG_DFL);
23
}
24
25
-int main(int argc, char **av)
25
+int main(int argc, const char **argv)
26
{
27
- /*
28
- * This const trickery is explained in
29
- * 84d32bf7678259c08406571cd6ce4b7a6724dcba
30
- */
31
- const char **argv = (const char **)av;
32
-
27
/*
28
* Always open file descriptors 0/1/2 to avoid clobbering files
29
* in die(). It also avoids messing up when the pipes are dup'ed
compat/mingw.h
+1
-1
@@ -535,7 +535,7 @@ extern CRITICAL_SECTION pinfo_cs;
535
void mingw_startup();
536
#define main(c,v) dummy_decl_mingw_main(); \
537
static int mingw_main(c,v); \
538
-int main(int argc, char **argv) \
538
+int main(int argc, const char **argv) \
539
{ \
540
mingw_startup(); \
541
return mingw_main(__argc, (void *)__argv); \