From d113c967b4810b504d97ec97459dc85bd3a3facd Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Sat, 18 Jul 2015 10:59:13 -0700 Subject: [PATCH] improve style of the convert macro (#24655) Patch by Brian Cain. --- Modules/_ssl.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Modules/_ssl.c b/Modules/_ssl.c index c27073c1210..4dc1534d46d 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -3372,20 +3372,20 @@ 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 if ((target = PyUnicode_DecodeFSDefault(tmp)) == NULL) { \ 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);