diff options
| author | watiko <service@mail.watiko.net> | 2016-02-21 22:07:42 +0900 |
|---|---|---|
| committer | watiko <service@mail.watiko.net> | 2016-02-21 22:07:42 +0900 |
| commit | 693bf1dafb2ab07d972ed750d8e8f247ecf2db16 (patch) | |
| tree | e618a295d48cbfb536234b80612e576e67573475 /src/nvim/path.c | |
| parent | d6c894efaf81032753f74b943c138c53e0d1fcaf (diff) | |
| download | rneovim-693bf1dafb2ab07d972ed750d8e8f247ecf2db16.tar.gz rneovim-693bf1dafb2ab07d972ed750d8e8f247ecf2db16.tar.bz2 rneovim-693bf1dafb2ab07d972ed750d8e8f247ecf2db16.zip | |
path.c: Fulfill the `@returns` conditions
Original-author: oni-link <knil.ino@gmail.com>
Diffstat (limited to 'src/nvim/path.c')
| -rw-r--r-- | src/nvim/path.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/nvim/path.c b/src/nvim/path.c index f22e0af4f3..5cd93ab811 100644 --- a/src/nvim/path.c +++ b/src/nvim/path.c @@ -1118,7 +1118,6 @@ int gen_expand_wildcards(int num_pat, char_u **pat, int *num_file, char_u *p; static bool recursive = false; int add_pat; - bool retval = OK; bool did_expand_in_path = false; /* @@ -1163,7 +1162,11 @@ int gen_expand_wildcards(int num_pat, char_u **pat, int *num_file, if (vim_backtick(p)) { add_pat = expand_backtick(&ga, p, flags); if (add_pat == -1) { - retval = FAIL; + recursive = false; + FreeWild(ga.ga_len, (char_u **)ga.ga_data); + *num_file = 0; + *file = NULL; + return FAIL; } } else { // First expand environment variables, "~/" and "~user/". @@ -1237,7 +1240,7 @@ int gen_expand_wildcards(int num_pat, char_u **pat, int *num_file, recursive = false; - return (ga.ga_data != NULL) ? retval : FAIL; + return (ga.ga_data != NULL) ? OK : FAIL; } |