Mercurial > vim

comparison src/userfunc.c @ 15543:dd725a8ab112 v8.1.0779

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.0779: argument for message functions is inconsistent commit https://github.com/vim/vim/commit/32526b3c1846025f0e655f41efd4e5428da16b6c Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jan 19 17:43:09 2019 +0100 patch 8.1.0779: argument for message functions is inconsistent Problem: Argument for message functions is inconsistent. Solution: Make first argument to msg() "char *".
author Bram Moolenaar <Bram@vim.org>
date Sat, 19 Jan 2019 17:45:07 +0100
parents 55ccc2d353bd
children d89c5b339c2a
comparison
equal deleted inserted replaced
15542:5baedae7ca7a 15543:dd725a8ab112
891 char_u buf[MSG_BUF_LEN]; 891 char_u buf[MSG_BUF_LEN];
892 char_u numbuf2[NUMBUFLEN]; 892 char_u numbuf2[NUMBUFLEN];
893 char_u *tofree; 893 char_u *tofree;
894 char_u *s; 894 char_u *s;
895 895
896 msg_puts((char_u *)"("); 896 msg_puts("(");
897 for (i = 0; i < argcount; ++i) 897 for (i = 0; i < argcount; ++i)
898 { 898 {
899 if (i > 0) 899 if (i > 0)
900 msg_puts((char_u *)", "); 900 msg_puts(", ");
901 if (argvars[i].v_type == VAR_NUMBER) 901 if (argvars[i].v_type == VAR_NUMBER)
902 msg_outnum((long)argvars[i].vval.v_number); 902 msg_outnum((long)argvars[i].vval.v_number);
903 else 903 else
904 { 904 {
905 /* Do not want errors such as E724 here. */ 905 /* Do not want errors such as E724 here. */
911 if (vim_strsize(s) > MSG_BUF_CLEN) 911 if (vim_strsize(s) > MSG_BUF_CLEN)
912 { 912 {
913 trunc_string(s, buf, MSG_BUF_CLEN, MSG_BUF_LEN); 913 trunc_string(s, buf, MSG_BUF_CLEN, MSG_BUF_LEN);
914 s = buf; 914 s = buf;
915 } 915 }
916 msg_puts(s); 916 msg_puts((char *)s);
917 vim_free(tofree); 917 vim_free(tofree);
918 } 918 }
919 } 919 }
920 } 920 }
921 msg_puts((char_u *)")"); 921 msg_puts(")");
922 } 922 }
923 msg_puts((char_u *)"\n"); /* don't overwrite this either */ 923 msg_puts("\n"); /* don't overwrite this either */
924 924
925 verbose_leave_scroll(); 925 verbose_leave_scroll();
926 --no_wait_return; 926 --no_wait_return;
927 } 927 }
928 } 928 }
1016 } 1016 }
1017 smsg(_("%s returning %s"), sourcing_name, s); 1017 smsg(_("%s returning %s"), sourcing_name, s);
1018 vim_free(tofree); 1018 vim_free(tofree);
1019 } 1019 }
1020 } 1020 }
1021 msg_puts((char_u *)"\n"); /* don't overwrite this either */ 1021 msg_puts("\n"); /* don't overwrite this either */
1022 1022
1023 verbose_leave_scroll(); 1023 verbose_leave_scroll();
1024 --no_wait_return; 1024 --no_wait_return;
1025 } 1025 }
1026 1026
1039 { 1039 {
1040 ++no_wait_return; 1040 ++no_wait_return;
1041 verbose_enter_scroll(); 1041 verbose_enter_scroll();
1042 1042
1043 smsg(_("continuing in %s"), sourcing_name); 1043 smsg(_("continuing in %s"), sourcing_name);
1044 msg_puts((char_u *)"\n"); /* don't overwrite this either */ 1044 msg_puts("\n"); /* don't overwrite this either */
1045 1045
1046 verbose_leave_scroll(); 1046 verbose_leave_scroll();
1047 --no_wait_return; 1047 --no_wait_return;
1048 } 1048 }
1049 1049
1569 { 1569 {
1570 int j; 1570 int j;
1571 1571
1572 msg_start(); 1572 msg_start();
1573 if (indent) 1573 if (indent)
1574 MSG_PUTS(" "); 1574 msg_puts(" ");
1575 MSG_PUTS("function "); 1575 msg_puts("function ");
1576 if (fp->uf_name[0] == K_SPECIAL) 1576 if (fp->uf_name[0] == K_SPECIAL)
1577 { 1577 {
1578 MSG_PUTS_ATTR("<SNR>", HL_ATTR(HLF_8)); 1578 msg_puts_attr("<SNR>", HL_ATTR(HLF_8));
1579 msg_puts(fp->uf_name + 3); 1579 msg_puts((char *)fp->uf_name + 3);
1580 } 1580 }
1581 else 1581 else
1582 msg_puts(fp->uf_name); 1582 msg_puts((char *)fp->uf_name);
1583 msg_putchar('('); 1583 msg_putchar('(');
1584 for (j = 0; j < fp->uf_args.ga_len; ++j) 1584 for (j = 0; j < fp->uf_args.ga_len; ++j)
1585 { 1585 {
1586 if (j) 1586 if (j)
1587 MSG_PUTS(", "); 1587 msg_puts(", ");
1588 msg_puts(FUNCARG(fp, j)); 1588 msg_puts((char *)FUNCARG(fp, j));
1589 } 1589 }
1590 if (fp->uf_varargs) 1590 if (fp->uf_varargs)
1591 { 1591 {
1592 if (j) 1592 if (j)
1593 MSG_PUTS(", "); 1593 msg_puts(", ");
1594 MSG_PUTS("..."); 1594 msg_puts("...");
1595 } 1595 }
1596 msg_putchar(')'); 1596 msg_putchar(')');
1597 if (fp->uf_flags & FC_ABORT) 1597 if (fp->uf_flags & FC_ABORT)
1598 MSG_PUTS(" abort"); 1598 msg_puts(" abort");
1599 if (fp->uf_flags & FC_RANGE) 1599 if (fp->uf_flags & FC_RANGE)
1600 MSG_PUTS(" range"); 1600 msg_puts(" range");
1601 if (fp->uf_flags & FC_DICT) 1601 if (fp->uf_flags & FC_DICT)
1602 MSG_PUTS(" dict"); 1602 msg_puts(" dict");
1603 if (fp->uf_flags & FC_CLOSURE) 1603 if (fp->uf_flags & FC_CLOSURE)
1604 MSG_PUTS(" closure"); 1604 msg_puts(" closure");
1605 msg_clr_eos(); 1605 msg_clr_eos();
1606 if (p_verbose > 0) 1606 if (p_verbose > 0)
1607 last_set_msg(fp->uf_script_ctx); 1607 last_set_msg(fp->uf_script_ctx);
1608 } 1608 }
1609 1609
2008 ui_breakcheck(); 2008 ui_breakcheck();
2009 } 2009 }
2010 if (!got_int) 2010 if (!got_int)
2011 { 2011 {
2012 msg_putchar('\n'); 2012 msg_putchar('\n');
2013 msg_puts((char_u *)" endfunction"); 2013 msg_puts(" endfunction");
2014 } 2014 }
2015 } 2015 }
2016 else 2016 else
2017 emsg_funcname(N_("E123: Undefined function: %s"), name); 2017 emsg_funcname(N_("E123: Undefined function: %s"), name);
2018 } 2018 }
3729 void 3729 void
3730 list_func_vars(int *first) 3730 list_func_vars(int *first)
3731 { 3731 {
3732 if (current_funccal != NULL) 3732 if (current_funccal != NULL)
3733 list_hashtable_vars(&current_funccal->l_vars.dv_hashtab, 3733 list_hashtable_vars(&current_funccal->l_vars.dv_hashtab,
3734 (char_u *)"l:", FALSE, first); 3734 "l:", FALSE, first);
3735 } 3735 }
3736 3736
3737 /* 3737 /*
3738 * If "ht" is the hashtable for local variables in the current funccal, return 3738 * If "ht" is the hashtable for local variables in the current funccal, return
3739 * the dict that contains it. 3739 * the dict that contains it.