dillongoostudios/goo-engine
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup: Use BLI string functions

Browse Source 
It's better not to assume that strings passed as arguments
will have the proper size.
This commit is contained in:
Hans Goudey
2020-10-19 09:17:41 -05:00
parent 9bf1bf599b
commit 7ef3a63480
3 changed files with 33 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/blender/gpencil_modifiers/intern/MOD_gpencil_ui_common.c
+11 -14
View File
@@ -17,9 +17,8 @@
* \ingroup modifiers
*/
#include <string.h>
#include "BLI_listbase.h"
#include "BLI_string.h"
#include "MEM_guardedalloc.h"
@@ -373,10 +372,10 @@ PanelType *gpencil_modifier_panel_register(ARegionType *region_type,
PanelType *panel_type = MEM_callocN(sizeof(PanelType), panel_idname);
strcpy(panel_type->idname, panel_idname);
strcpy(panel_type->label, "");
strcpy(panel_type->context, "modifier");
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, "modifier", BKE_ST_MAXNAME);
BLI_strncpy(panel_type->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA, BKE_ST_MAXNAME);
panel_type->draw_header = gpencil_modifier_panel_header;
panel_type->draw = draw;
@@ -409,16 +408,14 @@ PanelType *gpencil_modifier_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, "modifier");
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, "modifier", 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;
@@ -426,7 +423,7 @@ PanelType *gpencil_modifier_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(&region_type->paneltypes, panel_type);
source/blender/modifiers/intern/MOD_ui_common.c
+11 -14
View File
@@ -17,9 +17,8 @@
* \ingroup modifiers
*/
#include <string.h>
#include "BLI_listbase.h"
#include "BLI_string.h"
#include "MEM_guardedalloc.h"
@@ -406,10 +405,10 @@ PanelType *modifier_panel_register(ARegionType *region_type, ModifierType type,
PanelType *panel_type = MEM_callocN(sizeof(PanelType), panel_idname);
strcpy(panel_type->idname, panel_idname);
strcpy(panel_type->label, "");
strcpy(panel_type->context, "modifier");
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, "modifier", BKE_ST_MAXNAME);
BLI_strncpy(panel_type->translation_context, BLT_I18NCONTEXT_DEFAULT_BPYRNA, BKE_ST_MAXNAME);
panel_type->draw_header = modifier_panel_header;
panel_type->draw = draw;
@@ -442,16 +441,14 @@ PanelType *modifier_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, "modifier");
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, "modifier", 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;
@@ -459,7 +456,7 @@ PanelType *modifier_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(&region_type->paneltypes, panel_type);
source/blender/shader_fx/intern/FX_ui_common.c
+11 -14
View File
@@ -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(&region_type->paneltypes, panel_type);