[Bf-blender-cvs] [c5aaa11c3bf] master: Cleanup: declare variables when used (bpy)
Campbell Barton
noreply at git.blender.org
Thu Dec 10 07:03:55 CET 2020
Commit: c5aaa11c3bfc98a168128971f1e85a014efba07f
Author: Campbell Barton
Date: Thu Dec 10 14:12:55 2020 +1100
Branches: master
https://developer.blender.org/rBc5aaa11c3bfc98a168128971f1e85a014efba07f
Cleanup: declare variables when used (bpy)
===================================================================
M source/blender/python/intern/bpy.c
===================================================================
diff --git a/source/blender/python/intern/bpy.c b/source/blender/python/intern/bpy.c
index bd2f40569f6..6462f8320d7 100644
--- a/source/blender/python/intern/bpy.c
+++ b/source/blender/python/intern/bpy.c
@@ -260,25 +260,19 @@ PyDoc_STRVAR(bpy_escape_identifier_doc,
" :rtype: string\n");
static PyObject *bpy_escape_identifier(PyObject *UNUSED(self), PyObject *value)
{
- const char *value_str;
Py_ssize_t value_str_len;
-
- char *value_escape_str;
- Py_ssize_t value_escape_str_len;
- PyObject *value_escape;
- size_t size;
-
- value_str = _PyUnicode_AsStringAndSize(value, &value_str_len);
+ const char *value_str = _PyUnicode_AsStringAndSize(value, &value_str_len);
if (value_str == NULL) {
PyErr_SetString(PyExc_TypeError, "expected a string");
return NULL;
}
- size = (value_str_len * 2) + 1;
- value_escape_str = PyMem_MALLOC(size);
- value_escape_str_len = BLI_str_escape(value_escape_str, value_str, size);
+ const size_t size = (value_str_len * 2) + 1;
+ char *value_escape_str = PyMem_MALLOC(size);
+ const Py_ssize_t value_escape_str_len = BLI_str_escape(value_escape_str, value_str, size);
+ PyObject *value_escape;
if (value_escape_str_len == value_str_len) {
Py_INCREF(value);
value_escape = value;
@@ -304,25 +298,19 @@ PyDoc_STRVAR(bpy_unescape_identifier_doc,
" :rtype: string\n");
static PyObject *bpy_unescape_identifier(PyObject *UNUSED(self), PyObject *value)
{
- const char *value_str;
Py_ssize_t value_str_len;
-
- char *value_unescape_str;
- Py_ssize_t value_unescape_str_len;
- PyObject *value_unescape;
- size_t size;
-
- value_str = _PyUnicode_AsStringAndSize(value, &value_str_len);
+ const char *value_str = _PyUnicode_AsStringAndSize(value, &value_str_len);
if (value_str == NULL) {
PyErr_SetString(PyExc_TypeError, "expected a string");
return NULL;
}
- size = value_str_len + 1;
- value_unescape_str = PyMem_MALLOC(size);
- value_unescape_str_len = BLI_str_unescape(value_unescape_str, value_str, size);
+ const size_t size = value_str_len + 1;
+ char *value_unescape_str = PyMem_MALLOC(size);
+ const Py_ssize_t value_unescape_str_len = BLI_str_unescape(value_unescape_str, value_str, size);
+ PyObject *value_unescape;
if (value_unescape_str_len == value_str_len) {
Py_INCREF(value);
value_unescape = value;
More information about the Bf-blender-cvs
mailing list