patch 8.2.0559: clearing a struct is verbose
Problem: Clearing a struct is verbose.
Solution: Define and use CLEAR_FIELD() and CLEAR_POINTER().
diff --git a/src/highlight.c b/src/highlight.c
index 9f8bfbc..ee2e437 100644
--- a/src/highlight.c
+++ b/src/highlight.c
@@ -2141,7 +2141,7 @@
return 0;
taep = &(((attrentry_T *)table->ga_data)[table->ga_len]);
- vim_memset(taep, 0, sizeof(attrentry_T));
+ CLEAR_POINTER(taep);
taep->ae_attr = aep->ae_attr;
#ifdef FEAT_GUI
if (table == &gui_attr_table)
@@ -2189,7 +2189,7 @@
{
attrentry_T at_en;
- vim_memset(&at_en, 0, sizeof(attrentry_T));
+ CLEAR_FIELD(at_en);
#ifdef FEAT_TERMGUICOLORS
at_en.ae_u.cterm.fg_rgb = INVALCOLOR;
at_en.ae_u.cterm.bg_rgb = INVALCOLOR;
@@ -2211,7 +2211,7 @@
{
attrentry_T at_en;
- vim_memset(&at_en, 0, sizeof(attrentry_T));
+ CLEAR_FIELD(at_en);
at_en.ae_attr = attr;
if (fg == INVALCOLOR && bg == INVALCOLOR)
{
@@ -2239,7 +2239,7 @@
{
attrentry_T at_en;
- vim_memset(&at_en, 0, sizeof(attrentry_T));
+ CLEAR_FIELD(at_en);
at_en.ae_attr = attr;
at_en.ae_u.gui.fg_color = fg;
at_en.ae_u.gui.bg_color = bg;
@@ -2298,7 +2298,7 @@
new_en = *char_aep;
else
{
- vim_memset(&new_en, 0, sizeof(new_en));
+ CLEAR_FIELD(new_en);
new_en.ae_u.gui.fg_color = INVALCOLOR;
new_en.ae_u.gui.bg_color = INVALCOLOR;
new_en.ae_u.gui.sp_color = INVALCOLOR;
@@ -2341,7 +2341,7 @@
new_en = *char_aep;
else
{
- vim_memset(&new_en, 0, sizeof(new_en));
+ CLEAR_FIELD(new_en);
#ifdef FEAT_TERMGUICOLORS
new_en.ae_u.cterm.bg_rgb = INVALCOLOR;
new_en.ae_u.cterm.fg_rgb = INVALCOLOR;
@@ -2393,7 +2393,7 @@
new_en = *char_aep;
else
{
- vim_memset(&new_en, 0, sizeof(new_en));
+ CLEAR_FIELD(new_en);
if (char_attr <= HL_ALL)
new_en.ae_attr = char_attr;
}
@@ -3062,7 +3062,7 @@
return 0;
}
- vim_memset(&(HL_TABLE()[highlight_ga.ga_len]), 0, sizeof(hl_group_T));
+ CLEAR_POINTER(&(HL_TABLE()[highlight_ga.ga_len]));
HL_TABLE()[highlight_ga.ga_len].sg_name = name;
HL_TABLE()[highlight_ga.ga_len].sg_name_u = name_up;
#if defined(FEAT_GUI) || defined(FEAT_TERMGUICOLORS)
@@ -3262,7 +3262,7 @@
if (id_alt == 0)
{
- vim_memset(&hlt[hlcnt + i], 0, sizeof(hl_group_T));
+ CLEAR_POINTER(&hlt[hlcnt + i]);
hlt[hlcnt + i].sg_term = highlight_attr[hlf];
hlt[hlcnt + i].sg_cterm = highlight_attr[hlf];
# if defined(FEAT_GUI) || defined(FEAT_EVAL)
@@ -3457,7 +3457,7 @@
{
// Make sure id_S is always valid to simplify code below. Use the last
// entry.
- vim_memset(&HL_TABLE()[hlcnt + 27], 0, sizeof(hl_group_T));
+ CLEAR_POINTER(&HL_TABLE()[hlcnt + 27]);
HL_TABLE()[hlcnt + 18].sg_term = highlight_attr[HLF_S];
id_S = hlcnt + 19;
}