diff options
author | Hans Goudey <h.goudey@me.com> | 2020-10-19 17:17:41 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2020-10-19 17:17:41 +0300 |
commit | 7ef3a634808c1b3c9284d8f8253ca1b4c1d34eb3 (patch) | |
tree | 3849f782db765572dc1beb58cbefb8da9152fc0d /source/blender/shader_fx/intern | |
parent | 9bf1bf599b46fe020cf1ae660a2fe4946146ecbd (diff) |
Cleanup: Use BLI string functions
It's better not to assume that strings passed as arguments
will have the proper size.
Diffstat (limited to 'source/blender/shader_fx/intern')
-rw-r--r-- | source/blender/shader_fx/intern/FX_ui_common.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/source/blender/shader_fx/intern/FX_ui_common.c b/source/blender/shader_fx/intern/FX_ui_common.c index a76f97d7baa..87402877281 100644 --- a/source/blender/shader_fx/intern/FX_ui_common.c +++ b/source/blender/shader_fx/intern/FX_ui_common.c @@ -17,9 +17,8 @@ * \ingroup modifiers */ -#include <string.h> - #include "BLI_listbase.h" +#include "BLI_string.h" #include "MEM_guardedalloc.h" @@ -193,10 +192,10 @@ PanelType *shaderfx_panel_register(ARegionType *region_type, ShaderFxType type, PanelType *panel_type = MEM_callocN(sizeof(PanelType), panel_idname); - strcpy(panel_type->idname, panel_idname); - strcpy(panel_type->label, ""); - strcpy(panel_type->context, "shaderfx"); - strcpy(panel_type->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA); + BLI_strncpy(panel_type->idname, panel_idname, BKE_ST_MAXNAME); + BLI_strncpy(panel_type->label, "", BKE_ST_MAXNAME); + BLI_strncpy(panel_type->context, "shaderfx", BKE_ST_MAXNAME); + BLI_strncpy(panel_type->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA, BKE_ST_MAXNAME); panel_type->draw_header = shaderfx_panel_header; panel_type->draw = draw; @@ -229,16 +228,14 @@ PanelType *shaderfx_subpanel_register(ARegionType *region_type, { /* Create the subpanel's ID name. */ char panel_idname[BKE_ST_MAXNAME]; - strcpy(panel_idname, parent->idname); - strcat(panel_idname, "_"); - strcat(panel_idname, name); + BLI_snprintf(panel_idname, BKE_ST_MAXNAME, "%s_%s", parent->idname, name); PanelType *panel_type = MEM_callocN(sizeof(PanelType), panel_idname); - strcpy(panel_type->idname, panel_idname); - strcpy(panel_type->label, label); - strcpy(panel_type->context, "shaderfx"); - strcpy(panel_type->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA); + BLI_strncpy(panel_type->idname, panel_idname, BKE_ST_MAXNAME); + BLI_strncpy(panel_type->label, label, BKE_ST_MAXNAME); + BLI_strncpy(panel_type->context, "shaderfx", BKE_ST_MAXNAME); + BLI_strncpy(panel_type->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA, BKE_ST_MAXNAME); panel_type->draw_header = draw_header; panel_type->draw = draw; @@ -246,7 +243,7 @@ PanelType *shaderfx_subpanel_register(ARegionType *region_type, panel_type->flag = (PNL_DEFAULT_CLOSED | PNL_DRAW_BOX); BLI_assert(parent != NULL); - strcpy(panel_type->parent_id, parent->idname); + BLI_strncpy(panel_type->parent_id, parent->idname, BKE_ST_MAXNAME); panel_type->parent = parent; BLI_addtail(&parent->children, BLI_genericNodeN(panel_type)); BLI_addtail(®ion_type->paneltypes, panel_type); |