patch 9.1.1184: Unnecessary use of vim_tolower() in vim_strnicmp_asc()
Commit:
https://github.com/vim/vim/commit/b7dc5d3b6169efc8aa0b9d86476072877e74bc2c
Author: zeertzjq <[email protected]>
Date: Sat Mar 8 16:42:48 2025 +0100
patch 9.1.1184: Unnecessary use of vim_tolower() in vim_strnicmp_asc()
Problem: Unnecessary use of vim_tolower() in vim_strnicmp_asc().
Solution: Use TOLOWER_ASC() instead (zeertzjq).
It was passing *s1 and *s2 to vim_tolower(). When char is signed, which
is the case on most platforms, c < 0x80 is always true, so it already
behaves the same as TOLOWER_ASC().
closes: #16826
Signed-off-by: zeertzjq <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/src/strings.c b/src/strings.c
index 9e39c45ac..640ad39a8 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -598,12 +598,10 @@ vim_strnicmp(char *s1, char *s2, size_t len)
vim_strnicmp_asc(char *s1, char *s2, size_t len)
{
int i = 0;
- int save_cmp_flags = cmp_flags;
- cmp_flags |= CMP_KEEPASCII; // compare by ASCII value,
ignoring locale
while (len > 0)
{
- i = vim_tolower(*s1) - vim_tolower(*s2);
+ i = TOLOWER_ASC(*s1) - TOLOWER_ASC(*s2);
if (i != 0)
break; // this character is different
if (*s1 == NUL)
@@ -612,7 +610,6 @@ vim_strnicmp_asc(char *s1, char *s2, size_t len)
++s2;
--len;
}
- cmp_flags = save_cmp_flags;
return i;
}
diff --git a/src/version.c b/src/version.c
index 2e6ae1f33..8223d0c2b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1184,
/**/
1183,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1tqwMI-00FzDs-UM%40256bit.org.
