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

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
141 141
142 State = NORMAL; 142 State = NORMAL;
143 debug_mode = TRUE; 143 debug_mode = TRUE;
144 144
145 if (!debug_did_msg) 145 if (!debug_did_msg)
146 MSG(_("Entering Debug mode. Type \"cont\" to continue.")); 146 msg(_("Entering Debug mode. Type \"cont\" to continue."));
147 if (debug_oldval != NULL) 147 if (debug_oldval != NULL)
148 { 148 {
149 smsg(_("Oldval = \"%s\""), debug_oldval); 149 smsg(_("Oldval = \"%s\""), debug_oldval);
150 vim_free(debug_oldval); 150 vim_free(debug_oldval);
151 debug_oldval = NULL; 151 debug_oldval = NULL;
155 smsg(_("Newval = \"%s\""), debug_newval); 155 smsg(_("Newval = \"%s\""), debug_newval);
156 vim_free(debug_newval); 156 vim_free(debug_newval);
157 debug_newval = NULL; 157 debug_newval = NULL;
158 } 158 }
159 if (sourcing_name != NULL) 159 if (sourcing_name != NULL)
160 msg(sourcing_name); 160 msg((char *)sourcing_name);
161 if (sourcing_lnum != 0) 161 if (sourcing_lnum != 0)
162 smsg(_("line %ld: %s"), (long)sourcing_lnum, cmd); 162 smsg(_("line %ld: %s"), (long)sourcing_lnum, cmd);
163 else 163 else
164 smsg(_("cmd: %s"), cmd); 164 smsg(_("cmd: %s"), cmd);
165 /* 165 /*
388 do_checkbacktracelevel(void) 388 do_checkbacktracelevel(void)
389 { 389 {
390 if (debug_backtrace_level < 0) 390 if (debug_backtrace_level < 0)
391 { 391 {
392 debug_backtrace_level = 0; 392 debug_backtrace_level = 0;
393 MSG(_("frame is zero")); 393 msg(_("frame is zero"));
394 } 394 }
395 else 395 else
396 { 396 {
397 int max = get_maxbacktrace_level(); 397 int max = get_maxbacktrace_level();
398 398
855 { 855 {
856 struct debuggy *bp; 856 struct debuggy *bp;
857 int i; 857 int i;
858 858
859 if (dbg_breakp.ga_len == 0) 859 if (dbg_breakp.ga_len == 0)
860 MSG(_("No breakpoints defined")); 860 msg(_("No breakpoints defined"));
861 else 861 else
862 for (i = 0; i < dbg_breakp.ga_len; ++i) 862 for (i = 0; i < dbg_breakp.ga_len; ++i)
863 { 863 {
864 bp = &BREAKP(i); 864 bp = &BREAKP(i);
865 if (bp->dbg_type == DBG_FILE) 865 if (bp->dbg_type == DBG_FILE)
2428 (linenr_T)1, buf->b_ml.ml_line_count, NULL, 2428 (linenr_T)1, buf->b_ml.ml_line_count, NULL,
2429 FALSE, forceit, TRUE, FALSE)); 2429 FALSE, forceit, TRUE, FALSE));
2430 if (curbuf != old_curbuf) 2430 if (curbuf != old_curbuf)
2431 { 2431 {
2432 msg_source(HL_ATTR(HLF_W)); 2432 msg_source(HL_ATTR(HLF_W));
2433 MSG(_("Warning: Entered other buffer unexpectedly (check autocommands)")); 2433 msg(_("Warning: Entered other buffer unexpectedly (check autocommands)"));
2434 } 2434 }
2435 return retval; 2435 return retval;
2436 } 2436 }
2437 2437
2438 /* 2438 /*
4110 ex_pyfile(&ex); 4110 ex_pyfile(&ex);
4111 # else 4111 # else
4112 vim_snprintf((char *)IObuff, IOSIZE, 4112 vim_snprintf((char *)IObuff, IOSIZE,
4113 _("W20: Required python version 2.x not supported, ignoring file: %s"), 4113 _("W20: Required python version 2.x not supported, ignoring file: %s"),
4114 fname); 4114 fname);
4115 MSG(IObuff); 4115 msg((char *)IObuff);
4116 # endif 4116 # endif
4117 return; 4117 return;
4118 } 4118 }
4119 else 4119 else
4120 { 4120 {
4122 ex_py3file(&ex); 4122 ex_py3file(&ex);
4123 # else 4123 # else
4124 vim_snprintf((char *)IObuff, IOSIZE, 4124 vim_snprintf((char *)IObuff, IOSIZE,
4125 _("W21: Required python version 3.x not supported, ignoring file: %s"), 4125 _("W21: Required python version 3.x not supported, ignoring file: %s"),
4126 fname); 4126 fname);
4127 MSG(IObuff); 4127 msg((char *)IObuff);
4128 # endif 4128 # endif
4129 return; 4129 return;
4130 } 4130 }
4131 } 4131 }
4132 4132