Commit d113c967 authored by Benjamin Peterson's avatar Benjamin Peterson

improve style of the convert macro (#24655)

Patch by Brian Cain.
parent 92b3e065
...@@ -3372,20 +3372,20 @@ PySSL_get_default_verify_paths(PyObject *self) ...@@ -3372,20 +3372,20 @@ PySSL_get_default_verify_paths(PyObject *self)
PyObject *odir_env = NULL; PyObject *odir_env = NULL;
PyObject *odir = NULL; PyObject *odir = NULL;
#define convert(info, target) { \ #define CONVERT(info, target) { \
const char *tmp = (info); \ const char *tmp = (info); \
target = NULL; \ target = NULL; \
if (!tmp) { Py_INCREF(Py_None); target = Py_None; } \ if (!tmp) { Py_INCREF(Py_None); target = Py_None; } \
else if ((target = PyUnicode_DecodeFSDefault(tmp)) == NULL) { \ else if ((target = PyUnicode_DecodeFSDefault(tmp)) == NULL) { \
target = PyBytes_FromString(tmp); } \ target = PyBytes_FromString(tmp); } \
if (!target) goto error; \ if (!target) goto error; \
} while(0) }
convert(X509_get_default_cert_file_env(), ofile_env); CONVERT(X509_get_default_cert_file_env(), ofile_env);
convert(X509_get_default_cert_file(), ofile); CONVERT(X509_get_default_cert_file(), ofile);
convert(X509_get_default_cert_dir_env(), odir_env); CONVERT(X509_get_default_cert_dir_env(), odir_env);
convert(X509_get_default_cert_dir(), odir); CONVERT(X509_get_default_cert_dir(), odir);
#undef convert #undef CONVERT
return Py_BuildValue("NNNN", ofile_env, ofile, odir_env, odir); return Py_BuildValue("NNNN", ofile_env, ofile, odir_env, odir);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment