diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-07-18 11:00:19 -0700 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-07-18 11:00:19 -0700 |
| commit | d830b9d3194b3a0362c1fcfd372cdee5ed1bf0af (patch) | |
| tree | 182efc8da7436ba5ac259fd72f9a3f8fcdb069d5 | |
| parent | 7066cd7d54a20ef724781179b502b5c7eb3042ec (diff) | |
| parent | 0544cf0eb9628c45bf99d4ab4ce9b38dbfed05ec (diff) | |
| download | cpython-git-d830b9d3194b3a0362c1fcfd372cdee5ed1bf0af.tar.gz | |
merge 3.5 (#24655)
| -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 7a9e0665cf..ca3549c657 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -3963,20 +3963,20 @@ _ssl_get_default_verify_paths_impl(PyModuleDef *module) 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); |