diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-03-25 09:58:58 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-03-25 09:58:58 +0300 |
commit | 2bc791437e3b8e42c1369daf15c72934474b1e73 (patch) | |
tree | f2202c3753c8288bea47d3c0edd10bcf01cdf339 /source/blender/python/generic | |
parent | c3764fe1e80670cd578df7bbc5c37c267e81013a (diff) |
Cleanup: use 'r_' prefix for output arguments
Also pass some args as 'const'.
Diffstat (limited to 'source/blender/python/generic')
-rw-r--r-- | source/blender/python/generic/py_capi_utils.c | 32 | ||||
-rw-r--r-- | source/blender/python/generic/py_capi_utils.h | 4 |
2 files changed, 18 insertions, 18 deletions
diff --git a/source/blender/python/generic/py_capi_utils.c b/source/blender/python/generic/py_capi_utils.c index 35fff8699d1..9c84a4bb824 100644 --- a/source/blender/python/generic/py_capi_utils.c +++ b/source/blender/python/generic/py_capi_utils.c @@ -360,15 +360,15 @@ void PyC_StackSpit(void) } } -void PyC_FileAndNum(const char **filename, int *lineno) +void PyC_FileAndNum(const char **r_filename, int *r_lineno) { PyFrameObject *frame; - if (filename) { - *filename = NULL; + if (r_filename) { + *r_filename = NULL; } - if (lineno) { - *lineno = -1; + if (r_lineno) { + *r_lineno = -1; } if (!(frame = PyThreadState_GET()->frame)) { @@ -376,13 +376,13 @@ void PyC_FileAndNum(const char **filename, int *lineno) } /* when executing a script */ - if (filename) { - *filename = _PyUnicode_AsString(frame->f_code->co_filename); + if (r_filename) { + *r_filename = _PyUnicode_AsString(frame->f_code->co_filename); } /* when executing a module */ - if (filename && *filename == NULL) { - /* try an alternative method to get the filename - module based + if (r_filename && *r_filename == NULL) { + /* try an alternative method to get the r_filename - module based * references below are all borrowed (double checked) */ PyObject *mod_name = PyDict_GetItemString(PyEval_GetGlobals(), "__name__"); if (mod_name) { @@ -390,7 +390,7 @@ void PyC_FileAndNum(const char **filename, int *lineno) if (mod) { PyObject *mod_file = PyModule_GetFilenameObject(mod); if (mod_file) { - *filename = _PyUnicode_AsString(mod_name); + *r_filename = _PyUnicode_AsString(mod_name); Py_DECREF(mod_file); } else { @@ -399,24 +399,24 @@ void PyC_FileAndNum(const char **filename, int *lineno) } /* unlikely, fallback */ - if (*filename == NULL) { - *filename = _PyUnicode_AsString(mod_name); + if (*r_filename == NULL) { + *r_filename = _PyUnicode_AsString(mod_name); } } } - if (lineno) { - *lineno = PyFrame_GetLineNumber(frame); + if (r_lineno) { + *r_lineno = PyFrame_GetLineNumber(frame); } } -void PyC_FileAndNum_Safe(const char **filename, int *lineno) +void PyC_FileAndNum_Safe(const char **r_filename, int *r_lineno) { if (!PyC_IsInterpreterActive()) { return; } - PyC_FileAndNum(filename, lineno); + PyC_FileAndNum(r_filename, r_lineno); } /* Would be nice if python had this built in */ diff --git a/source/blender/python/generic/py_capi_utils.h b/source/blender/python/generic/py_capi_utils.h index 5fb5737e1f9..e8b2e8ff502 100644 --- a/source/blender/python/generic/py_capi_utils.h +++ b/source/blender/python/generic/py_capi_utils.h @@ -38,8 +38,8 @@ PyObject *PyC_Err_SetString_Prefix(PyObject *exception_type_prefix, const char * void PyC_Err_PrintWithFunc(PyObject *py_func); -void PyC_FileAndNum(const char **filename, int *lineno); -void PyC_FileAndNum_Safe(const char **filename, int *lineno); /* checks python is running */ +void PyC_FileAndNum(const char **r_filename, int *r_lineno); +void PyC_FileAndNum_Safe(const char **r_filename, int *r_lineno); /* checks python is running */ int PyC_AsArray_FAST(void *array, PyObject *value_fast, const Py_ssize_t length, |