archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: use STRNCPY, SNPRINTF macros

Browse Source
This commit is contained in:
Campbell Barton
2023-05-09 12:50:37 +10:00
parent 2f9538a8c7
commit 3958ae7241
402 changed files with 1550 additions and 1822 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/python/generic/imbuf_py_api.c
View File

@@ -496,7 +496,7 @@ static PyObject *M_imbuf_load(PyObject *UNUSED(self), PyObject *args, PyObject *
return NULL;
}
BLI_strncpy(ibuf->filepath, filepath, sizeof(ibuf->filepath));
STRNCPY(ibuf->filepath, filepath);
return Py_ImBuf_CreatePyObject(ibuf);
}

4
source/blender/python/gpu/gpu_py_shader_create_info.cc
View File

@@ -794,9 +794,7 @@ static PyObject *pygpu_shader_info_push_constant(BPyGPUShaderCreateInfo *self,
#define VULKAN_LIMIT 128
int size = constants_calc_size(info);
if (size > VULKAN_LIMIT) {
printf("Push constants have a minimum supported size of "
STRINGIFY(VULKAN_LIMIT)
" bytes, however the constants added so far already reach %d bytes. Consider using UBO.\n", size);
printf("Push constants have a minimum supported size of " STRINGIFY(VULKAN_LIMIT) " bytes, however the constants added so far already reach %d bytes. Consider using UBO.\n", size);
}
#undef VULKAN_LIMIT

2
source/blender/python/intern/bpy_app_translations.c
View File

@@ -267,7 +267,7 @@ const char *BPY_app_translations_py_pgettext(const char *msgctxt, const char *ms
if (!STREQ(tmp, locale) || !_translations_cache) {
PyGILState_STATE _py_state;
BLI_strncpy(locale, tmp, STATIC_LOCALE_SIZE);
STRNCPY(locale, tmp);
/* Locale changed or cache does not exist, refresh the whole cache! */
/* This func may be called from C (i.e. outside of python interpreter 'context'). */

4
source/blender/python/intern/bpy_driver.c
View File

@@ -598,7 +598,7 @@ float BPY_driver_exec(struct PathResolvedRNA *anim_rna,
if (!(G.f & G_FLAG_SCRIPT_AUTOEXEC)) {
if (!(G.f & G_FLAG_SCRIPT_AUTOEXEC_FAIL_QUIET)) {
G.f |= G_FLAG_SCRIPT_AUTOEXEC_FAIL;
BLI_snprintf(G.autoexec_fail, sizeof(G.autoexec_fail), "Driver '%s'", expr);
SNPRINTF(G.autoexec_fail, "Driver '%s'", expr);
printf("skipping driver '%s', automatic scripts are disabled\n", expr);
}
@@ -759,7 +759,7 @@ float BPY_driver_exec(struct PathResolvedRNA *anim_rna,
{
if (!(G.f & G_FLAG_SCRIPT_AUTOEXEC_FAIL_QUIET)) {
G.f |= G_FLAG_SCRIPT_AUTOEXEC_FAIL;
BLI_snprintf(G.autoexec_fail, sizeof(G.autoexec_fail), "Driver '%s'", expr);
SNPRINTF(G.autoexec_fail, "Driver '%s'", expr);
}
Py_DECREF(expr_code);

2
source/blender/python/intern/bpy_interface.c
View File

@@ -656,7 +656,7 @@ void BPY_modules_load_user(bContext *C)
if (!(G.f & G_FLAG_SCRIPT_AUTOEXEC)) {
if (!(G.f & G_FLAG_SCRIPT_AUTOEXEC_FAIL_QUIET)) {
G.f |= G_FLAG_SCRIPT_AUTOEXEC_FAIL;
BLI_snprintf(G.autoexec_fail, sizeof(G.autoexec_fail), "Text '%s'", text->id.name + 2);
SNPRINTF(G.autoexec_fail, "Text '%s'", text->id.name + 2);
printf("scripts disabled for \"%s\", skipping '%s'\n",
BKE_main_blendfile_path(bmain),

8
source/blender/python/intern/bpy_library_load.c
View File

@@ -241,8 +241,8 @@ static PyObject *bpy_lib_load(BPy_PropertyRNA *self, PyObject *args, PyObject *k
ret = PyObject_New(BPy_Library, &bpy_lib_Type);
BLI_strncpy(ret->relpath, filepath, sizeof(ret->relpath));
BLI_strncpy(ret->abspath, filepath, sizeof(ret->abspath));
STRNCPY(ret->relpath, filepath);
STRNCPY(ret->abspath, filepath);
BLI_path_abs(ret->abspath, BKE_main_blendfile_path(bmain));
ret->bmain = bmain;
@@ -324,8 +324,8 @@ static PyObject *bpy_lib_enter(BPy_Library *self)
/* create a dummy */
self_from = PyObject_New(BPy_Library, &bpy_lib_Type);
BLI_strncpy(self_from->relpath, self->relpath, sizeof(self_from->relpath));
BLI_strncpy(self_from->abspath, self->abspath, sizeof(self_from->abspath));
STRNCPY(self_from->relpath, self->relpath);
STRNCPY(self_from->abspath, self->abspath);
self_from->blo_handle = NULL;
self_from->flag = 0;

2
source/blender/python/intern/bpy_library_write.c
View File

@@ -117,7 +117,7 @@ static PyObject *bpy_lib_write(BPy_PropertyRNA *self, PyObject *args, PyObject *
write_flags |= G_FILE_COMPRESS;
}
BLI_strncpy(filepath_abs, filepath, FILE_MAX);
STRNCPY(filepath_abs, filepath);
BLI_path_abs(filepath_abs, BKE_main_blendfile_path_from_global());
BKE_blendfile_write_partial_begin(bmain_src);

4
source/blender/python/intern/bpy_rna_array.c
View File

@@ -192,8 +192,8 @@ static int validate_array_type(PyObject *seq,
Py_DECREF(item);
#if 0
BLI_snprintf(
error_str, error_str_size, "sequence items should be of type %s", item_type_str);
SNPRINTF(
error_str, "sequence items should be of type %s", item_type_str);
#endif
PyErr_Format(PyExc_TypeError,
"%s expected sequence items of type %s, not %s",

3
source/blender/python/mathutils/mathutils_Matrix.c
View File

@@ -2288,8 +2288,7 @@ static PyObject *Matrix_str(MatrixObject *self)
for (col = 0; col < self->col_num; col++) {
maxsize[col] = 0;
for (row = 0; row < self->row_num; row++) {
const int size = BLI_snprintf_rlen(
dummy_buf, sizeof(dummy_buf), "%.4f", MATRIX_ITEM(self, row, col));
const int size = SNPRINTF_RLEN(dummy_buf, "%.4f", MATRIX_ITEM(self, row, col));
maxsize[col] = max_ii(maxsize[col], size);
}
}