adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 9.1.0828: string_T struct could be used more often

Browse Source 
Problem:  string_T struct could be used more often
Solution: Refactor code and make use of string_T struct
          for key-value pairs, reformat overlong lines
          (John Marriott)

closes: #15975

Signed-off-by: John Marriott <basilisk@internode.on.net>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
John Marriott
2024-11-02 15:59:01 +01:00
committed by Christian Brabandt
parent f1d83c4c71
commit 8d4477ef22
9 changed files with 76 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/highlight.c
View File

@ -869,11 +869,13 @@ highlight_set_termgui_attr(int idx, char_u *key, char_u *arg, int init)
attr = 0;
off = 0;
target.key = 0;
target.length = 0; // not used, see cmp_keyvalue_value_ni()
target.value.length = 0; // not used, see cmp_keyvalue_value_ni()
while (arg[off] != NUL)
{
target.value = (char *)arg + off;
entry = (keyvalue_T *)bsearch(&target, &highlight_tab, ARRAY_LENGTH(highlight_tab), sizeof(highlight_tab[0]), cmp_keyvalue_value_ni);
target.value.string = arg + off;
entry = (keyvalue_T *)bsearch(&target, &highlight_tab,
ARRAY_LENGTH(highlight_tab), sizeof(highlight_tab[0]),
cmp_keyvalue_value_ni);
if (entry == NULL)
{
semsg(_(e_illegal_value_str), arg);
@ -881,7 +883,7 @@ highlight_set_termgui_attr(int idx, char_u *key, char_u *arg, int init)
}
attr |= entry->key;
off += entry->length;
off += entry->value.length;
if (arg[off] == ',') // another one follows
++off;
}
@ -1214,9 +1216,11 @@ highlight_set_cterm_color(
keyvalue_T *entry;
target.key = 0;
target.value = (char *)arg;
target.length = 0; // not used, see cmp_keyvalue_value_i()
entry = (keyvalue_T *)bsearch(&target, &color_name_tab, ARRAY_LENGTH(color_name_tab), sizeof(color_name_tab[0]), cmp_keyvalue_value_i);
target.value.string = arg;
target.value.length = 0; // not used, see cmp_keyvalue_value_i()
entry = (keyvalue_T *)bsearch(&target, &color_name_tab,
ARRAY_LENGTH(color_name_tab), sizeof(color_name_tab[0]),
cmp_keyvalue_value_i);
if (entry == NULL)
{
semsg(_(e_color_name_or_number_not_recognized_str), key_start);
@ -2541,9 +2545,10 @@ gui_get_color_cmn(char_u *name)
return color;
target.key = 0;
target.value = (char *)name;
target.length = 0; // not used, see cmp_keyvalue_value_i()
entry = (keyvalue_T *)bsearch(&target, &rgb_tab, ARRAY_LENGTH(rgb_tab), sizeof(rgb_tab[0]), cmp_keyvalue_value_i);
target.value.string = name;
target.value.length = 0; // not used, see cmp_keyvalue_value_i()
entry = (keyvalue_T *)bsearch(&target, &rgb_tab, ARRAY_LENGTH(rgb_tab),
sizeof(rgb_tab[0]), cmp_keyvalue_value_i);
if (entry != NULL)
return gui_adjust_rgb((guicolor_T)entry->key);
@ -3139,8 +3144,8 @@ highlight_list_arg(
STRCPY(buf + buflen, (char_u *)",");
++buflen;
}
STRCPY(buf + buflen, (char_u *)highlight_index_tab[i]->value);
buflen += highlight_index_tab[i]->length;
STRCPY(buf + buflen, highlight_index_tab[i]->value.string);
buflen += highlight_index_tab[i]->value.length;
iarg &= ~highlight_index_tab[i]->key; // don't want "inverse"/"reverse"
}
}
@ -4236,8 +4241,10 @@ highlight_get_attr_dict(int hlattr)
{
if (hlattr & highlight_index_tab[i]->key)
{
dict_add_bool(dict, highlight_index_tab[i]->value, VVAL_TRUE);
hlattr &= ~highlight_index_tab[i]->key; // don't want "inverse"/"reverse"
dict_add_bool(dict, (char *)highlight_index_tab[i]->value.string,
VVAL_TRUE);
// don't want "inverse"/"reverse"
hlattr &= ~highlight_index_tab[i]->key;
}
}
@ -4478,14 +4485,15 @@ hldict_attr_to_str(
p = attr_str;
for (i = 0; i < (int)ARRAY_LENGTH(highlight_tab); ++i)
{
if (dict_get_bool(attrdict, highlight_tab[i].value, VVAL_FALSE) == VVAL_TRUE)
if (dict_get_bool(attrdict, (char *)highlight_tab[i].value.string,
VVAL_FALSE) == VVAL_TRUE)
{
if (p != attr_str && (size_t)(p - attr_str + 2) < len)
STRCPY(p, (char_u *)",");
if (p - attr_str + highlight_tab[i].length + 1 < len)
if (p - attr_str + highlight_tab[i].value.length + 1 < len)
{
STRCPY(p, highlight_tab[i].value);
p += highlight_tab[i].length;
STRCPY(p, highlight_tab[i].value.string);
p += highlight_tab[i].value.length;
}
}
}