@matheusbsbs / matheus-bagliano / commits / 657b35f4be

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>

Ramsay Jones committed Apr 27, 2013 at 20:18 UTC 657b35f4bef7d25831607882ed7f1f2ced378eb7

2 files changed +10 -3

compat/mingw.c

+3 -3

@@ -841,8 +841,8 @@ struct pinfo_t {

841 struct pinfo_t *next;

842 pid_t pid;

843 HANDLE proc;

844 -} pinfo_t;

845 -struct pinfo_t *pinfo = NULL;

844 +};

845 +static struct pinfo_t *pinfo = NULL;

846 CRITICAL_SECTION pinfo_cs;

847

848 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,

1253 else

1254 sin->sin_addr.s_addr = INADDR_LOOPBACK;

1255 ai->ai_addr = (struct sockaddr *)sin;

1256 - ai->ai_next = 0;

1256 + ai->ai_next = NULL;

1257 return 0;

1258 }

1259

compat/mingw.h

@@ -333,6 +333,13 @@ void mingw_open_html(const char *path);

333 char **make_augmented_environ(const char *const *vars);

334 void free_environ(char **env);

335

336 +/*

337 + * A critical section used in the implementation of the spawn

338 + * functions (mingw_spawnv[p]e()) and waitpid(). Intialised in

339 + * the replacement main() macro below.

340 + */

341 +extern CRITICAL_SECTION pinfo_cs;

342 +

343 /*

344 * A replacement of main() that ensures that argv[0] has a path

345 * and that default fmode and std(in|out|err) are in binary mode