Use intermingled declarations for new code

Author: erlend-aasland

Modules/_bz2module.c

@@ -338,7 +338,6 @@ _bz2_BZ2Compressor_impl(PyTypeObject *type, int compresslevel)
 /*[clinic end generated code: output=83346c96beaacad7 input=d4500d2a52c8b263]*/
 {
     int bzerror;
-    BZ2Compressor *self;
 
     if (!(1 <= compresslevel && compresslevel <= 9)) {
         PyErr_SetString(PyExc_ValueError,
@@ -347,7 +346,7 @@ _bz2_BZ2Compressor_impl(PyTypeObject *type, int compresslevel)
     }
 
     assert(type != NULL && type->tp_alloc != NULL);
-    self = (BZ2Compressor *)type->tp_alloc(type, 0);
+    BZ2Compressor *self = (BZ2Compressor *)type->tp_alloc(type, 0);
     if (self == NULL) {
         return NULL;
     }
@@ -642,11 +641,10 @@ static PyObject *
 _bz2_BZ2Decompressor_impl(PyTypeObject *type)
 /*[clinic end generated code: output=5150d51ccaab220e input=b87413ce51853528]*/
 {
-    BZ2Decompressor *self;
     int bzerror;
 
     assert(type != NULL && type->tp_alloc != NULL);
-    self = (BZ2Decompressor *)type->tp_alloc(type, 0);
+    BZ2Decompressor *self = (BZ2Decompressor *)type->tp_alloc(type, 0);
     if (self == NULL) {
         return NULL;
     }

Modules/_lzmamodule.c

@@ -775,7 +775,6 @@ Compressor_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
     uint32_t preset = LZMA_PRESET_DEFAULT;
     PyObject *preset_obj = Py_None;
     PyObject *filterspecs = Py_None;
-    Compressor *self;
 
     _lzma_state *state = PyType_GetModuleState(type);
     assert(state != NULL);
@@ -803,7 +802,7 @@ Compressor_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
     }
 
     assert(type != NULL && type->tp_alloc != NULL);
-    self = (Compressor *)type->tp_alloc(type, 0);
+    Compressor *self = (Compressor *)type->tp_alloc(type, 0);
     if (self == NULL) {
         return NULL;
     }
@@ -1204,7 +1203,6 @@ _lzma_LZMADecompressor_impl(PyTypeObject *type, int format,
                             PyObject *memlimit, PyObject *filters)
 /*[clinic end generated code: output=2d46d5e70f10bc7f input=ca40cd1cb1202b0d]*/
 {
-    Decompressor *self;
     const uint32_t decoder_flags = LZMA_TELL_ANY_CHECK | LZMA_TELL_NO_CHECK;
     uint64_t memlimit_ = UINT64_MAX;
     lzma_ret lzret;
@@ -1234,7 +1232,7 @@ _lzma_LZMADecompressor_impl(PyTypeObject *type, int format,
     }
 
     assert(type != NULL && type->tp_alloc != NULL);
-    self = (Decompressor *)type->tp_alloc(type, 0);
+    Decompressor *self = (Decompressor *)type->tp_alloc(type, 0);
     if (self == NULL) {
         return NULL;
     }