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

patch 8.1.0779: argument for message functions is inconsistent

Browse Source 
Problem:    Argument for message functions is inconsistent.
Solution:   Make first argument to msg() "char *".
This commit is contained in:
Bram Moolenaar
2019-01-19 17:43:09 +01:00
parent d383c92ec1
commit 32526b3c18
56 changed files with 679 additions and 698 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/userfunc.c
View File

@@ -893,11 +893,11 @@ call_user_func(
char_u *tofree;
char_u *s;
msg_puts((char_u *)"(");
msg_puts("(");
for (i = 0; i < argcount; ++i)
{
if (i > 0)
msg_puts((char_u *)", ");
msg_puts(", ");
if (argvars[i].v_type == VAR_NUMBER)
msg_outnum((long)argvars[i].vval.v_number);
else
@@ -913,14 +913,14 @@ call_user_func(
trunc_string(s, buf, MSG_BUF_CLEN, MSG_BUF_LEN);
s = buf;
}
msg_puts(s);
msg_puts((char *)s);
vim_free(tofree);
}
}
}
msg_puts((char_u *)")");
msg_puts(")");
}
msg_puts((char_u *)"\n"); /* don't overwrite this either */
msg_puts("\n"); /* don't overwrite this either */
verbose_leave_scroll();
--no_wait_return;
@@ -1018,7 +1018,7 @@ call_user_func(
vim_free(tofree);
}
}
msg_puts((char_u *)"\n"); /* don't overwrite this either */
msg_puts("\n"); /* don't overwrite this either */
verbose_leave_scroll();
--no_wait_return;
@@ -1041,7 +1041,7 @@ call_user_func(
verbose_enter_scroll();
smsg(_("continuing in %s"), sourcing_name);
msg_puts((char_u *)"\n"); /* don't overwrite this either */
msg_puts("\n"); /* don't overwrite this either */
verbose_leave_scroll();
--no_wait_return;
@@ -1571,37 +1571,37 @@ list_func_head(ufunc_T *fp, int indent)
msg_start();
if (indent)
MSG_PUTS(" ");
MSG_PUTS("function ");
msg_puts(" ");
msg_puts("function ");
if (fp->uf_name[0] == K_SPECIAL)
{
MSG_PUTS_ATTR("<SNR>", HL_ATTR(HLF_8));
msg_puts(fp->uf_name + 3);
msg_puts_attr("<SNR>", HL_ATTR(HLF_8));
msg_puts((char *)fp->uf_name + 3);
}
else
msg_puts(fp->uf_name);
msg_puts((char *)fp->uf_name);
msg_putchar('(');
for (j = 0; j < fp->uf_args.ga_len; ++j)
{
if (j)
MSG_PUTS(", ");
msg_puts(FUNCARG(fp, j));
msg_puts(", ");
msg_puts((char *)FUNCARG(fp, j));
}
if (fp->uf_varargs)
{
if (j)
MSG_PUTS(", ");
MSG_PUTS("...");
msg_puts(", ");
msg_puts("...");
}
msg_putchar(')');
if (fp->uf_flags & FC_ABORT)
MSG_PUTS(" abort");
msg_puts(" abort");
if (fp->uf_flags & FC_RANGE)
MSG_PUTS(" range");
msg_puts(" range");
if (fp->uf_flags & FC_DICT)
MSG_PUTS(" dict");
msg_puts(" dict");
if (fp->uf_flags & FC_CLOSURE)
MSG_PUTS(" closure");
msg_puts(" closure");
msg_clr_eos();
if (p_verbose > 0)
last_set_msg(fp->uf_script_ctx);
@@ -2010,7 +2010,7 @@ ex_function(exarg_T *eap)
if (!got_int)
{
msg_putchar('\n');
msg_puts((char_u *)" endfunction");
msg_puts(" endfunction");
}
}
else
@@ -3731,7 +3731,7 @@ list_func_vars(int *first)
{
if (current_funccal != NULL)
list_hashtable_vars(&current_funccal->l_vars.dv_hashtab,
(char_u *)"l:", FALSE, first);
"l:", FALSE, first);
}
/*