mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-14 23:38:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

*: Fix some Windows-specific warnings

Browse Source 
Also fixed an error in path_fnamecmp().
This commit is contained in:
ZyX
2016-11-05 01:03:44 +03:00
parent 9ed9af7e11
commit 4bcee96347
10 changed files with 122 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/nvim/path.c
View File

@@ -312,7 +312,7 @@ int path_fnamecmp(const char *fname1, const char *fname2)
///
/// @return 0 if they are equal, non-zero otherwise.
int path_fnamencmp(const char *const fname1, const char *const fname2,
const size_t len)
size_t len)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_PURE FUNC_ATTR_WARN_UNUSED_RESULT
{
#ifdef BACKSLASH_IN_FILENAME
@@ -322,16 +322,16 @@ int path_fnamencmp(const char *const fname1, const char *const fname2,
const char *p1 = fname1;
const char *p2 = fname2;
while (len > 0) {
c1 = PTR2CHAR(p1);
c2 = PTR2CHAR(p2);
if (c1 == NUL || c2 == NUL
|| (!((c1 == '/' || c1 == '\\') && (c2 == '\\' || c2 == '/')))
|| (p_fic ? (c1 != c2 && CH_FOLD(c1) != CH_FOLD(c2)) : c1 != c2)) {
c1 = PTR2CHAR((const char_u *)p1);
c2 = PTR2CHAR((const char_u *)p2);
if ((c1 == NUL || c2 == NUL
|| (!((c1 == '/' || c1 == '\\') && (c2 == '\\' || c2 == '/'))))
&& (p_fic ? (c1 != c2 && CH_FOLD(c1) != CH_FOLD(c2)) : c1 != c2)) {
break;
}
len -= MB_PTR2LEN(p1);
p1 += MB_PTR2LEN(p1);
p2 += MB_PTR2LEN(p2);
len -= MB_PTR2LEN((const char_u *)p1);
p1 += MB_PTR2LEN((const char_u *)p1);
p2 += MB_PTR2LEN((const char_u *)p2);
}
return c1 - c2;
#else
@@ -819,7 +819,7 @@ static void expand_path_option(char_u *curdir, garray_T *gap)
}
STRMOVE(buf + len + 1, buf);
STRCPY(buf, curdir);
buf[len] = PATHSEP;
buf[len] = (char_u)PATHSEP;
simplify_filename(buf);
}
@@ -1333,12 +1333,12 @@ static int expand_backtick(
/// When the path looks like a URL leave it unmodified.
void slash_adjust(char_u *p)
{
if (path_with_url(p)) {
if (path_with_url((const char *)p)) {
return;
}
while (*p) {
if (*p == psepcN) {
*p = psepc;
if (*p == (char_u)psepcN) {
*p = (char_u)psepc;
}
mb_ptr_adv(p);
}