diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-04-26 18:21:23 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-04-26 18:25:15 +0400 |
commit | e73d0f57a32f309433c005c06d6da2048f274c04 (patch) | |
tree | eaa2542b29b5198590b79e1610d511cf0f57275d /source/blender/python | |
parent | 483d8da9bcfa1eeef950ba45633c5fb49fb7f93b (diff) |
Code cleanup: use 'const' for arrays (python)
Diffstat (limited to 'source/blender/python')
-rw-r--r-- | source/blender/python/bmesh/bmesh_py_ops_call.c | 2 | ||||
-rw-r--r-- | source/blender/python/generic/bgl.c | 2 | ||||
-rw-r--r-- | source/blender/python/generic/blf_py_api.c | 8 | ||||
-rw-r--r-- | source/blender/python/generic/bpy_internal_import.c | 4 | ||||
-rw-r--r-- | source/blender/python/generic/idprop_py_api.c | 14 | ||||
-rw-r--r-- | source/blender/python/generic/py_capi_utils.c | 6 | ||||
-rw-r--r-- | source/blender/python/intern/bpy.c | 6 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_operator.c | 10 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_operator_wrap.c | 2 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_props.c | 20 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_rna.c | 4 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_rna_callback.c | 6 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_util.c | 2 | ||||
-rw-r--r-- | source/blender/python/mathutils/mathutils_geometry.c | 2 |
14 files changed, 44 insertions, 44 deletions
diff --git a/source/blender/python/bmesh/bmesh_py_ops_call.c b/source/blender/python/bmesh/bmesh_py_ops_call.c index f4fe1ede088..9c9b69186ab 100644 --- a/source/blender/python/bmesh/bmesh_py_ops_call.c +++ b/source/blender/python/bmesh/bmesh_py_ops_call.c @@ -768,7 +768,7 @@ PyObject *BPy_BMO_call(BPy_BMeshOpFunc *self, PyObject *args, PyObject *kw) /* temp code, strip off '.out' while we keep this convention */ { char slot_name_strip[MAX_SLOTNAME]; - char *ch = strchr(slot->slot_name, '.'); /* can't fail! */ + const char *ch = strchr(slot->slot_name, '.'); /* can't fail! */ int tot = ch - slot->slot_name; BLI_assert(ch != NULL); memcpy(slot_name_strip, slot->slot_name, tot); diff --git a/source/blender/python/generic/bgl.c b/source/blender/python/generic/bgl.c index d1d0ec96315..292d3317a2e 100644 --- a/source/blender/python/generic/bgl.c +++ b/source/blender/python/generic/bgl.c @@ -1905,7 +1905,7 @@ PyObject *BPyInit_bgl(void) static PyObject *Method_ShaderSource(PyObject *UNUSED(self), PyObject *args) { unsigned int shader; - char *source; + const char *source; if (!PyArg_ParseTuple(args, "Is", &shader, &source)) return NULL; diff --git a/source/blender/python/generic/blf_py_api.c b/source/blender/python/generic/blf_py_api.c index 768c5506b8c..655542e320a 100644 --- a/source/blender/python/generic/blf_py_api.c +++ b/source/blender/python/generic/blf_py_api.c @@ -146,7 +146,7 @@ PyDoc_STRVAR(py_blf_draw_doc, ); static PyObject *py_blf_draw(PyObject *UNUSED(self), PyObject *args) { - char *text; + const char *text; int text_length; int fontid; @@ -172,7 +172,7 @@ PyDoc_STRVAR(py_blf_dimensions_doc, ); static PyObject *py_blf_dimensions(PyObject *UNUSED(self), PyObject *args) { - char *text; + const char *text; float r_width, r_height; PyObject *ret; int fontid; @@ -356,7 +356,7 @@ PyDoc_STRVAR(py_blf_load_doc, ); static PyObject *py_blf_load(PyObject *UNUSED(self), PyObject *args) { - char *filename; + const char *filename; if (!PyArg_ParseTuple(args, "s:blf.load", &filename)) return NULL; @@ -374,7 +374,7 @@ PyDoc_STRVAR(py_blf_unload_doc, ); static PyObject *py_blf_unload(PyObject *UNUSED(self), PyObject *args) { - char *filename; + const char *filename; if (!PyArg_ParseTuple(args, "s:blf.unload", &filename)) return NULL; diff --git a/source/blender/python/generic/bpy_internal_import.c b/source/blender/python/generic/bpy_internal_import.c index af41c3b426b..a0e6204b34c 100644 --- a/source/blender/python/generic/bpy_internal_import.c +++ b/source/blender/python/generic/bpy_internal_import.c @@ -226,7 +226,7 @@ PyObject *bpy_text_reimport(PyObject *module, int *found) { Text *text; const char *name; - char *filepath; + const char *filepath; //XXX Main *maggie = bpy_import_main ? bpy_import_main:G.main; Main *maggie = bpy_import_main; @@ -265,7 +265,7 @@ PyObject *bpy_text_reimport(PyObject *module, int *found) static PyObject *blender_import(PyObject *UNUSED(self), PyObject *args, PyObject *kw) { PyObject *exception, *err, *tb; - char *name; + const char *name; int found = 0; PyObject *globals = NULL, *locals = NULL, *fromlist = NULL; int level = 0; /* relative imports */ diff --git a/source/blender/python/generic/idprop_py_api.c b/source/blender/python/generic/idprop_py_api.c index 5821d48b994..54fed9e11ef 100644 --- a/source/blender/python/generic/idprop_py_api.c +++ b/source/blender/python/generic/idprop_py_api.c @@ -599,7 +599,7 @@ static PyObject *BPy_IDGroup_MapDataToPy(IDProperty *prop) switch (prop->subtype) { case IDP_FLOAT: { - float *array = (float *)IDP_Array(prop); + const float *array = (float *)IDP_Array(prop); for (i = 0; i < prop->len; i++) { PyList_SET_ITEM(seq, i, PyFloat_FromDouble(array[i])); } @@ -607,7 +607,7 @@ static PyObject *BPy_IDGroup_MapDataToPy(IDProperty *prop) } case IDP_DOUBLE: { - double *array = (double *)IDP_Array(prop); + const double *array = (double *)IDP_Array(prop); for (i = 0; i < prop->len; i++) { PyList_SET_ITEM(seq, i, PyFloat_FromDouble(array[i])); } @@ -615,7 +615,7 @@ static PyObject *BPy_IDGroup_MapDataToPy(IDProperty *prop) } case IDP_INT: { - int *array = (int *)IDP_Array(prop); + const int *array = (int *)IDP_Array(prop); for (i = 0; i < prop->len; i++) { PyList_SET_ITEM(seq, i, PyLong_FromLong(array[i])); } @@ -881,7 +881,7 @@ static PyObject *BPy_IDGroup_clear(BPy_IDProperty *self) static PyObject *BPy_IDGroup_Get(BPy_IDProperty *self, PyObject *args) { IDProperty *idprop; - char *key; + const char *key; PyObject *def = Py_None; if (!PyArg_ParseTuple(args, "s|O:get", &key, &def)) @@ -1158,7 +1158,7 @@ static PyObject *BPy_IDArray_slice(BPy_IDArray *self, int begin, int end) switch (prop->subtype) { case IDP_FLOAT: { - float *array = (float *)IDP_Array(prop); + const float *array = (float *)IDP_Array(prop); for (count = begin; count < end; count++) { PyTuple_SET_ITEM(tuple, count - begin, PyFloat_FromDouble(array[count])); } @@ -1166,7 +1166,7 @@ static PyObject *BPy_IDArray_slice(BPy_IDArray *self, int begin, int end) } case IDP_DOUBLE: { - double *array = (double *)IDP_Array(prop); + const double *array = (double *)IDP_Array(prop); for (count = begin; count < end; count++) { PyTuple_SET_ITEM(tuple, count - begin, PyFloat_FromDouble(array[count])); } @@ -1174,7 +1174,7 @@ static PyObject *BPy_IDArray_slice(BPy_IDArray *self, int begin, int end) } case IDP_INT: { - int *array = (int *)IDP_Array(prop); + const int *array = (int *)IDP_Array(prop); for (count = begin; count < end; count++) { PyTuple_SET_ITEM(tuple, count - begin, PyLong_FromLong(array[count])); } diff --git a/source/blender/python/generic/py_capi_utils.c b/source/blender/python/generic/py_capi_utils.c index a37933d027e..6f72a291a36 100644 --- a/source/blender/python/generic/py_capi_utils.c +++ b/source/blender/python/generic/py_capi_utils.c @@ -284,7 +284,7 @@ PyObject *PyC_Object_GetAttrStringArgs(PyObject *o, Py_ssize_t n, ...) { Py_ssize_t i; PyObject *item = o; - char *attr; + const char *attr; va_list vargs; @@ -647,7 +647,7 @@ void PyC_RunQuicky(const char *filepath, int n, ...) va_start(vargs, n); for (i = 0; i * 2 < n; i++) { - char *format = va_arg(vargs, char *); + const char *format = va_arg(vargs, char *); void *ptr = va_arg(vargs, void *); ret = PyObject_CallFunction(calcsize, (char *)"s", format); @@ -704,7 +704,7 @@ void PyC_RunQuicky(const char *filepath, int n, ...) /* now get the values back */ va_start(vargs, n); for (i = 0; i * 2 < n; i++) { - char *format = va_arg(vargs, char *); + const char *format = va_arg(vargs, char *); void *ptr = va_arg(vargs, void *); PyObject *item; diff --git a/source/blender/python/intern/bpy.c b/source/blender/python/intern/bpy.c index ae57588985d..89104821cb0 100644 --- a/source/blender/python/intern/bpy.c +++ b/source/blender/python/intern/bpy.c @@ -144,8 +144,8 @@ static PyObject *bpy_blend_paths(PyObject *UNUSED(self), PyObject *args, PyObjec // PyDoc_STRVAR(bpy_user_resource_doc[] = // now in bpy/utils.py static PyObject *bpy_user_resource(PyObject *UNUSED(self), PyObject *args, PyObject *kw) { - char *type; - char *subdir = NULL; + const char *type; + const char *subdir = NULL; int folder_id; static const char *kwlist[] = {"type", "subdir", NULL}; @@ -189,7 +189,7 @@ PyDoc_STRVAR(bpy_resource_path_doc, ); static PyObject *bpy_resource_path(PyObject *UNUSED(self), PyObject *args, PyObject *kw) { - char *type; + const char *type; int major = BLENDER_VERSION / 100, minor = BLENDER_VERSION % 100; static const char *kwlist[] = {"type", "major", "minor", NULL}; int folder_id; diff --git a/source/blender/python/intern/bpy_operator.c b/source/blender/python/intern/bpy_operator.c index e867aa00958..2c526601fcd 100644 --- a/source/blender/python/intern/bpy_operator.c +++ b/source/blender/python/intern/bpy_operator.c @@ -65,10 +65,10 @@ static PyObject *pyop_poll(PyObject *UNUSED(self), PyObject *args) { wmOperatorType *ot; - char *opname; + const char *opname; PyObject *context_dict = NULL; /* optional args */ PyObject *context_dict_back; - char *context_str = NULL; + const char *context_str = NULL; PyObject *ret; int context = WM_OP_EXEC_DEFAULT; @@ -139,8 +139,8 @@ static PyObject *pyop_call(PyObject *UNUSED(self), PyObject *args) PointerRNA ptr; int operator_ret = OPERATOR_CANCELLED; - char *opname; - char *context_str = NULL; + const char *opname; + const char *context_str = NULL; PyObject *kw = NULL; /* optional args */ PyObject *context_dict = NULL; /* optional args */ PyObject *context_dict_back; @@ -310,7 +310,7 @@ static PyObject *pyop_as_string(PyObject *UNUSED(self), PyObject *args) wmOperatorType *ot; PointerRNA ptr; - char *opname; + const char *opname; PyObject *kw = NULL; /* optional args */ int all_args = 1; int macro_args = 1; diff --git a/source/blender/python/intern/bpy_operator_wrap.c b/source/blender/python/intern/bpy_operator_wrap.c index efee9b13d58..11e27ca3e3c 100644 --- a/source/blender/python/intern/bpy_operator_wrap.c +++ b/source/blender/python/intern/bpy_operator_wrap.c @@ -163,7 +163,7 @@ PyObject *PYOP_wrap_macro_define(PyObject *UNUSED(self), PyObject *args) PointerRNA ptr_otmacro; StructRNA *srna; - char *opname; + const char *opname; const char *macroname; if (!PyArg_ParseTuple(args, "Os:_bpy.ops.macro_define", ¯o, &opname)) diff --git a/source/blender/python/intern/bpy_props.c b/source/blender/python/intern/bpy_props.c index b2f9547b81a..6e36680ec4a 100644 --- a/source/blender/python/intern/bpy_props.c +++ b/source/blender/python/intern/bpy_props.c @@ -1881,7 +1881,7 @@ static PyObject *BPy_BoolProperty(PyObject *self, PyObject *args, PyObject *kw) PropertyRNA *prop; PyObject *pyopts = NULL; int opts = 0; - char *pysubtype = NULL; + const char *pysubtype = NULL; int subtype = PROP_NONE; PyObject *update_cb = NULL; PyObject *get_cb = NULL; @@ -1967,7 +1967,7 @@ static PyObject *BPy_BoolVectorProperty(PyObject *self, PyObject *args, PyObject PyObject *pydef = NULL; PyObject *pyopts = NULL; int opts = 0; - char *pysubtype = NULL; + const char *pysubtype = NULL; int subtype = PROP_NONE; PyObject *update_cb = NULL; PyObject *get_cb = NULL; @@ -2062,7 +2062,7 @@ static PyObject *BPy_IntProperty(PyObject *self, PyObject *args, PyObject *kw) PropertyRNA *prop; PyObject *pyopts = NULL; int opts = 0; - char *pysubtype = NULL; + const char *pysubtype = NULL; int subtype = PROP_NONE; PyObject *update_cb = NULL; PyObject *get_cb = NULL; @@ -2154,7 +2154,7 @@ static PyObject *BPy_IntVectorProperty(PyObject *self, PyObject *args, PyObject PyObject *pydef = NULL; PyObject *pyopts = NULL; int opts = 0; - char *pysubtype = NULL; + const char *pysubtype = NULL; int subtype = PROP_NONE; PyObject *update_cb = NULL; PyObject *get_cb = NULL; @@ -2259,9 +2259,9 @@ static PyObject *BPy_FloatProperty(PyObject *self, PyObject *args, PyObject *kw) PropertyRNA *prop; PyObject *pyopts = NULL; int opts = 0; - char *pysubtype = NULL; + const char *pysubtype = NULL; int subtype = PROP_NONE; - char *pyunit = NULL; + const char *pyunit = NULL; int unit = PROP_UNIT_NONE; PyObject *update_cb = NULL; PyObject *get_cb = NULL; @@ -2365,9 +2365,9 @@ static PyObject *BPy_FloatVectorProperty(PyObject *self, PyObject *args, PyObjec PyObject *pydef = NULL; PyObject *pyopts = NULL; int opts = 0; - char *pysubtype = NULL; + const char *pysubtype = NULL; int subtype = PROP_NONE; - char *pyunit = NULL; + const char *pyunit = NULL; int unit = PROP_UNIT_NONE; PyObject *update_cb = NULL; PyObject *get_cb = NULL; @@ -2468,7 +2468,7 @@ static PyObject *BPy_StringProperty(PyObject *self, PyObject *args, PyObject *kw PropertyRNA *prop; PyObject *pyopts = NULL; int opts = 0; - char *pysubtype = NULL; + const char *pysubtype = NULL; int subtype = PROP_NONE; PyObject *update_cb = NULL; PyObject *get_cb = NULL; @@ -2847,7 +2847,7 @@ static PyObject *BPy_RemoveProperty(PyObject *self, PyObject *args, PyObject *kw else { static const char *kwlist[] = {"attr", NULL}; - char *id = NULL; + const char *id = NULL; if (!PyArg_ParseTupleAndKeywords(args, kw, "s:RemoveProperty", diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index cf13efae60e..e0c8df71e4f 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -2171,7 +2171,7 @@ static int pyrna_prop_collection_subscript_str_lib_pair_ptr(BPy_PropertyRNA *sel PointerRNA *r_ptr ) { - char *keyname; + const char *keyname; /* first validate the args, all we know is that they are a tuple */ if (PyTuple_GET_SIZE(key) != 2) { @@ -4883,7 +4883,7 @@ static PyObject *pyrna_param_to_py(PointerRNA *ptr, PropertyRNA *prop, void *dat break; case PROP_STRING: { - char *data_ch; + const char *data_ch; PyObject *value_coerce = NULL; const int subtype = RNA_property_subtype(prop); diff --git a/source/blender/python/intern/bpy_rna_callback.c b/source/blender/python/intern/bpy_rna_callback.c index 9aefe5a733f..87c3a6eb4ef 100644 --- a/source/blender/python/intern/bpy_rna_callback.c +++ b/source/blender/python/intern/bpy_rna_callback.c @@ -182,8 +182,8 @@ PyObject *pyrna_callback_classmethod_add(PyObject *UNUSED(self), PyObject *args) void *handle; PyObject *cls; PyObject *cb_func, *cb_args; - char *cb_regiontype_str; - char *cb_event_str; + const char *cb_regiontype_str; + const char *cb_event_str; int cb_event; int cb_regiontype; StructRNA *srna; @@ -248,7 +248,7 @@ PyObject *pyrna_callback_classmethod_remove(PyObject *UNUSED(self), PyObject *ar void *handle; void *customdata; StructRNA *srna; - char *cb_regiontype_str; + const char *cb_regiontype_str; int cb_regiontype; if (PyTuple_GET_SIZE(args) < 2) { diff --git a/source/blender/python/intern/bpy_util.c b/source/blender/python/intern/bpy_util.c index b0b0f346944..93183a4f320 100644 --- a/source/blender/python/intern/bpy_util.c +++ b/source/blender/python/intern/bpy_util.c @@ -86,7 +86,7 @@ short BPy_errors_to_report(ReportList *reports) { PyObject *pystring; PyObject *pystring_format = NULL; /* workaround, see below */ - char *cstring; + const char *cstring; const char *filename; int lineno; diff --git a/source/blender/python/mathutils/mathutils_geometry.c b/source/blender/python/mathutils/mathutils_geometry.c index 142e5cadfd1..139764abb00 100644 --- a/source/blender/python/mathutils/mathutils_geometry.c +++ b/source/blender/python/mathutils/mathutils_geometry.c @@ -269,7 +269,7 @@ static PyObject *M_Geometry_intersect_sphere_sphere_2d(PyObject *UNUSED(self), P { PyObject *ret; VectorObject *vec_a, *vec_b; - float *v_a, *v_b; + const float *v_a, *v_b; float rad_a, rad_b; float v_ab[2]; float dist; |