patch 9.1.0828: string_T struct could be used more often
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>
diff --git a/src/misc2.c b/src/misc2.c
index 31feebf..dc0d83f 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -3077,7 +3077,7 @@
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 @@
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 @@
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));
}