summaryrefslogtreecommitdiff
path: root/common-main.c
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2016-07-01 13:01:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-07-06 15:11:47 (GMT)
commit08aade7080ef7955eb356c6590187be3b55dcbcd (patch)
treea3bfa54e4001651f1822fb3aab894a4ed186b7ea /common-main.c
parent5ce5f5fa5ad3de3c36fdd00df2d5c045ad1d7f04 (diff)
downloadgit-08aade7080ef7955eb356c6590187be3b55dcbcd.zip
git-08aade7080ef7955eb356c6590187be3b55dcbcd.tar.gz
git-08aade7080ef7955eb356c6590187be3b55dcbcd.tar.bz2
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>
Diffstat (limited to 'common-main.c')
-rw-r--r--common-main.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/common-main.c b/common-main.c
index 3be5ad1..44a29e8 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.