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/intern | |
parent | 483d8da9bcfa1eeef950ba45633c5fb49fb7f93b (diff) |
Code cleanup: use 'const' for arrays (python)
Diffstat (limited to 'source/blender/python/intern')
-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 |
7 files changed, 25 insertions, 25 deletions
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; |