diff options
author | Eliseo Martínez <eliseomarmol@gmail.com> | 2015-04-26 20:32:24 +0200 |
---|---|---|
committer | Eliseo Martínez <eliseomarmol@gmail.com> | 2015-04-27 19:27:07 +0200 |
commit | 7c956dcbe8017dd68bf4221893bf554302b8fd90 (patch) | |
tree | 8c4fe902ae018d385f31a045d4e2338f3463c581 /src/nvim/file_search.c | |
parent | d9441444afa3e99c8116ad01b11614886aa53524 (diff) | |
download | rneovim-7c956dcbe8017dd68bf4221893bf554302b8fd90.tar.gz rneovim-7c956dcbe8017dd68bf4221893bf554302b8fd90.tar.bz2 rneovim-7c956dcbe8017dd68bf4221893bf554302b8fd90.zip |
Enable -Wconversion: normal.c.
Refactor summary:
- extern int opcount --> extern long opcount
- bool find_decl(..., int len, ...) --> bool find_decl(..., size_t len, ...)
* int find_ident_under_cursor(...) --> size_t find_ident_under_cursor(...)
- int find_ident_at_pos(...) --> size_t find_ident_at_pos(...)
- int modify_fname(..., int *usedlen, ..., int *fnamelen) --> int modify_fname(..., size_t *usedlen, ..., size_t *fnamelen)
* char_u *eval_vars(..., int *usedlen, ...) --> char_u *eval_vars(..., size_t *usedlen, ...)
- int find_cmdline_var(..., int *usedlen) --> ssize_t find_cmdline_var(..., size_t *usedlen)
- static char_u *repl_cmdline(..., int srclen, ...) --> static char_u *repl_cmdline(..., size_t srclen, ...)
- bool get_visual_text(..., int *lenp) --> bool get_visual_text(..., size_t *lenp)
* char_u *find_file_name_in_path(..., int len, ...) --> char_u *find_file_name_in_path(..., size_t len, ...)
- static char_u *eval_includeexpr(..., int len) --> static char_u *eval_includeexpr(..., size_t len)
- char_u *find_file_in_path(..., int len, ...) --> char_u *find_file_in_path(..., size_t len, ...)
* char_u *find_file_in_path_option(..., int len, ...) --> char_u *find_file_in_path_option(..., size_t len, ...)
- char_u *find_directory_in_path(..., int len, ...) --> char_u *find_directory_in_path(..., size_t len, ...)
* int spell_move_to(...) --> size_t spell_move_to(...)
- int spell_check(...) --> size_t spell_check(...)
- static int spell_bad_len --> static size_t spell_bad_len
- void find_pattern_in_path(..., int len, ...) --> void find_pattern_in_path(..., size_t len, ...)
Helped-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 */ |