aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/strings.c
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2025-02-05 07:06:33 +0800
committerGitHub <noreply@github.com>2025-02-05 07:06:33 +0800
commit1deb580977f4144ff3e4704765d13684e84405c5 (patch)
treecab8cc404eb779d5346c3251a30adf5d56390085 /src/nvim/strings.c
parent4317d366691b057ffba4504c1167128a66e4e5c8 (diff)
downloadrneovim-1deb580977f4144ff3e4704765d13684e84405c5.tar.gz
rneovim-1deb580977f4144ff3e4704765d13684e84405c5.tar.bz2
rneovim-1deb580977f4144ff3e4704765d13684e84405c5.zip
vim-patch:9.1.1076: vim_strnchr() is strange and unnecessary (#32327)
Problem: vim_strnchr() is strange and unnecessary (after v9.1.1009) Solution: Remove vim_strnchr() and use memchr() instead. Also remove a comment referencing an #if that is no longer present. vim_strnchr() is strange in several ways: - It's named like vim_strchr(), but unlike vim_strchr() it doesn't support finding a multibyte char. - Its logic is similar to vim_strbyte(), but unlike vim_strbyte() it uses char instead of char_u. - It takes a pointer as its size argument, which isn't convenient for all its callers. - It allows embedded NULs, unlike other "strn*" functions which stop when encountering a NUL byte. In comparison, memchr() also allows embedded NULs, and it converts bytes in the string to (unsigned char). closes: vim/vim#16579 https://github.com/vim/vim/commit/34e1e8de91ff4a8922d454e3147ea425784aa0a0
Diffstat (limited to 'src/nvim/strings.c')
-rw-r--r--src/nvim/strings.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/src/nvim/strings.c b/src/nvim/strings.c
index 7505eaba64..818e67b32d 100644
--- a/src/nvim/strings.c
+++ b/src/nvim/strings.c
@@ -498,20 +498,6 @@ char *vim_strchr(const char *const string, const int c)
}
}
-// Sized version of strchr that can handle embedded NULs.
-// Adjusts n to the new size.
-char *strnchr(const char *p, size_t *n, int c)
-{
- while (*n > 0) {
- if (*p == c) {
- return (char *)p;
- }
- p++;
- (*n)--;
- }
- return NULL;
-}
-
// Sort an array of strings.
static int sort_compare(const void *s1, const void *s2)