kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-20 11:15:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove CH_FOLD macro

Browse Source 
It should not be needed as utf_fold should already work on its own.
This commit is contained in:
dundargoc 2024-07-09 16:34:43 +02:00 committed by dundargoc
parent 4208223175
commit 3c5abf01bf
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/charset.h
View File

@ -7,16 +7,6 @@
#include "nvim/option_vars.h" #include "nvim/option_vars.h"
#include "nvim/strings.h" // IWYU pragma: keep #include "nvim/strings.h" // IWYU pragma: keep
/// Return the folded-case equivalent of the given character
///
/// @param[in] c Character to transform.
///
/// @return Folded variant.
#define CH_FOLD(c) \
utf_fold((sizeof(c) == sizeof(char)) \
? ((int)(uint8_t)(c)) \
: ((int)(c)))
/// Flags for vim_str2nr() /// Flags for vim_str2nr()
typedef enum { typedef enum {
STR2NR_DEC = 0, STR2NR_DEC = 0,

4
src/nvim/path.c
View File

@ -390,14 +390,14 @@ int path_fnamencmp(const char *const fname1, const char *const fname2, size_t le
c2 = utf_ptr2char(p2); c2 = utf_ptr2char(p2);
if ((c1 == NUL || c2 == NUL if ((c1 == NUL || c2 == NUL
|| (!((c1 == '/' || c1 == '\\') && (c2 == '\\' || c2 == '/')))) || (!((c1 == '/' || c1 == '\\') && (c2 == '\\' || c2 == '/'))))
&& (p_fic ? (c1 != c2 && CH_FOLD(c1) != CH_FOLD(c2)) : c1 != c2)) { && (p_fic ? (c1 != c2 && utf_fold(c1) != utf_fold(c2)) : c1 != c2)) {
break; break;
} }
len -= (size_t)utfc_ptr2len(p1); len -= (size_t)utfc_ptr2len(p1);
p1 += utfc_ptr2len(p1); p1 += utfc_ptr2len(p1);
p2 += utfc_ptr2len(p2); p2 += utfc_ptr2len(p2);
} }
return p_fic ? CH_FOLD(c1) - CH_FOLD(c2) : c1 - c2; return p_fic ? utf_fold(c1) - utf_fold(c2) : c1 - c2;
#else #else
if (p_fic) { if (p_fic) {
return mb_strnicmp(fname1, fname2, len); return mb_strnicmp(fname1, fname2, len);