diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2019-01-17 23:43:43 +0100 |
---|---|---|
committer | Justin M. Keyes <justinkz@gmail.com> | 2019-01-18 00:10:08 +0100 |
commit | aa39fc56f68e2087a2327bcd03cc5f3d2dc9a696 (patch) | |
tree | caafab85917d2ce0de1289d67704648ee2345938 /src | |
parent | ea7491586fccb2ce6de43b77fd0bd06b6dbaa17d (diff) | |
download | rneovim-aa39fc56f68e2087a2327bcd03cc5f3d2dc9a696.tar.gz rneovim-aa39fc56f68e2087a2327bcd03cc5f3d2dc9a696.tar.bz2 rneovim-aa39fc56f68e2087a2327bcd03cc5f3d2dc9a696.zip |
PVS/V1032: pointer cast to a more strictly aligned type
Rework-of: ea7491586fcc
Helped-by: Björn Linse <bjorn.linse@gmail.com>
- The old (Vim) use of (char_u **)"" before ea7491586fcc is garbage,
which hints that this value was never used.
- The necessary condition is next to the NULL assigmnent, the pointer
would only be started to be accessed, if the length assignment next to
it is also changed.
Diffstat (limited to 'src')
-rw-r--r-- | src/nvim/ex_cmds.c | 2 | ||||
-rw-r--r-- | src/nvim/ex_getln.c | 2 | ||||
-rw-r--r-- | src/nvim/globals.h | 3 | ||||
-rw-r--r-- | src/nvim/path.c | 2 |
4 files changed, 3 insertions, 6 deletions
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c index 7bc9a9244f..c574ac10e9 100644 --- a/src/nvim/ex_cmds.c +++ b/src/nvim/ex_cmds.c @@ -4895,7 +4895,7 @@ int find_help_tags(const char_u *arg, int *num_matches, char_u ***matches, } } - *matches = &vim_emptystr; + *matches = NULL; *num_matches = 0; int flags = TAG_HELP | TAG_REGEXP | TAG_NAMES | TAG_VERBOSE; if (keep_lang) { diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index adba3d4e7e..786769dc7d 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -4702,7 +4702,7 @@ ExpandFromContext ( return ret; } - *file = &vim_emptystr; + *file = NULL; *num_file = 0; if (xp->xp_context == EXPAND_HELP) { /* With an empty argument we would get all the help tags, which is diff --git a/src/nvim/globals.h b/src/nvim/globals.h index 2509c727d6..cc39e2c112 100644 --- a/src/nvim/globals.h +++ b/src/nvim/globals.h @@ -1081,9 +1081,6 @@ EXTERN FILE *time_fd INIT(= NULL); /* where to write startup timing */ // can't do anything useful with the value. Assign to this variable to avoid // the warning. EXTERN int vim_ignored; -// Use this to avoid PVS warning V1032 for code like this: -// *foo = (char_u **)""; -EXTERN char_u *vim_emptystr INIT(= (char_u *)""); // Start a msgpack-rpc channel over stdin/stdout. EXTERN bool embedded_mode INIT(= false); diff --git a/src/nvim/path.c b/src/nvim/path.c index 7f5dbe5c02..03de914e4f 100644 --- a/src/nvim/path.c +++ b/src/nvim/path.c @@ -1267,7 +1267,7 @@ int gen_expand_wildcards(int num_pat, char_u **pat, int *num_file, } *num_file = ga.ga_len; - *file = (ga.ga_data != NULL) ? (char_u **)ga.ga_data : &vim_emptystr; + *file = (ga.ga_data != NULL) ? (char_u **)ga.ga_data : NULL; recursive = false; |