From: Paul Brossier <piem@piem.org>
Date: Wed, 11 May 2016 13:10:02 +0000 (+0200)
Subject: ext/: build with -Wdeclaration-after-statement -Werror
X-Git-Tag: 0.4.4~300^2~67
X-Git-Url: https://git.aubio.org/?p=aubio.git;a=commitdiff_plain;h=a138975bd09a621619506c28f359036035c323d6

ext/: build with -Wdeclaration-after-statement -Werror
---

diff --git a/python/ext/py-cvec.c b/python/ext/py-cvec.c
index 6e3bb24c..0054dced 100644
--- a/python/ext/py-cvec.c
+++ b/python/ext/py-cvec.c
@@ -140,10 +140,11 @@ Py_cvec_get_phas (Py_cvec * self, void *closure)
 static int
 Py_cvec_set_norm (Py_cvec * vec, PyObject *input, void * closure)
 {
+  npy_intp length;
   if (!PyAubio_IsValidVector(input)) {
     return 1;
   }
-  npy_intp length = PyArray_SIZE ((PyArrayObject *)input);
+  length = PyArray_SIZE ((PyArrayObject *)input);
   if (length != vec->length) {
     PyErr_Format (PyExc_ValueError,
         "input array has length %ld, but cvec has length %d", length,
@@ -160,10 +161,11 @@ Py_cvec_set_norm (Py_cvec * vec, PyObject *input, void * closure)
 static int
 Py_cvec_set_phas (Py_cvec * vec, PyObject *input, void * closure)
 {
+  npy_intp length;
   if (!PyAubio_IsValidVector(input)) {
     return 1;
   }
-  npy_intp length = PyArray_SIZE ((PyArrayObject *)input);
+  length = PyArray_SIZE ((PyArrayObject *)input);
   if (length != vec->length) {
     PyErr_Format (PyExc_ValueError,
         "input array has length %ld, but cvec has length %d", length,
diff --git a/python/ext/py-fft.c b/python/ext/py-fft.c
index c55cc534..0fce627a 100644
--- a/python/ext/py-fft.c
+++ b/python/ext/py-fft.c
@@ -80,6 +80,7 @@ static PyObject *
 Py_fft_do(Py_fft * self, PyObject * args)
 {
   PyObject *input;
+  cvec_t c_out;
 
   if (!PyArg_ParseTuple (args, "O", &input)) {
     return NULL;
@@ -96,7 +97,6 @@ Py_fft_do(Py_fft * self, PyObject * args)
     return NULL;
   }
 
-  cvec_t c_out;
   Py_INCREF(self->doout);
   if (!PyAubio_PyCvecToCCvec(self->doout, &c_out)) {
     return NULL;
@@ -116,6 +116,7 @@ static PyObject *
 Py_fft_rdo(Py_fft * self, PyObject * args)
 {
   PyObject *input;
+  fvec_t out;
 
   if (!PyArg_ParseTuple (args, "O", &input)) {
     return NULL;
@@ -132,7 +133,6 @@ Py_fft_rdo(Py_fft * self, PyObject * args)
     return NULL;
   }
 
-  fvec_t out;
   Py_INCREF(self->rdoout);
   if (!PyAubio_ArrayToCFvec(self->rdoout, &out) ) {
     return NULL;
diff --git a/python/ext/py-source.c b/python/ext/py-source.c
index 55ed71e0..2c965137 100644
--- a/python/ext/py-source.c
+++ b/python/ext/py-source.c
@@ -173,6 +173,7 @@ Py_source_del (Py_source *self, PyObject *unused)
 static PyObject *
 Py_source_do(Py_source * self, PyObject * args)
 {
+  PyObject *outputs;
   uint_t read;
   read = 0;
 
@@ -183,7 +184,7 @@ Py_source_do(Py_source * self, PyObject * args)
   /* compute _do function */
   aubio_source_do (self->o, &(self->c_read_to), &read);
 
-  PyObject *outputs = PyTuple_New(2);
+  outputs = PyTuple_New(2);
   PyTuple_SetItem( outputs, 0, self->read_to );
   PyTuple_SetItem( outputs, 1, (PyObject *)PyLong_FromLong(read));
   return outputs;
@@ -193,6 +194,7 @@ Py_source_do(Py_source * self, PyObject * args)
 static PyObject *
 Py_source_do_multi(Py_source * self, PyObject * args)
 {
+  PyObject *outputs;
   uint_t read;
   read = 0;
 
@@ -203,7 +205,7 @@ Py_source_do_multi(Py_source * self, PyObject * args)
   /* compute _do function */
   aubio_source_do_multi (self->o, &(self->c_mread_to), &read);
 
-  PyObject *outputs = PyTuple_New(2);
+  outputs = PyTuple_New(2);
   PyTuple_SetItem( outputs, 0, self->mread_to);
   PyTuple_SetItem( outputs, 1, (PyObject *)PyLong_FromLong(read));
   return outputs;
diff --git a/python/ext/ufuncs.c b/python/ext/ufuncs.c
index 455247b9..8a4e9172 100644
--- a/python/ext/ufuncs.c
+++ b/python/ext/ufuncs.c
@@ -84,6 +84,7 @@ static void* Py_miditofreq_data[] = {
 void add_ufuncs ( PyObject *m )
 {
   int err = 0;
+  PyObject *dict, *f, *g, *h;
 
   err = _import_umath ();
   if (err != 0) {
@@ -91,7 +92,6 @@ void add_ufuncs ( PyObject *m )
         "Unable to import Numpy umath from aubio module (error %d)\n", err);
   }
 
-  PyObject *f, *dict;
   dict = PyModule_GetDict(m);
   f = PyUFunc_FromFuncAndData(Py_aubio_unary_functions, Py_unwrap2pi_data, Py_aubio_unary_types,
           Py_aubio_unary_n_types, Py_aubio_unary_n_inputs, Py_aubio_unary_n_outputs,
@@ -99,14 +99,12 @@ void add_ufuncs ( PyObject *m )
   PyDict_SetItemString(dict, "unwrap2pi", f);
   Py_DECREF(f);
 
-  PyObject *g;
   g = PyUFunc_FromFuncAndData(Py_aubio_unary_functions, Py_freqtomidi_data, Py_aubio_unary_types,
           Py_aubio_unary_n_types, Py_aubio_unary_n_inputs, Py_aubio_unary_n_outputs,
           PyUFunc_None, "freqtomidi", Py_freqtomidi_doc, 0);
   PyDict_SetItemString(dict, "freqtomidi", g);
   Py_DECREF(g);
 
-  PyObject *h;
   h = PyUFunc_FromFuncAndData(Py_aubio_unary_functions, Py_miditofreq_data, Py_aubio_unary_types,
           Py_aubio_unary_n_types, Py_aubio_unary_n_inputs, Py_aubio_unary_n_outputs,
           PyUFunc_None, "miditofreq", Py_miditofreq_doc, 0);