Merge pull request #5175 from larsmans/c-fixes

charris · charris · commit 4c4595b24870 · 2014-10-12T08:32:42.000-06:00
MAINT: core: string constants in static buffers
diff --git a/numpy/core/src/multiarray/multiarraymodule.c b/numpy/core/src/multiarray/multiarraymodule.c
@@ -254,7 +254,7 @@ PyArray_As1D(PyObject **op, char **ptr, int *d1, int typecode)
 {
     npy_intp newd1;
     PyArray_Descr *descr;
-    char msg[] = "PyArray_As1D: use PyArray_AsCArray.";
+    static const char msg[] = "PyArray_As1D: use PyArray_AsCArray.";
 
     if (DEPRECATE(msg) < 0) {
         return -1;
@@ -275,7 +275,7 @@ PyArray_As2D(PyObject **op, char ***ptr, int *d1, int *d2, int typecode)
 {
     npy_intp newdims[2];
     PyArray_Descr *descr;
-    char msg[] = "PyArray_As1D: use PyArray_AsCArray.";
+    static const char msg[] = "PyArray_As1D: use PyArray_AsCArray.";
 
     if (DEPRECATE(msg) < 0) {
         return -1;
@@ -347,8 +347,9 @@ PyArray_ConcatenateArrays(int narrays, PyArrayObject **arrays, int axis)
     }
 
     if (ndim == 1 && axis != 0) {
-        char msg[] = "axis != 0 for ndim == 1; this will raise an error in "
-                     "future versions of numpy";
+        static const char msg[] = "axis != 0 for ndim == 1; "
+                                  "this will raise an error in "
+                                  "future versions of numpy";
         if (DEPRECATE(msg) < 0) {
             return NULL;
         }
