diff options
| author | Eliseo Martínez <eliseomarmol@gmail.com> | 2015-04-28 10:31:42 +0200 |
|---|---|---|
| committer | Eliseo Martínez <eliseomarmol@gmail.com> | 2015-04-28 10:31:42 +0200 |
| commit | 3450762f0a1e91166aaea27ea80312d39d6f83b6 (patch) | |
| tree | 8c4fe902ae018d385f31a045d4e2338f3463c581 /src/nvim/file_search.c | |
| parent | d9441444afa3e99c8116ad01b11614886aa53524 (diff) | |
| parent | 7c956dcbe8017dd68bf4221893bf554302b8fd90 (diff) | |
| download | rneovim-3450762f0a1e91166aaea27ea80312d39d6f83b6.tar.gz rneovim-3450762f0a1e91166aaea27ea80312d39d6f83b6.tar.bz2 rneovim-3450762f0a1e91166aaea27ea80312d39d6f83b6.zip | |
Merge #2518: Enable -Wconversion. (3)
Reviewed-by: Justin M. Keyes <justinkz@gmail.com>
Diffstat (limited to 'src/nvim/file_search.c')
| -rw-r--r-- | src/nvim/file_search.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/nvim/file_search.c b/src/nvim/file_search.c index 42779d6b71..2777271377 100644 --- a/src/nvim/file_search.c +++ b/src/nvim/file_search.c @@ -1310,15 +1310,17 @@ static int ff_path_in_stoplist(char_u *path, int path_len, char_u **stopdirs_v) char_u * find_file_in_path ( char_u *ptr, /* file name */ - int len, /* length of file name */ + size_t len, /* length of file name */ int options, int first, /* use count'th matching file name */ char_u *rel_fname /* file name searching relative to */ ) { return find_file_in_path_option(ptr, len, options, first, - *curbuf->b_p_path == NUL ? p_path : curbuf->b_p_path, - FINDFILE_BOTH, rel_fname, curbuf->b_p_sua); + (*curbuf->b_p_path == NUL + ? p_path + : curbuf->b_p_path), + FINDFILE_BOTH, rel_fname, curbuf->b_p_sua); } static char_u *ff_file_to_find = NULL; @@ -1347,19 +1349,19 @@ void free_findfile(void) char_u * find_directory_in_path ( char_u *ptr, /* file name */ - int len, /* length of file name */ + size_t len, /* length of file name */ int options, char_u *rel_fname /* file name searching relative to */ ) { return find_file_in_path_option(ptr, len, options, TRUE, p_cdpath, - FINDFILE_DIR, rel_fname, (char_u *)""); + FINDFILE_DIR, rel_fname, (char_u *)""); } char_u * find_file_in_path_option ( char_u *ptr, /* file name */ - int len, /* length of file name */ + size_t len, /* length of file name */ int options, int first, /* use count'th matching file name */ char_u *path_option, /* p_path or p_cdpath */ |