Skip to content

Commit 08aade7

Browse files
dschogitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 5ce5f5f commit 08aade7

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

common-main.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,8 @@ static void restore_sigpipe_to_default(void)
2222
signal(SIGPIPE, SIG_DFL);
2323
}
2424

25-
int main(int argc, char **av)
25+
int main(int argc, const char **argv)
2626
{
27-
/*
28-
* This const trickery is explained in
29-
* 84d32bf7678259c08406571cd6ce4b7a6724dcba
30-
*/
31-
const char **argv = (const char **)av;
32-
3327
/*
3428
* Always open file descriptors 0/1/2 to avoid clobbering files
3529
* in die(). It also avoids messing up when the pipes are dup'ed

compat/mingw.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ extern CRITICAL_SECTION pinfo_cs;
535535
void mingw_startup();
536536
#define main(c,v) dummy_decl_mingw_main(); \
537537
static int mingw_main(c,v); \
538-
int main(int argc, char **argv) \
538+
int main(int argc, const char **argv) \
539539
{ \
540540
mingw_startup(); \
541541
return mingw_main(__argc, (void *)__argv); \

0 commit comments

Comments
 (0)