From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 18 Jul 2015 17:59:13 +0000 (-0700)
Subject: improve style of the convert macro (#24655)
X-Git-Tag: v2.7.11rc1~242
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=65192c175606b502c57421aa62ea5b328d90d850;p=thirdparty%2FPython%2Fcpython.git

improve style of the convert macro (#24655)

Patch by Brian Cain.
---

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index b7537e6c72bc..dff592559371 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -3426,19 +3426,19 @@ PySSL_get_default_verify_paths(PyObject *self)
     PyObject *odir_env = NULL;
     PyObject *odir = NULL;
 
-#define convert(info, target) { \
+#define CONVERT(info, target) { \
         const char *tmp = (info); \
         target = NULL; \
         if (!tmp) { Py_INCREF(Py_None); target = Py_None; } \
         else { target = PyBytes_FromString(tmp); } \
         if (!target) goto error; \
-    } while(0)
+    } 
 
-    convert(X509_get_default_cert_file_env(), ofile_env);
-    convert(X509_get_default_cert_file(), ofile);
-    convert(X509_get_default_cert_dir_env(), odir_env);
-    convert(X509_get_default_cert_dir(), odir);
-#undef convert
+    CONVERT(X509_get_default_cert_file_env(), ofile_env);
+    CONVERT(X509_get_default_cert_file(), ofile);
+    CONVERT(X509_get_default_cert_dir_env(), odir_env);
+    CONVERT(X509_get_default_cert_dir(), odir);
+#undef CONVERT
 
     return Py_BuildValue("NNNN", ofile_env, ofile, odir_env, odir);