[Bf-blender-cvs] [083a8921ec6] master: Fix strict warning about discarding const qualifier

Sergey Sharybin noreply at git.blender.org
Wed Sep 1 17:41:09 CEST 2021


Commit: 083a8921ec6bfca8e64a94fe98289b206066d796
Author: Sergey Sharybin
Date:   Wed Sep 1 16:57:50 2021 +0200
Branches: master
https://developer.blender.org/rB083a8921ec6bfca8e64a94fe98289b206066d796

Fix strict warning about discarding const qualifier

Solved by using const qualifier for arguments which aren't mutable
in PyC functions.

Differential Revision: https://developer.blender.org/D12369

===================================================================

M	source/blender/python/generic/py_capi_utils.c
M	source/blender/python/generic/py_capi_utils.h

===================================================================

diff --git a/source/blender/python/generic/py_capi_utils.c b/source/blender/python/generic/py_capi_utils.c
index 51e20a31ba8..9dac5a4f21f 100644
--- a/source/blender/python/generic/py_capi_utils.c
+++ b/source/blender/python/generic/py_capi_utils.c
@@ -1362,7 +1362,7 @@ void *PyC_RNA_AsPointer(PyObject *value, const char *type_name)
  * Convert to/from Python set of strings to an int flag.
  * \{ */
 
-PyObject *PyC_FlagSet_AsString(PyC_FlagSet *item)
+PyObject *PyC_FlagSet_AsString(const PyC_FlagSet *item)
 {
   PyObject *py_items = PyList_New(0);
   for (; item->identifier; item++) {
@@ -1373,7 +1373,7 @@ PyObject *PyC_FlagSet_AsString(PyC_FlagSet *item)
   return py_string;
 }
 
-int PyC_FlagSet_ValueFromID_int(PyC_FlagSet *item, const char *identifier, int *r_value)
+int PyC_FlagSet_ValueFromID_int(const PyC_FlagSet *item, const char *identifier, int *r_value)
 {
   for (; item->identifier; item++) {
     if (STREQ(item->identifier, identifier)) {
@@ -1385,7 +1385,7 @@ int PyC_FlagSet_ValueFromID_int(PyC_FlagSet *item, const char *identifier, int *
   return 0;
 }
 
-int PyC_FlagSet_ValueFromID(PyC_FlagSet *item,
+int PyC_FlagSet_ValueFromID(const PyC_FlagSet *item,
                             const char *identifier,
                             int *r_value,
                             const char *error_prefix)
@@ -1401,7 +1401,7 @@ int PyC_FlagSet_ValueFromID(PyC_FlagSet *item,
   return 0;
 }
 
-int PyC_FlagSet_ToBitfield(PyC_FlagSet *items,
+int PyC_FlagSet_ToBitfield(const PyC_FlagSet *items,
                            PyObject *value,
                            int *r_value,
                            const char *error_prefix)
diff --git a/source/blender/python/generic/py_capi_utils.h b/source/blender/python/generic/py_capi_utils.h
index bfe0e66e393..a8695d2330a 100644
--- a/source/blender/python/generic/py_capi_utils.h
+++ b/source/blender/python/generic/py_capi_utils.h
@@ -119,13 +119,13 @@ typedef struct PyC_FlagSet {
   const char *identifier;
 } PyC_FlagSet;
 
-PyObject *PyC_FlagSet_AsString(PyC_FlagSet *item);
-int PyC_FlagSet_ValueFromID_int(PyC_FlagSet *item, const char *identifier, int *r_value);
-int PyC_FlagSet_ValueFromID(PyC_FlagSet *item,
+PyObject *PyC_FlagSet_AsString(const PyC_FlagSet *item);
+int PyC_FlagSet_ValueFromID_int(const PyC_FlagSet *item, const char *identifier, int *r_value);
+int PyC_FlagSet_ValueFromID(const PyC_FlagSet *item,
                             const char *identifier,
                             int *r_value,
                             const char *error_prefix);
-int PyC_FlagSet_ToBitfield(PyC_FlagSet *items,
+int PyC_FlagSet_ToBitfield(const PyC_FlagSet *items,
                            PyObject *value,
                            int *r_value,
                            const char *error_prefix);



More information about the Bf-blender-cvs mailing list