From 2115232a16d81d28dbdb8042ed8e9316858514c6 Mon Sep 17 00:00:00 2001 From: Sebastian Parborg Date: Fri, 4 Sep 2020 20:59:13 +0200 Subject: Cleanup: Clang-Tidy readability-inconsistent-declaration-parameter-name fix No functional changes --- source/blender/python/BPY_extern_python.h | 2 +- source/blender/python/bmesh/bmesh_py_types.h | 2 +- source/blender/python/bmesh/bmesh_py_types_meshdata.c | 4 ++-- source/blender/python/bmesh/bmesh_py_types_meshdata.h | 12 ++++++------ source/blender/python/gpu/gpu_py_vertex_buffer.h | 2 +- source/blender/python/intern/bpy_rna_callback.h | 4 ++-- source/blender/python/mathutils/mathutils.h | 4 ++-- source/blender/python/mathutils/mathutils_Vector.c | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) (limited to 'source/blender/python') diff --git a/source/blender/python/BPY_extern_python.h b/source/blender/python/BPY_extern_python.h index 348f6986863..70b5cd679b9 100644 --- a/source/blender/python/BPY_extern_python.h +++ b/source/blender/python/BPY_extern_python.h @@ -36,7 +36,7 @@ void BPY_python_start(int argc, const char **argv); void BPY_python_end(void); void BPY_python_reset(struct bContext *C); void BPY_python_use_system_env(void); -void BPY_python_backtrace(FILE *file); +void BPY_python_backtrace(FILE *fp); #ifdef __cplusplus } /* extern "C" */ diff --git a/source/blender/python/bmesh/bmesh_py_types.h b/source/blender/python/bmesh/bmesh_py_types.h index 7ac3c4bf3cc..ce894760eff 100644 --- a/source/blender/python/bmesh/bmesh_py_types.h +++ b/source/blender/python/bmesh/bmesh_py_types.h @@ -176,7 +176,7 @@ int bpy_bm_generic_valid_check(BPy_BMGeneric *self); int bpy_bm_generic_valid_check_source(BMesh *bm_source, const char *error_prefix, void **args, - uint args_n) ATTR_NONNULL(1, 2); + uint args_tot) ATTR_NONNULL(1, 2); #define BPY_BM_CHECK_OBJ(obj) \ if (UNLIKELY(bpy_bm_generic_valid_check((BPy_BMGeneric *)obj) == -1)) { \ diff --git a/source/blender/python/bmesh/bmesh_py_types_meshdata.c b/source/blender/python/bmesh/bmesh_py_types_meshdata.c index f42348975c9..8214be3bd73 100644 --- a/source/blender/python/bmesh/bmesh_py_types_meshdata.c +++ b/source/blender/python/bmesh/bmesh_py_types_meshdata.c @@ -351,10 +351,10 @@ int BPy_BMLoopColor_AssignPyObject(struct MLoopCol *mloopcol, PyObject *value) return -1; } -PyObject *BPy_BMLoopColor_CreatePyObject(struct MLoopCol *data) +PyObject *BPy_BMLoopColor_CreatePyObject(struct MLoopCol *mloopcol) { PyObject *color_capsule; - color_capsule = PyCapsule_New(data, NULL, NULL); + color_capsule = PyCapsule_New(mloopcol, NULL, NULL); return Vector_CreatePyObject_cb(color_capsule, 4, mathutils_bmloopcol_cb_index, 0); } diff --git a/source/blender/python/bmesh/bmesh_py_types_meshdata.h b/source/blender/python/bmesh/bmesh_py_types_meshdata.h index 58f31a9807e..b7699b387e5 100644 --- a/source/blender/python/bmesh/bmesh_py_types_meshdata.h +++ b/source/blender/python/bmesh/bmesh_py_types_meshdata.h @@ -37,14 +37,14 @@ struct MLoopCol; struct MLoopUV; struct MVertSkin; -int BPy_BMLoopUV_AssignPyObject(struct MLoopUV *data, PyObject *value); -PyObject *BPy_BMLoopUV_CreatePyObject(struct MLoopUV *data); +int BPy_BMLoopUV_AssignPyObject(struct MLoopUV *mloopuv, PyObject *value); +PyObject *BPy_BMLoopUV_CreatePyObject(struct MLoopUV *mloopuv); -int BPy_BMVertSkin_AssignPyObject(struct MVertSkin *data, PyObject *value); -PyObject *BPy_BMVertSkin_CreatePyObject(struct MVertSkin *data); +int BPy_BMVertSkin_AssignPyObject(struct MVertSkin *mvertskin, PyObject *value); +PyObject *BPy_BMVertSkin_CreatePyObject(struct MVertSkin *mvertskin); -int BPy_BMLoopColor_AssignPyObject(struct MLoopCol *data, PyObject *value); -PyObject *BPy_BMLoopColor_CreatePyObject(struct MLoopCol *data); +int BPy_BMLoopColor_AssignPyObject(struct MLoopCol *mloopcol, PyObject *value); +PyObject *BPy_BMLoopColor_CreatePyObject(struct MLoopCol *mloopcol); int BPy_BMDeformVert_AssignPyObject(struct MDeformVert *dvert, PyObject *value); PyObject *BPy_BMDeformVert_CreatePyObject(struct MDeformVert *dvert); diff --git a/source/blender/python/gpu/gpu_py_vertex_buffer.h b/source/blender/python/gpu/gpu_py_vertex_buffer.h index 41791a35e6e..8adf2aa0792 100644 --- a/source/blender/python/gpu/gpu_py_vertex_buffer.h +++ b/source/blender/python/gpu/gpu_py_vertex_buffer.h @@ -32,4 +32,4 @@ typedef struct BPyGPUVertBuf { struct GPUVertBuf *buf; } BPyGPUVertBuf; -PyObject *BPyGPUVertBuf_CreatePyObject(struct GPUVertBuf *vbo) ATTR_NONNULL(1); +PyObject *BPyGPUVertBuf_CreatePyObject(struct GPUVertBuf *buf) ATTR_NONNULL(1); diff --git a/source/blender/python/intern/bpy_rna_callback.h b/source/blender/python/intern/bpy_rna_callback.h index ae42c4cb1a4..6c971ff9528 100644 --- a/source/blender/python/intern/bpy_rna_callback.h +++ b/source/blender/python/intern/bpy_rna_callback.h @@ -32,8 +32,8 @@ PyObject *pyrna_callback_add(BPy_StructRNA *self, PyObject *args); PyObject *pyrna_callback_remove(BPy_StructRNA *self, PyObject *args); #endif -PyObject *pyrna_callback_classmethod_add(PyObject *cls, PyObject *args); -PyObject *pyrna_callback_classmethod_remove(PyObject *cls, PyObject *args); +PyObject *pyrna_callback_classmethod_add(PyObject *self, PyObject *args); +PyObject *pyrna_callback_classmethod_remove(PyObject *self, PyObject *args); #ifdef __cplusplus } diff --git a/source/blender/python/mathutils/mathutils.h b/source/blender/python/mathutils/mathutils.h index d8d390cfad0..75aa08ee1df 100644 --- a/source/blender/python/mathutils/mathutils.h +++ b/source/blender/python/mathutils/mathutils.h @@ -90,7 +90,7 @@ void BaseMathObject_dealloc(BaseMathObject *self); PyMODINIT_FUNC PyInit_mathutils(void); -int EXPP_FloatsAreEqual(float A, float B, int floatSteps); +int EXPP_FloatsAreEqual(float A, float B, int maxDiff); int EXPP_VectorsAreEqual(const float *vecA, const float *vecB, int size, int floatSteps); typedef struct Mathutils_Callback Mathutils_Callback; @@ -188,7 +188,7 @@ Py_hash_t mathutils_array_hash(const float *float_array, size_t array_len); #define MU_ARRAY_FLAGS (MU_ARRAY_ZERO | MU_ARRAY_SPILL) -int column_vector_multiplication(float rvec[4], VectorObject *vec, MatrixObject *mat); +int column_vector_multiplication(float r_vec[4], VectorObject *vec, MatrixObject *mat); #ifndef MATH_STANDALONE /* dynstr as python string utility functions */ diff --git a/source/blender/python/mathutils/mathutils_Vector.c b/source/blender/python/mathutils/mathutils_Vector.c index 9bc8c0dffed..f7b2840f0b4 100644 --- a/source/blender/python/mathutils/mathutils_Vector.c +++ b/source/blender/python/mathutils/mathutils_Vector.c @@ -48,7 +48,7 @@ static PyObject *Vector_copy(VectorObject *self); static PyObject *Vector_deepcopy(VectorObject *self, PyObject *args); static PyObject *Vector_to_tuple_ex(VectorObject *self, int ndigits); -static int row_vector_multiplication(float rvec[MAX_DIMENSIONS], +static int row_vector_multiplication(float r_vec[MAX_DIMENSIONS], VectorObject *vec, MatrixObject *mat); -- cgit v1.2.3