From 6a35bf6ca051f07edf0044278a1bf71b88111320 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Sat, 8 Oct 2016 09:58:08 +0300 Subject: Silenced compiler warnings. --- Modules/getpath.c | 8 +++----- Modules/socketmodule.c | 8 ++++---- Objects/codeobject.c | 1 - Parser/pgen.c | 5 +++-- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Modules/getpath.c b/Modules/getpath.c index b239159..18b161c 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -329,11 +329,9 @@ search_for_exec_prefix(char *argv0_path, char *home) n = fread(rel_builddir_path, 1, MAXPATHLEN, f); rel_builddir_path[n] = '\0'; fclose(f); - if (n >= 0) { - strcpy(exec_prefix, argv0_path); - joinpath(exec_prefix, rel_builddir_path); - return -1; - } + strcpy(exec_prefix, argv0_path); + joinpath(exec_prefix, rel_builddir_path); + return -1; } } diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index c046178..75e07c1 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -3472,7 +3472,7 @@ socket_gethostbyname_ex(PyObject *self, PyObject *args) int buf_len = (sizeof buf) - 1; int errnop; #endif -#if defined(HAVE_GETHOSTBYNAME_R_3_ARG) || defined(HAVE_GETHOSTBYNAME_R_6_ARG) +#ifdef HAVE_GETHOSTBYNAME_R_3_ARG int result; #endif #endif /* HAVE_GETHOSTBYNAME_R */ @@ -3484,7 +3484,7 @@ socket_gethostbyname_ex(PyObject *self, PyObject *args) Py_BEGIN_ALLOW_THREADS #ifdef HAVE_GETHOSTBYNAME_R #if defined(HAVE_GETHOSTBYNAME_R_6_ARG) - result = gethostbyname_r(name, &hp_allocated, buf, buf_len, + gethostbyname_r(name, &hp_allocated, buf, buf_len, &h, &errnop); #elif defined(HAVE_GETHOSTBYNAME_R_5_ARG) h = gethostbyname_r(name, &hp_allocated, buf, buf_len, &errnop); @@ -3548,7 +3548,7 @@ socket_gethostbyaddr(PyObject *self, PyObject *args) int buf_len = (sizeof buf) - 1; int errnop; #endif -#if defined(HAVE_GETHOSTBYNAME_R_3_ARG) || defined(HAVE_GETHOSTBYNAME_R_6_ARG) +#ifdef HAVE_GETHOSTBYNAME_R_3_ARG int result; #endif #endif /* HAVE_GETHOSTBYNAME_R */ @@ -3581,7 +3581,7 @@ socket_gethostbyaddr(PyObject *self, PyObject *args) Py_BEGIN_ALLOW_THREADS #ifdef HAVE_GETHOSTBYNAME_R #if defined(HAVE_GETHOSTBYNAME_R_6_ARG) - result = gethostbyaddr_r(ap, al, af, + gethostbyaddr_r(ap, al, af, &hp_allocated, buf, buf_len, &h, &errnop); #elif defined(HAVE_GETHOSTBYNAME_R_5_ARG) diff --git a/Objects/codeobject.c b/Objects/codeobject.c index b7c4059..79ac1b5 100644 --- a/Objects/codeobject.c +++ b/Objects/codeobject.c @@ -95,7 +95,6 @@ PyCode_New(int argcount, int nlocals, int stacksize, int flags, PyObject *lnotab) { PyCodeObject *co; - Py_ssize_t i; /* Check argument types */ if (argcount < 0 || nlocals < 0 || code == NULL || diff --git a/Parser/pgen.c b/Parser/pgen.c index b2f8470..f3031ae 100644 --- a/Parser/pgen.c +++ b/Parser/pgen.c @@ -136,11 +136,12 @@ addnfa(nfagrammar *gr, char *name) static char REQNFMT[] = "metacompile: less than %d children\n"; -#define REQN(i, count) \ +#define REQN(i, count) do { \ if (i < count) { \ fprintf(stderr, REQNFMT, count); \ Py_FatalError("REQN"); \ - } else + } \ +} while (0) #else #define REQN(i, count) /* empty */ -- cgit v0.12