MAINT: remove a bunch of compiler warnings

juliantaylor · juliantaylor · commit c15f7747c78e · 2015-07-03T01:09:55.000+02:00
there is a memset warning remaining when built with -flto, though its
not clear where exactly it comes from.
diff --git a/numpy/core/code_generators/generate_ufunc_api.py b/numpy/core/code_generators/generate_ufunc_api.py
@@ -37,7 +37,7 @@
 
 %s
 
-static int
+static NPY_INLINE int
 _import_umath(void)
 {
   PyObject *numpy = PyImport_ImportModule("numpy.core.umath");
diff --git a/numpy/core/src/multiarray/compiled_base.c b/numpy/core/src/multiarray/compiled_base.c
@@ -1271,7 +1271,7 @@ arr_add_docstring(PyObject *NPY_UNUSED(dummy), PyObject *args)
     PyObject *str;
     char *docstr;
     static char *msg = "already has a docstring";
-    PyObject *tp_dict;
+    PyObject *tp_dict = PyArrayDescr_Type.tp_dict;
     PyObject *myobj;
     static PyTypeObject *PyMemberDescr_TypePtr = NULL;
     static PyTypeObject *PyGetSetDescr_TypePtr = NULL;
@@ -1283,7 +1283,6 @@ arr_add_docstring(PyObject *NPY_UNUSED(dummy), PyObject *args)
     }
 
     if (PyGetSetDescr_TypePtr == NULL) {
-        tp_dict = PyArrayDescr_Type.tp_dict;
         /* Get "subdescr" */
         myobj = PyDict_GetItemString(tp_dict, "fields");
         if (myobj != NULL) {
diff --git a/numpy/core/src/multiarray/conversion_utils.c b/numpy/core/src/multiarray/conversion_utils.c
@@ -903,6 +903,7 @@ PyArray_PyIntAsIntp_ErrMsg(PyObject *o, const char * msg)
         return -1;
     }
 
+    goto overflow_check; /* silence unused warning */
  overflow_check:
 #if (NPY_SIZEOF_LONG < NPY_SIZEOF_INTP)
   #if (NPY_SIZEOF_LONGLONG > NPY_SIZEOF_INTP)
diff --git a/numpy/core/src/multiarray/lowlevel_strided_loops.c.src b/numpy/core/src/multiarray/lowlevel_strided_loops.c.src
@@ -199,9 +199,11 @@ static NPY_GCC_OPT_3 void
                         npy_intp N, npy_intp NPY_UNUSED(src_itemsize),
                         NpyAuxData *NPY_UNUSED(data))
 {
-#  if @elsize@ != 16
+#if @elsize@ != 16
+#  if !(@elsize@ == 1 && @dst_contig@)
     @type@ temp;
-#  else
+#  endif
+#else
     npy_uint64 temp0, temp1;
 #endif
 #if @is_aligned@ && @elsize@ != 16
diff --git a/numpy/core/src/multiarray/mapping.c b/numpy/core/src/multiarray/mapping.c
@@ -1421,7 +1421,7 @@ array_subscript(PyArrayObject *self, PyObject *op)
 {
     int index_type;
     int index_num;
-    int i, ndim, fancy_ndim, fancy;
+    int i, ndim, fancy_ndim;
     /*
      * Index info array. We can have twice as many indices as dimensions
      * (because of None). The + 1 is to not need to check as much.
diff --git a/numpy/core/src/multiarray/multiarraymodule.c b/numpy/core/src/multiarray/multiarraymodule.c
@@ -2394,7 +2394,7 @@ array_matmul(PyObject *NPY_UNUSED(m), PyObject *args, PyObject* kwds)
         return NULL;
     }
 
-    errval = PyUFunc_CheckOverride(matmul, "__call__",
+    errval = PyUFunc_CheckOverride((PyUFuncObject*)matmul, "__call__",
                                    args, kwds, &override, 2);
     if (errval) {
         return NULL;
@@ -2512,7 +2512,7 @@ array_matmul(PyObject *NPY_UNUSED(m), PyObject *args, PyObject* kwds)
 
     /* If no output was supplied, possibly convert to a scalar */
     if (ret != NULL && out == NULL) {
-        ret = PyArray_Return((PyArrayObject *)ret);
+        return PyArray_Return((PyArrayObject *)ret);
     }
     return (PyObject *)ret;
 
diff --git a/numpy/core/src/multiarray/scalartypes.c.src b/numpy/core/src/multiarray/scalartypes.c.src
@@ -1701,7 +1701,7 @@ voidtype_setfield(PyVoidScalarObject *self, PyObject *args, PyObject *kwds)
     }
 
     /* 1. Convert to 0-d array and use getfield */
-    arr = PyArray_FromScalar(self, NULL);
+    arr = PyArray_FromScalar((PyObject*)self, NULL);
     if (arr == NULL) {
         Py_DECREF(getfield_args);
         return NULL;
diff --git a/numpy/core/src/multiarray/ucsnarrow.c b/numpy/core/src/multiarray/ucsnarrow.c
@@ -136,7 +136,8 @@ PyUnicode_FromUCS4(char *src, Py_ssize_t size, int swap, int align)
     /* produce PyUnicode object */
 #ifdef Py_UNICODE_WIDE
     {
-        ret = (PyUnicodeObject *)PyUnicode_FromUnicode(buf, (Py_ssize_t) ucs4len);
+        ret = (PyUnicodeObject *)PyUnicode_FromUnicode((Py_UNICODE*)buf,
+                                                       (Py_ssize_t) ucs4len);
         if (ret == NULL) {
             goto fail;
         }
diff --git a/numpy/core/src/npymath/npy_math_complex.c.src b/numpy/core/src/npymath/npy_math_complex.c.src
@@ -33,12 +33,13 @@
  */
 #include "npy_math_common.h"
 #include "npy_math_private.h"
+#include <numpy/utils.h>
 
 
 #define raise_inexact() do { volatile npy_float junk = 1 + tiny; } while(0)
 
 
-static npy_float tiny = 3.9443045e-31f;
+static __COMP_NPY_UNUSED npy_float tiny = 3.9443045e-31f;
 
 
 /**begin repeat
@@ -183,6 +184,8 @@ npy_carg@c@(@ctype@ z)
 #define SCALED_CEXP_LOWERL 11357.216553474703895L
 #define SCALED_CEXP_UPPERL 22756.021937783004509L
 
+#ifndef HAVE_CEXP@C@
+
 static
 @ctype@
 _npy_scaled_cexp@c@(@type@ x, @type@ y, npy_int expt)
@@ -209,7 +212,6 @@ _npy_scaled_cexp@c@(@type@ x, @type@ y, npy_int expt)
                          npy_ldexp@c@(mant * mantsin, expt + exsin));
 }
 
-#ifndef HAVE_CEXP@C@
 @ctype@
 npy_cexp@c@(@ctype@ z)
 {
diff --git a/numpy/core/src/umath/scalarmath.c.src b/numpy/core/src/umath/scalarmath.c.src
@@ -1417,7 +1417,7 @@ static PyObject *
  * #func = (PyLong_FromLongLong,  PyLong_FromUnsignedLongLong)*5,
  *         PyLong_FromDouble*7, PyFloat_FromDouble*17#
  */
-static PyObject *
+static NPY_INLINE PyObject *
 @name@_@which@(PyObject *obj)
 {
 #if @cmplx@
diff --git a/numpy/core/src/umath/test_rational.c.src b/numpy/core/src/umath/test_rational.c.src
@@ -543,7 +543,7 @@ pyrational_str(PyObject* self) {
     }
 }
 
-static long
+static npy_hash_t
 pyrational_hash(PyObject* self) {
     rational x = ((PyRational*)self)->r;
     /* Use a fairly weak hash as Python expects */
diff --git a/numpy/linalg/lapack_litemodule.c b/numpy/linalg/lapack_litemodule.c
@@ -314,8 +314,6 @@ static struct PyMethodDef lapack_lite_module_methods[] = {
     { NULL,NULL,0, NULL}
 };
 
-static char lapack_lite_module_documentation[] = "";
-
 
 #if PY_MAJOR_VERSION >= 3
 static struct PyModuleDef moduledef = {
@@ -346,8 +344,7 @@ initlapack_lite(void)
     m = PyModule_Create(&moduledef);
 #else
     m = Py_InitModule4("lapack_lite", lapack_lite_module_methods,
-		       lapack_lite_module_documentation,
-		       (PyObject*)NULL,PYTHON_API_VERSION);
+                       "", (PyObject*)NULL,PYTHON_API_VERSION);
 #endif
     if (m == NULL) {
         return RETVAL;

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`
`38`	`38`	`%s`
`39`	`39`
`40`		`-static int`
	`40`	`+static NPY_INLINE int`
`41`	`41`	`_import_umath(void)`
`42`	`42`	`{`
`43`	`43`	`PyObject *numpy = PyImport_ImportModule("numpy.core.umath");`
Original file line number	Diff line number	Diff line change
`@@ -903,6 +903,7 @@ PyArray_PyIntAsIntp_ErrMsg(PyObject o, const char msg)`
`903`	`903`	`return -1;`
`904`	`904`	`}`
`905`	`905`
	`906`	`+ goto overflow_check; /* silence unused warning */`
`906`	`907`	`overflow_check:`
`907`	`908`	`#if (NPY_SIZEOF_LONG < NPY_SIZEOF_INTP)`
`908`	`909`	`#if (NPY_SIZEOF_LONGLONG > NPY_SIZEOF_INTP)`
Original file line number	Diff line number	Diff line change
`@@ -1421,7 +1421,7 @@ array_subscript(PyArrayObject self, PyObject op)`
`1421`	`1421`	`{`
`1422`	`1422`	`int index_type;`
`1423`	`1423`	`int index_num;`
`1424`		`- int i, ndim, fancy_ndim, fancy;`
	`1424`	`+ int i, ndim, fancy_ndim;`
`1425`	`1425`	`/*`
`1426`	`1426`	`* Index info array. We can have twice as many indices as dimensions`
`1427`	`1427`	`* (because of None). The + 1 is to not need to check as much.`
Original file line number	Diff line number	Diff line change
`@@ -2394,7 +2394,7 @@ array_matmul(PyObject NPY_UNUSED(m), PyObject args, PyObject* kwds)`
`2394`	`2394`	`return NULL;`
`2395`	`2395`	`}`
`2396`	`2396`
`2397`		`- errval = PyUFunc_CheckOverride(matmul, "__call__",`
	`2397`	`+ errval = PyUFunc_CheckOverride((PyUFuncObject*)matmul, "__call__",`
`2398`	`2398`	`args, kwds, &override, 2);`
`2399`	`2399`	`if (errval) {`
`2400`	`2400`	`return NULL;`
`@@ -2512,7 +2512,7 @@ array_matmul(PyObject NPY_UNUSED(m), PyObject args, PyObject* kwds)`
`2512`	`2512`
`2513`	`2513`	`/* If no output was supplied, possibly convert to a scalar */`
`2514`	`2514`	`if (ret != NULL && out == NULL) {`
`2515`		`- ret = PyArray_Return((PyArrayObject *)ret);`
	`2515`	`+ return PyArray_Return((PyArrayObject *)ret);`
`2516`	`2516`	`}`
`2517`	`2517`	`return (PyObject *)ret;`
`2518`	`2518`
Original file line number	Diff line number	Diff line change
`@@ -1701,7 +1701,7 @@ voidtype_setfield(PyVoidScalarObject self, PyObject args, PyObject *kwds)`
`1701`	`1701`	`}`
`1702`	`1702`
`1703`	`1703`	`/* 1. Convert to 0-d array and use getfield */`
`1704`		`- arr = PyArray_FromScalar(self, NULL);`
	`1704`	`+ arr = PyArray_FromScalar((PyObject*)self, NULL);`
`1705`	`1705`	`if (arr == NULL) {`
`1706`	`1706`	`Py_DECREF(getfield_args);`
`1707`	`1707`	`return NULL;`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,8 @@ PyUnicode_FromUCS4(char *src, Py_ssize_t size, int swap, int align)`
`136`	`136`	`/* produce PyUnicode object */`
`137`	`137`	`#ifdef Py_UNICODE_WIDE`
`138`	`138`	`{`
`139`		`- ret = (PyUnicodeObject *)PyUnicode_FromUnicode(buf, (Py_ssize_t) ucs4len);`
	`139`	`+ ret = (PyUnicodeObject )PyUnicode_FromUnicode((Py_UNICODE)buf,`
	`140`	`+ (Py_ssize_t) ucs4len);`
`140`	`141`	`if (ret == NULL) {`
`141`	`142`	`goto fail;`
`142`	`143`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1417,7 +1417,7 @@ static PyObject *`
`1417`	`1417`	`* #func = (PyLong_FromLongLong, PyLong_FromUnsignedLongLong)*5,`
`1418`	`1418`	`* PyLong_FromDouble7, PyFloat_FromDouble17#`
`1419`	`1419`	`*/`
`1420`		`-static PyObject *`
	`1420`	`+static NPY_INLINE PyObject *`
`1421`	`1421`	`@name@_@which@(PyObject *obj)`
`1422`	`1422`	`{`
`1423`	`1423`	`#if @cmplx@`
Original file line number	Diff line number	Diff line change
`@@ -543,7 +543,7 @@ pyrational_str(PyObject* self) {`
`543`	`543`	`}`
`544`	`544`	`}`
`545`	`545`
`546`		`-static long`
	`546`	`+static npy_hash_t`
`547`	`547`	`pyrational_hash(PyObject* self) {`
`548`	`548`	`rational x = ((PyRational*)self)->r;`
`549`	`549`	`/* Use a fairly weak hash as Python expects */`