Jitter: fix module ret/noret

11 files changed, 48 insertions, 53 deletions

diff --git a/miasm/jitter/Jitgcc.c b/miasm/jitter/Jitgcc.c
index 0a39c998..9dc7b2fd 100644
--- a/miasm/jitter/Jitgcc.c
+++ b/miasm/jitter/Jitgcc.c
@@ -82,9 +82,6 @@ PyObject* gcc_exec_block(PyObject* self, PyObject* args)
 
 
 
-static PyObject *GccError;
-
-
 static PyMethodDef GccMethods[] = {
     {"gcc_exec_block",  gcc_exec_block, METH_VARARGS,
      "gcc exec block"},
@@ -95,12 +92,9 @@ static PyMethodDef GccMethods[] = {
 
 MOD_INIT(Jitgcc)
 {
-	PyObject *module;
+	PyObject *module = NULL;
 
 	MOD_DEF(module, "Jitgcc", "gcc module", GccMethods);
 
-	if (module == NULL)
-		return NULL;
-
-	return module;
+	RET_MODULE;
 }
diff --git a/miasm/jitter/Jitllvm.c b/miasm/jitter/Jitllvm.c
index efe5250f..b42bff89 100644
--- a/miasm/jitter/Jitllvm.c
+++ b/miasm/jitter/Jitllvm.c
@@ -88,12 +88,9 @@ static PyMethodDef LLVMMethods[] = {
 
 MOD_INIT(Jitllvm)
 {
-	PyObject *module;
+	PyObject *module = NULL;
 
 	MOD_DEF(module, "Jitllvm", "llvm module", LLVMMethods);
 
-	if (module == NULL)
-		return NULL;
-
-	return module;
+	RET_MODULE;
 }
diff --git a/miasm/jitter/arch/JitCore_aarch64.c b/miasm/jitter/arch/JitCore_aarch64.c
index 9e1a870e..973d0fc0 100644
--- a/miasm/jitter/arch/JitCore_aarch64.c
+++ b/miasm/jitter/arch/JitCore_aarch64.c
@@ -543,20 +543,20 @@ static PyMethodDef JitCore_aarch64_Methods[] = {
 
 MOD_INIT(JitCore_aarch64)
 {
-	PyObject *module;
+	PyObject *module = NULL;
 
 	MOD_DEF(module, "JitCore_aarch64", "JitCore_aarch64 module", JitCore_aarch64_Methods);
 
 	if (module == NULL)
-		return NULL;
+		RET_MODULE;
 
 	if (PyType_Ready(&JitCpuType) < 0)
-		return NULL;
+		RET_MODULE;
 
 	Py_INCREF(&JitCpuType);
 	if (PyModule_AddObject(module, "JitCpu", (PyObject *)&JitCpuType) < 0)
-		return NULL;
+		RET_MODULE;
 
-	return module;
+	RET_MODULE;
 }
 
diff --git a/miasm/jitter/arch/JitCore_arm.c b/miasm/jitter/arch/JitCore_arm.c
index ddb863ba..c3e81335 100644
--- a/miasm/jitter/arch/JitCore_arm.c
+++ b/miasm/jitter/arch/JitCore_arm.c
@@ -488,20 +488,20 @@ static PyMethodDef JitCore_arm_Methods[] = {
 
 MOD_INIT(JitCore_arm)
 {
-	PyObject *module;
+	PyObject *module = NULL;
 
 	MOD_DEF(module, "JitCore_arm", "JitCore_arm module", JitCore_arm_Methods);
 
 	if (module == NULL)
-		return NULL;
+		RET_MODULE;
 
 	if (PyType_Ready(&JitCpuType) < 0)
-		return NULL;
+		RET_MODULE;
 
 	Py_INCREF(&JitCpuType);
 	if (PyModule_AddObject(module, "JitCpu", (PyObject *)&JitCpuType) < 0)
-		return NULL;
+		RET_MODULE;
 
-	return module;
+	RET_MODULE;
 }
 
diff --git a/miasm/jitter/arch/JitCore_mep.c b/miasm/jitter/arch/JitCore_mep.c
index 6e7f1767..8267b7c8 100644
--- a/miasm/jitter/arch/JitCore_mep.c
+++ b/miasm/jitter/arch/JitCore_mep.c
@@ -599,19 +599,19 @@ static PyMethodDef JitCore_mep_Methods[] = {
 
 MOD_INIT(JitCore_mep)
 {
-	PyObject *module;
+	PyObject *module = NULL;
 
 	MOD_DEF(module, "JitCore_mep", "JitCore_mep module", JitCore_mep_Methods);
 
 	if (module == NULL)
-		return NULL;
+		RET_MODULE;
 
 	if (PyType_Ready(&JitCpuType) < 0)
-		return NULL;
+		RET_MODULE;
 
 	Py_INCREF(&JitCpuType);
 	if (PyModule_AddObject(module, "JitCpu", (PyObject *)&JitCpuType) < 0)
-		return NULL;
+		RET_MODULE;
 
-	return module;
+	RET_MODULE;
 }
diff --git a/miasm/jitter/arch/JitCore_mips32.c b/miasm/jitter/arch/JitCore_mips32.c
index 1455fec9..ada779b9 100644
--- a/miasm/jitter/arch/JitCore_mips32.c
+++ b/miasm/jitter/arch/JitCore_mips32.c
@@ -513,19 +513,19 @@ static PyMethodDef JitCore_mips32_Methods[] = {
 
 MOD_INIT(JitCore_mips32)
 {
-	PyObject *module;
+	PyObject *module = NULL;
 
 	MOD_DEF(module, "JitCore_mips32", "JitCore_mips32 module", JitCore_mips32_Methods);
 
 	if (module == NULL)
-		return NULL;
+		RET_MODULE;
 
 	if (PyType_Ready(&JitCpuType) < 0)
-		return NULL;
+		RET_MODULE;
 
 	Py_INCREF(&JitCpuType);
 	if (PyModule_AddObject(module, "JitCpu", (PyObject *)&JitCpuType) < 0)
-		return NULL;
+		RET_MODULE;
 
-	return module;
+	RET_MODULE;
 }
diff --git a/miasm/jitter/arch/JitCore_msp430.c b/miasm/jitter/arch/JitCore_msp430.c
index c21296c7..75fd5ca3 100644
--- a/miasm/jitter/arch/JitCore_msp430.c
+++ b/miasm/jitter/arch/JitCore_msp430.c
@@ -459,19 +459,19 @@ static PyMethodDef JitCore_msp430_Methods[] = {
 
 MOD_INIT(JitCore_msp430)
 {
-	PyObject *module;
+	PyObject *module = NULL;
 
 	MOD_DEF(module, "JitCore_msp430", "JitCore_msp430 module", JitCore_msp430_Methods);
 
 	if (module == NULL)
-		return NULL;
+		RET_MODULE;
 
 	if (PyType_Ready(&JitCpuType) < 0)
-		return NULL;
+		RET_MODULE;
 
 	Py_INCREF(&JitCpuType);
 	if (PyModule_AddObject(module, "JitCpu", (PyObject *)&JitCpuType) < 0)
-		return NULL;
+		RET_MODULE;
 
-	return module;
+	RET_MODULE;
 }
diff --git a/miasm/jitter/arch/JitCore_ppc32.c b/miasm/jitter/arch/JitCore_ppc32.c
index 8a1bb79e..b53b9f1d 100644
--- a/miasm/jitter/arch/JitCore_ppc32.c
+++ b/miasm/jitter/arch/JitCore_ppc32.c
@@ -326,19 +326,19 @@ static PyMethodDef JitCore_ppc32_Methods[] = {
 
 MOD_INIT(JitCore_ppc32)
 {
-	PyObject *module;
+	PyObject *module = NULL;
 
 	MOD_DEF(module, "JitCore_ppc32", "JitCore_ppc32 module", JitCore_ppc32_Methods);
 
 	if (module == NULL)
-		return NULL;
+		RET_MODULE;
 
 	if (PyType_Ready(&JitCpuType) < 0)
-		return NULL;
+		RET_MODULE;
 
 	Py_INCREF(&JitCpuType);
 	if (PyModule_AddObject(module, "JitCpu", (PyObject *)&JitCpuType) < 0)
-		return NULL;
+		RET_MODULE;
 
-	return module;
+	RET_MODULE;
 }
diff --git a/miasm/jitter/arch/JitCore_x86.c b/miasm/jitter/arch/JitCore_x86.c
index 50ce6bd5..cfda1e69 100644
--- a/miasm/jitter/arch/JitCore_x86.c
+++ b/miasm/jitter/arch/JitCore_x86.c
@@ -928,19 +928,19 @@ static PyMethodDef JitCore_x86_Methods[] = {
 
 MOD_INIT(JitCore_x86)
 {
-	PyObject *module;
+	PyObject *module = NULL;
 
 	MOD_DEF(module, "JitCore_x86", "JitCore_x86 module", JitCore_x86_Methods);
 
 	if (module == NULL)
-		return NULL;
+		RET_MODULE;
 
 	if (PyType_Ready(&JitCpuType) < 0)
-		return NULL;
+		RET_MODULE;
 
 	Py_INCREF(&JitCpuType);
 	if (PyModule_AddObject(module, "JitCpu", (PyObject *)&JitCpuType) < 0)
-		return NULL;
+		RET_MODULE;
 
-	return module;
+	RET_MODULE;
 }
diff --git a/miasm/jitter/compat_py23.h b/miasm/jitter/compat_py23.h
index bc66d80b..83574e36 100644
--- a/miasm/jitter/compat_py23.h
+++ b/miasm/jitter/compat_py23.h
@@ -72,12 +72,16 @@
 	static struct PyModuleDef moduledef = {				\
 					       PyModuleDef_HEAD_INIT, name, doc, -1, methods, }; \
 	ob = PyModule_Create(&moduledef);
+#define RET_MODULE return module
+
 #else
 
 #define MOD_INIT(name) PyMODINIT_FUNC init##name(void)
 
 #define MOD_DEF(ob, name, doc, methods)			\
 	ob = Py_InitModule3(name, methods, doc);
+
+#define RET_MODULE return
 #endif
 
 
diff --git a/miasm/jitter/vm_mngr_py.c b/miasm/jitter/vm_mngr_py.c
index 1173146b..d8223d72 100644
--- a/miasm/jitter/vm_mngr_py.c
+++ b/miasm/jitter/vm_mngr_py.c
@@ -995,19 +995,19 @@ char vm_mngr_mod_name[] = "VmMngr";
 
 MOD_INIT(VmMngr)
 {
-	PyObject *module;
+	PyObject *module = NULL;
 
 	MOD_DEF(module, "VmMngr", "vm_mngr module", VmMngr_Methods);
 
 	if (module == NULL)
-		return NULL;
+		RET_MODULE;
 
 	if (PyType_Ready(&VmMngrType) < 0)
-		return NULL;
+		RET_MODULE;
 
 	Py_INCREF(&VmMngrType);
 	if (PyModule_AddObject(module, "Vm", (PyObject *)&VmMngrType) < 0)
-		return NULL;
+		RET_MODULE;
 
-	return module;
+	RET_MODULE;
 }