diff options
author | Ramsay Jones <ramsay@ramsay1.demon.co.uk> | 2013-04-27 23:19:47 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-04-28 23:32:08 +0400 |
commit | 84d32bf7678259c08406571cd6ce4b7a6724dcba (patch) | |
tree | d358d8b783ee5b18644d4d17a5c085369a23827c /compat/mingw.h | |
parent | 657b35f4bef7d25831607882ed7f1f2ced378eb7 (diff) |
sparse: Fix mingw_main() argument number/type errors
Sparse issues 68 errors (two errors for each main() function) such
as the following:
SP git.c
git.c:510:5: error: too many arguments for function mingw_main
git.c:510:5: error: symbol 'mingw_main' redeclared with different type \
(originally declared at git.c:510) - different argument counts
The errors are caused by the 'main' macro used by the MinGW build
to provide a replacement main() function. The original main function
is effectively renamed to 'mingw_main' and is called from the new
main function. The replacement main is used to execute certain actions
common to all git programs on MinGW (e.g. ensure the standard I/O
streams are in binary mode).
In order to suppress the errors, we change the macro to include the
parameters in the declaration of the mingw_main function.
Unfortunately, this change provokes both sparse and gcc to complain
about 9 calls to mingw_main(), such as the following:
CC git.o
git.c: In function 'main':
git.c:510: warning: passing argument 2 of 'mingw_main' from \
incompatible pointer type
git.c:510: note: expected 'const char **' but argument is of \
type 'char **'
In order to suppress these warnings, since both of the main
functions need to be declared with the same prototype, we
change the declaration of the 9 main functions, thus:
int main(int argc, char **argv)
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat/mingw.h')
-rw-r--r-- | compat/mingw.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compat/mingw.h b/compat/mingw.h index 3036980ca2..bd0a88bc1d 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -346,8 +346,8 @@ extern CRITICAL_SECTION pinfo_cs; */ #define main(c,v) dummy_decl_mingw_main(); \ -static int mingw_main(); \ -int main(int argc, const char **argv) \ +static int mingw_main(c,v); \ +int main(int argc, char **argv) \ { \ extern CRITICAL_SECTION pinfo_cs; \ _fmode = _O_BINARY; \ |