diff options
author | Ramsay Jones <ramsay@ramsay1.demon.co.uk> | 2013-04-27 20:18:55 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-04-28 12:27:11 -0700 |
commit | 657b35f4bef7d25831607882ed7f1f2ced378eb7 (patch) | |
tree | ad747527a0496834323cd6436dd5f05b1390bcef /compat/mingw.c | |
parent | 15b7f601fc976f7a112035fb0e91869eabe61c26 (diff) | |
download | git-657b35f4bef7d25831607882ed7f1f2ced378eb7.tar.gz git-657b35f4bef7d25831607882ed7f1f2ced378eb7.tar.xz |
compat/mingw.c: Fix some sparse warnings
Sparse issues the following warnings:
SP compat/mingw.c
compat/mingw.c:795:3: warning: symbol 'pinfo_t' was not declared. \
Should it be static?
compat/mingw.c:796:16: warning: symbol 'pinfo' was not declared. \
Should it be static?
compat/mingw.c:797:18: warning: symbol 'pinfo_cs' was not declared. \
Should it be static?
compat/mingw.c:1207:23: warning: Using plain integer as NULL pointer
In 'pinfo_t' variable, defined on line 795, seems to have been a
mistake (a missing typedef keyword?), so we simply remove it.
The 'pinfo' variable does not require more than file scope, so we
simply add the static modifier to the declaration.
The 'pinfo_cs' variable, in contrast, requires initialisation in the
mingw replacement main() function, so we add an extern declaration to
the compat/mingw.h header file.
The remaining warning is suppressed by replacing the rhs of the
pointer assignment with the NULL pointer literal.
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat/mingw.c')
-rw-r--r-- | compat/mingw.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compat/mingw.c b/compat/mingw.c index b67362558..b295e2f6a 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -841,8 +841,8 @@ struct pinfo_t { struct pinfo_t *next; pid_t pid; HANDLE proc; -} pinfo_t; -struct pinfo_t *pinfo = NULL; +}; +static struct pinfo_t *pinfo = NULL; CRITICAL_SECTION pinfo_cs; static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **env, @@ -1253,7 +1253,7 @@ static int WSAAPI getaddrinfo_stub(const char *node, const char *service, else sin->sin_addr.s_addr = INADDR_LOOPBACK; ai->ai_addr = (struct sockaddr *)sin; - ai->ai_next = 0; + ai->ai_next = NULL; return 0; } |