aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-02 05:04:20 -04:00
Code Activity

patch 9.1.0717: Unnecessary nextcmd NULL checks in parse_command_modifiers()

Browse Source 
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>
This commit is contained in:
zeertzjq
2024-09-05 17:26:30 +02:00
committed by Christian Brabandt
parent 233252fdf2
commit f7b8609446
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ex_docmd.c
View File

@@ -2898,12 +2898,9 @@ parse_command_modifiers(
if (comment_start(eap->cmd, starts_with_colon)) if (comment_start(eap->cmd, starts_with_colon))
{ {
// a comment ends at a NL // a comment ends at a NL
if (eap->nextcmd == NULL) eap->nextcmd = vim_strchr(eap->cmd, '\n');
{ if (eap->nextcmd != NULL)
eap->nextcmd = vim_strchr(eap->cmd, '\n'); ++eap->nextcmd;
if (eap->nextcmd != NULL)
++eap->nextcmd;
}
if (vim9script) if (vim9script)
{ {
if (has_cmdmod(cmod, FALSE)) if (has_cmdmod(cmod, FALSE))
@@ -2916,7 +2913,7 @@ parse_command_modifiers(
} }
return FAIL; return FAIL;
} }
if (eap->nextcmd == NULL && *eap->cmd == '\n') if (*eap->cmd == '\n')
{ {
eap->nextcmd = eap->cmd + 1; eap->nextcmd = eap->cmd + 1;
return FAIL; return FAIL;

2
src/version.c
View File

@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
717,
/**/ /**/
716, 716,
/**/ /**/