Mercurial > vim
changeset 36101:56cd8150c745 v9.1.0717
patch 9.1.0717: Unnecessary nextcmd NULL checks in parse_command_modifiers()
Commit: https://github.com/vim/vim/commit/f7b8609446f171a6a287f61564e39a8dac5ff47d
Author: zeertzjq <zeertzjq@outlook.com>
Date: Thu Sep 5 17:26:30 2024 +0200
patch 9.1.0717: Unnecessary nextcmd NULL checks in parse_command_modifiers()
Problem: Unnecessary nextcmd NULL checks in parse_command_modifiers().
Solution: Remove them (zeertzjq)
Every place parse_command_modifiers() is called, nextcmd is NULL, and
after it's set to non-NULL the function returns very soon.
Even if one day nextcmd may be non-NULL, the NULL checks may still be
wrong as the correct behavior may be overriding nextcmd.
closes: #15620
Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 05 Sep 2024 17:30:11 +0200 |
| parents | cc0dc25a443f |
| children | 8e1475c86168 |
| files | src/ex_docmd.c src/version.c |
| diffstat | 2 files changed, 6 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -2898,12 +2898,9 @@ parse_command_modifiers( if (comment_start(eap->cmd, starts_with_colon)) { // a comment ends at a NL - if (eap->nextcmd == NULL) - { - eap->nextcmd = vim_strchr(eap->cmd, '\n'); - if (eap->nextcmd != NULL) - ++eap->nextcmd; - } + eap->nextcmd = vim_strchr(eap->cmd, '\n'); + if (eap->nextcmd != NULL) + ++eap->nextcmd; if (vim9script) { if (has_cmdmod(cmod, FALSE)) @@ -2916,7 +2913,7 @@ parse_command_modifiers( } return FAIL; } - if (eap->nextcmd == NULL && *eap->cmd == '\n') + if (*eap->cmd == '\n') { eap->nextcmd = eap->cmd + 1; return FAIL;