commit 3fe7f67111c6e059e4d5ecaa0de0cd60fb45c2b0
author Jean-Paul Calderone <exarkun@divmod.com> Wed Aug 11 23:55:10 2010 -0400
committer Jean-Paul Calderone <exarkun@divmod.com> Wed Aug 11 23:55:10 2010 -0400
tree 0fa1e785df7782dcf022987033b8ab27f7e6adfe
parent 7382c831ab4de44e00abfe70a8d75d89784c834b

Fix type definitions, module init return values, and unicode/bytes conversions

OpenSSL/crypto/crypto.c

diff --git a/OpenSSL/crypto/crypto.c b/OpenSSL/crypto/crypto.c
index d71e3ec..87f3e75 100644
--- a/OpenSSL/crypto/crypto.c
+++ b/OpenSSL/crypto/crypto.c
@@ -805,7 +805,7 @@
 #endif
 
     if (module == NULL) {
-        return NULL;
+        PyOpenSSL_MODRETURN(NULL);
     }
 
 #ifndef PY3
@@ -863,14 +863,9 @@
     if (!init_crypto_revoked(module))
         goto error;
 
-#ifdef PY3
-    return module;
-#endif
+    PyOpenSSL_MODRETURN(module);
 
 error:
-#ifdef PY3
-    return NULL;
-#else
+    PyOpenSSL_MODRETURN(NULL);
     ;
-#endif
 }