isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Quiet -Wshadow warnings from gcc.

Browse Source
This commit is contained in:
Todd C. Miller
2021-05-07 15:10:51 -06:00
parent 7033f1c1d8
commit 6cdf49d33d
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/python/pyhelpers.c
View File

@@ -238,11 +238,11 @@ py_str_array_from_tuple(PyObject *py_tuple)
} }
PyObject * PyObject *
py_tuple_get(PyObject *py_tuple, Py_ssize_t index, PyTypeObject *expected_type) py_tuple_get(PyObject *py_tuple, Py_ssize_t idx, PyTypeObject *expected_type)
{ {
debug_decl(py_tuple_get, PYTHON_DEBUG_INTERNAL); debug_decl(py_tuple_get, PYTHON_DEBUG_INTERNAL);
PyObject *py_item = PyTuple_GetItem(py_tuple, index); PyObject *py_item = PyTuple_GetItem(py_tuple, idx);
if (py_item == NULL) { if (py_item == NULL) {
debug_return_ptr(NULL); debug_return_ptr(NULL);
} }
@@ -250,7 +250,7 @@ py_tuple_get(PyObject *py_tuple, Py_ssize_t index, PyTypeObject *expected_type)
if (!PyObject_TypeCheck(py_item, expected_type)) { if (!PyObject_TypeCheck(py_item, expected_type)) {
PyErr_Format(PyExc_ValueError, "Value error: tuple element %d should " PyErr_Format(PyExc_ValueError, "Value error: tuple element %d should "
"be a '%s' (but it is '%s')", "be a '%s' (but it is '%s')",
index, expected_type->tp_name, Py_TYPENAME(py_item)); idx, expected_type->tp_name, Py_TYPENAME(py_item));
debug_return_ptr(NULL); debug_return_ptr(NULL);
} }

4
plugins/python/python_plugin_policy.c
View File

@@ -214,12 +214,12 @@ python_plugin_policy_validate(const char **errstr)
} }
void void
python_plugin_policy_invalidate(int remove) python_plugin_policy_invalidate(int unlinkit)
{ {
debug_decl(python_plugin_policy_invalidate, PYTHON_DEBUG_CALLBACKS); debug_decl(python_plugin_policy_invalidate, PYTHON_DEBUG_CALLBACKS);
PyThreadState_Swap(plugin_ctx.py_interpreter); PyThreadState_Swap(plugin_ctx.py_interpreter);
python_plugin_api_rc_call(&plugin_ctx, CALLBACK_PYNAME(invalidate), python_plugin_api_rc_call(&plugin_ctx, CALLBACK_PYNAME(invalidate),
Py_BuildValue("(i)", remove)); Py_BuildValue("(i)", unlinkit));
debug_return; debug_return;
} }