aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.3930: getcmdline() argument has a misleading type

Browse Source 
Problem:    getcmdline() argument has a misleading type.
Solution:   Use the correct type, even though the value is not used.
This commit is contained in:
Bram Moolenaar 2021-12-28 20:59:56 +00:00
parent 10c75c4a09
commit c97f9a55bd
7 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ex_docmd.c
View File

@ -1467,7 +1467,7 @@ get_loop_line(int c, void *cookie, int indent, getline_opt_T options)
// First time inside the ":while"/":for": get line normally.
if (cp->getline == NULL)
line = getcmdline(c, 0L, indent, options);
line = getcmdline(c, 0L, indent, 0);
else
line = cp->getline(c, cp->cookie, indent, options);
if (line != NULL && store_loop_line(cp->lines_gap, line) == OK)

8
src/ex_getln.c
View File

@ -1554,10 +1554,10 @@ init_ccline(int firstc, int indent)
*/
char_u *
getcmdline(
int firstc,
long count, // only used for incremental search
int indent, // indent for inside conditionals
int do_concat UNUSED)
int firstc,
long count, // only used for incremental search
int indent, // indent for inside conditionals
getline_opt_T do_concat UNUSED)
{
return getcmdline_int(firstc, count, indent, TRUE);
}

2
src/normal.c
View File

@ -4388,7 +4388,7 @@ nv_search(cmdarg_T *cap)
// When using 'incsearch' the cursor may be moved to set a different search
// start position.
cap->searchbuf = getcmdline(cap->cmdchar, cap->count1, 0, TRUE);
cap->searchbuf = getcmdline(cap->cmdchar, cap->count1, 0, 0);
if (cap->searchbuf == NULL)
{

2
src/proto/ex_getln.pro
View File

@ -1,6 +1,6 @@
/* ex_getln.c */
void cmdline_init(void);
char_u *getcmdline(int firstc, long count, int indent, int do_concat);
char_u *getcmdline(int firstc, long count, int indent, getline_opt_T do_concat);
char_u *getcmdline_prompt(int firstc, char_u *prompt, int attr, int xp_context, char_u *xp_arg);
int check_opt_wim(void);
int text_and_win_locked(void);

2
src/register.c
View File

@ -97,7 +97,7 @@ get_expr_register(void)
{
char_u *new_line;
new_line = getcmdline('=', 0L, 0, TRUE);
new_line = getcmdline('=', 0L, 0, 0);
if (new_line == NULL)
return NUL;
if (*new_line == NUL) // use previous line

2
src/userfunc.c
View File

@ -180,7 +180,7 @@ get_function_line(
char_u *theline;
if (eap->getline == NULL)
theline = getcmdline(':', 0L, indent, getline_options);
theline = getcmdline(':', 0L, indent, 0);
else
theline = eap->getline(':', eap->cookie, indent, getline_options);
if (theline != NULL)

2
src/version.c
View File

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