diff options
author | ZyX <kp-pav@yandex.ru> | 2018-04-15 21:32:26 +0300 |
---|---|---|
committer | ZyX <kp-pav@yandex.ru> | 2018-04-15 21:32:26 +0300 |
commit | 3b32e717d91934f2906c99269949efa9d88e82c8 (patch) | |
tree | a83c0368f326643ac37f6a8d13093cd95b500fac | |
parent | cb3230776e75ce6adf0ce34f6da4b139e22318a2 (diff) | |
download | rneovim-3b32e717d91934f2906c99269949efa9d88e82c8.tar.gz rneovim-3b32e717d91934f2906c99269949efa9d88e82c8.tar.bz2 rneovim-3b32e717d91934f2906c99269949efa9d88e82c8.zip |
message: Fix PVS/V547: c is never equal to KS_ZERO
Since `c` there is a result of evaluating `TO_SPECIAL` macros it may be only one
of the following three things:
1. K_SPECIAL
2. K_ZERO (note: not KS_ZERO)
3. negative integer resulting from evaluating TERMCAP2KEY macro.
All variants here are negative and thus fail next !IS_SPECIAL(c) check (negative
is special). If `c` was really NUL it would fall into the `!IS_SPECIAL(c)` block
and use whatever character is third in `<80>{a}{b}` combo. For `<Nul>` it is
X (`<80><ff>X`).
-rw-r--r-- | src/nvim/message.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/nvim/message.c b/src/nvim/message.c index 04528629c7..abe21193d6 100644 --- a/src/nvim/message.c +++ b/src/nvim/message.c @@ -1382,9 +1382,6 @@ const char *str2special(const char **const sp, const bool replace_spaces, if (c == K_SPECIAL && str[1] != NUL && str[2] != NUL) { c = TO_SPECIAL((uint8_t)str[1], (uint8_t)str[2]); str += 2; - if (c == KS_ZERO) { // display <Nul> as ^@ or <Nul> - c = NUL; - } } if (IS_SPECIAL(c) || modifiers) { // Special key. special = true; @@ -1415,7 +1412,7 @@ const char *str2special(const char **const sp, const bool replace_spaces, || (replace_lt && c == '<')) { return (const char *)get_special_key_name(c, modifiers); } - buf[0] = c; + buf[0] = (char)c; buf[1] = NUL; return buf; } |