diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-07-18 18:00:00 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-07-18 18:00:00 (GMT) |
| commit | 0544cf0eb9628c45bf99d4ab4ce9b38dbfed05ec (patch) | |
| tree | 05a297b05f8a86b0df97895c158f4c6445a3aadb | |
| parent | 61ca207090b8276d35a828c030f54d983d55f23d (diff) | |
| parent | d113c967b4810b504d97ec97459dc85bd3a3facd (diff) | |
| download | cpython-0544cf0eb9628c45bf99d4ab4ce9b38dbfed05ec.zip cpython-0544cf0eb9628c45bf99d4ab4ce9b38dbfed05ec.tar.gz cpython-0544cf0eb9628c45bf99d4ab4ce9b38dbfed05ec.tar.bz2 | |
merge 3.4 (#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 7a9e066..ca3549c 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); |