From: Andru1999 <kaz.19.01.1999@yandex.ru>
Date: Wed, 13 Jun 2018 18:53:59 +0000 (-0400)
Subject: Use INITERROR macro in utils.c
X-Git-Tag: rel_1_3_0b1~167
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1fcd837974a052e46455af99e0a1f18f7074bd8;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Use INITERROR macro in utils.c

Remove py3k check where we initialize the module and
instead make this look like the same init sequence
as resultproxy.c, processors.c

Co-authored-by: Mike Bayer <mike_mp@zzzcomputing.com>
Change-Id: Ia6352e50eaf760d95ab2bbf66d90c023c37f1193
Pull-request: https://github.com/zzzeek/sqlalchemy/pull/429
---

diff --git a/lib/sqlalchemy/cextension/utils.c b/lib/sqlalchemy/cextension/utils.c
index d9cf93d0af..b13157aa7f 100644
--- a/lib/sqlalchemy/cextension/utils.c
+++ b/lib/sqlalchemy/cextension/utils.c
@@ -187,6 +187,8 @@ static PyMethodDef module_methods[] = {
 
 #if PY_MAJOR_VERSION >= 3
 
+#define INITERROR return NULL
+
 static struct PyModuleDef module_def = {
     PyModuleDef_HEAD_INIT,
     MODULE_NAME,
@@ -194,16 +196,19 @@ static struct PyModuleDef module_def = {
     -1,
     module_methods
  };
-#endif
 
-
-#if PY_MAJOR_VERSION >= 3
 PyMODINIT_FUNC
 PyInit_cutils(void)
+
 #else
+
+#define INITERROR return
+
 PyMODINIT_FUNC
 initcutils(void)
+
 #endif
+
 {
     PyObject *m;
 
@@ -212,14 +217,11 @@ initcutils(void)
 #else
     m = Py_InitModule3(MODULE_NAME, module_methods, MODULE_DOC);
 #endif
+    if (m == NULL)
+        INITERROR;
 
 #if PY_MAJOR_VERSION >= 3
-    if (m == NULL)
-        return NULL;
     return m;
-#else
-    if (m == NULL)
-    	return;
 #endif
 }