IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove char_u: path_is_url()

Browse Source
This commit is contained in:
Mark Bainter 2015-04-20 13:33:08 +00:00
parent 1f76857232
commit 3128ff3798
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/nvim/path.c
View File

@ -1521,16 +1521,14 @@ find_file_name_in_path (
return file_name; return file_name;
} }
/* // Check if the "://" of a URL is at the pointer, return URL_SLASH.
* Check if the "://" of a URL is at the pointer, return URL_SLASH. // Also check for ":\\", which MS Internet Explorer accepts, return
* Also check for ":\\", which MS Internet Explorer accepts, return // URL_BACKSLASH.
* URL_BACKSLASH. int path_is_url(const char *p)
*/
int path_is_url(char_u *p)
{ {
if (STRNCMP(p, "://", (size_t)3) == 0) if (strncmp(p, "://", 3) == 0)
return URL_SLASH; return URL_SLASH;
else if (STRNCMP(p, ":\\\\", (size_t)3) == 0) else if (strncmp(p, ":\\\\", 3) == 0)
return URL_BACKSLASH; return URL_BACKSLASH;
return 0; return 0;
} }

4
src/nvim/window.c
View File

@ -4916,7 +4916,7 @@ file_name_in_line (
if (has_mbyte && (len = (size_t)((*mb_head_off)(line, ptr - 1))) > 0) if (has_mbyte && (len = (size_t)((*mb_head_off)(line, ptr - 1))) > 0)
ptr -= len + 1; ptr -= len + 1;
else if (vim_isfilec(ptr[-1]) else if (vim_isfilec(ptr[-1])
|| ((options & FNAME_HYP) && path_is_url(ptr - 1))) || ((options & FNAME_HYP) && path_is_url((char *)ptr - 1)))
--ptr; --ptr;
else else
break; break;
@ -4928,7 +4928,7 @@ file_name_in_line (
*/ */
len = 0; len = 0;
while (vim_isfilec(ptr[len]) while (vim_isfilec(ptr[len])
|| ((options & FNAME_HYP) && path_is_url(ptr + len))) || ((options & FNAME_HYP) && path_is_url((char *)ptr + len)))
if (has_mbyte) if (has_mbyte)
len += (size_t)(*mb_ptr2len)(ptr + len); len += (size_t)(*mb_ptr2len)(ptr + len);
else else