diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-07-18 10:59:13 -0700 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-07-18 10:59:13 -0700 |
| commit | 0eb06e8e17974c6600071c79d780a718eb6132cf (patch) | |
| tree | 899f51cbaf5fca650457eacf8a7f897ff288869d /Modules | |
| parent | 522424761d881ff41a7b824a2c81e3023e3ac1b7 (diff) | |
| download | cpython-0eb06e8e17974c6600071c79d780a718eb6132cf.tar.gz | |
improve style of the convert macro (#24655)
Patch by Brian Cain.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_ssl.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c index c27073c121..4dc1534d46 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); |