diff options
| author | ZyX <kp-pav@yandex.ru> | 2018-04-15 19:36:03 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2018-04-15 20:07:07 +0300 |
| commit | cad616c94ecf94a2abd959e3c09886c00c5afb3f (patch) | |
| tree | 90d8ed9c3938f34b87eaa783dd3d94db8cb4d674 | |
| parent | d7e4449adbd483512580a2a9e823190b61f2aa53 (diff) | |
| download | rneovim-cad616c94ecf94a2abd959e3c09886c00c5afb3f.tar.gz rneovim-cad616c94ecf94a2abd959e3c09886c00c5afb3f.tar.bz2 rneovim-cad616c94ecf94a2abd959e3c09886c00c5afb3f.zip | |
ex_docmd: Fix PVS/V547: condition was already checked in surr. if()
| -rw-r--r-- | src/nvim/ex_docmd.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index f39c996902..33e2805538 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -5669,22 +5669,21 @@ static void do_ucmd(exarg_T *eap) if (start != NULL) end = vim_strchr(start + 1, '>'); if (buf != NULL) { - for (ksp = p; *ksp != NUL && *ksp != K_SPECIAL; ++ksp) - ; + for (ksp = p; *ksp != NUL && *ksp != K_SPECIAL; ksp++) { + } if (*ksp == K_SPECIAL && (start == NULL || ksp < start || end == NULL) - && ((ksp[1] == KS_SPECIAL && ksp[2] == KE_FILLER) - )) { - /* K_SPECIAL has been put in the buffer as K_SPECIAL - * KS_SPECIAL KE_FILLER, like for mappings, but - * do_cmdline() doesn't handle that, so convert it back. - * Also change K_SPECIAL KS_EXTRA KE_CSI into CSI. */ + && (ksp[1] == KS_SPECIAL && ksp[2] == KE_FILLER)) { + // K_SPECIAL has been put in the buffer as K_SPECIAL + // KS_SPECIAL KE_FILLER, like for mappings, but + // do_cmdline() doesn't handle that, so convert it back. + // Also change K_SPECIAL KS_EXTRA KE_CSI into CSI. len = ksp - p; if (len > 0) { memmove(q, p, len); q += len; } - *q++ = ksp[1] == KS_SPECIAL ? K_SPECIAL : CSI; + *q++ = K_SPECIAL; p = ksp + 3; continue; } |