thac0/vim
1
0
Fork 0
forked from aniani/vim
Code 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

13
src/misc2.c
View File

@@ -3077,7 +3077,7 @@ cmp_keyvalue_value(const void *a, const void *b)
keyvalue_T *kv1 = (keyvalue_T *)a;
keyvalue_T *kv2 = (keyvalue_T *)b;
return STRCMP(kv1->value, kv2->value);
return STRCMP(kv1->value.string, kv2->value.string);
}
// compare two keyvalue_T structs by value with length
@@ -3087,7 +3087,8 @@ cmp_keyvalue_value_n(const void *a, const void *b)
keyvalue_T *kv1 = (keyvalue_T *)a;
keyvalue_T *kv2 = (keyvalue_T *)b;
return STRNCMP(kv1->value, kv2->value, MAX(kv1->length, kv2->length));
return STRNCMP(kv1->value.string, kv2->value.string, MAX(kv1->value.length,
kv2->value.length));
}
// compare two keyvalue_T structs by case insensitive value
@@ -3097,17 +3098,19 @@ cmp_keyvalue_value_i(const void *a, const void *b)
keyvalue_T *kv1 = (keyvalue_T *)a;
keyvalue_T *kv2 = (keyvalue_T *)b;
return STRICMP(kv1->value, kv2->value);
return STRICMP(kv1->value.string, kv2->value.string);
}
// compare two keyvalue_T structs by case insensitive ASCII value
// with length
// with value.length
int
cmp_keyvalue_value_ni(const void *a, const void *b)
{
keyvalue_T *kv1 = (keyvalue_T *)a;
keyvalue_T *kv2 = (keyvalue_T *)b;
return vim_strnicmp_asc(kv1->value, kv2->value, MAX(kv1->length, kv2->length));
return vim_strnicmp_asc((char *)kv1->value.string,
(char *)kv2->value.string, MAX(kv1->value.length,
kv2->value.length));
}