ilusha/blender
1
0
Fork 0
mirror of https://github.com/blender/blender synced 2026-09-29 04:37:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

RNA: use memcpy for copying strings when the length is known

Browse source 
There is no advantage in using BLI_strncpy/BLI_strncpy_utf8 when the
destination string has been allocated and won't be concatenated.

Also no need to calloc memory which is filled by strcpy afterwards.
This commit is contained in:
Campbell Barton 2023-05-05 15:33:18 +10:00
parent c80e9641ed
commit 70cd2a9741
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
source/blender/blenlib/intern/fileops.c
View file

@ -1309,7 +1309,7 @@ bool BLI_dir_create_recursive(const char *dirname)
tmp = static_buf;
# else
size = strlen(dirname) + 1;
tmp = MEM_callocN(size, __func__);
tmp = MEM_mallocN(size, __func__);
# endif
BLI_strncpy(tmp, dirname, size);

11
source/blender/makesrna/intern/makesrna.c
View file

@ -1151,11 +1151,6 @@ static char *rna_def_property_set_func(
}
else {
const PropertySubType subtype = prop->subtype;
const char *string_copy_func =
ELEM(subtype, PROP_FILEPATH, PROP_DIRPATH, PROP_FILENAME, PROP_BYTESTRING) ?
"BLI_strncpy" :
"BLI_strncpy_utf8";
rna_print_data_get(f, dp);
if (dp->dnapointerlevel == 1) {
@ -1165,10 +1160,14 @@ static char *rna_def_property_set_func(
fprintf(f, " const int length = strlen(value);\n");
fprintf(f, " if (length > 0) {\n");
fprintf(f, " data->%s = MEM_mallocN(length + 1, __func__);\n", dp->dnaname);
fprintf(f, " %s(data->%s, value, length + 1);\n", string_copy_func, dp->dnaname);
fprintf(f, " memcpy(data->%s, value, length + 1);\n", dp->dnaname);
fprintf(f, " } else { data->%s = NULL; }\n", dp->dnaname);
}
else {
const char *string_copy_func =
ELEM(subtype, PROP_FILEPATH, PROP_DIRPATH, PROP_FILENAME, PROP_BYTESTRING) ?
"BLI_strncpy" :
"BLI_strncpy_utf8";
/* Handle char array properties. */
if (sprop->maxlength) {
fprintf(f,