aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-05 21:43:39 -04:00
Code

patch 7.4.1780

Browse Source 
Problem:    Warnings reported by cppcheck.
Solution:   Fix the warnings. (Dominique Pelle)
This commit is contained in:
Bram Moolenaar 2016-04-23 14:33:19 +02:00
parent 73dfe917ba
commit dc633cf827
6 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ex_cmds2.c
View File

@ -335,9 +335,8 @@ do_debug(char_u *cmd)
get_maxbacktrace_level(void)
{
char *p, *q;
int maxbacktrace = 1;
int maxbacktrace = 0;
maxbacktrace = 0;
if (sourcing_name != NULL)
{
p = (char *)sourcing_name;

2
src/json.c
View File

@ -539,7 +539,6 @@ json_decode_string(js_read_T *reader, typval_T *res)
char_u *p;
int c;
long nr;
char_u buf[NUMBUFLEN];
if (res != NULL)
ga_init2(&ga, 1, 200);
@ -617,6 +616,7 @@ json_decode_string(js_read_T *reader, typval_T *res)
if (res != NULL)
{
#ifdef FEAT_MBYTE
char_u buf[NUMBUFLEN];
buf[utf_char2bytes((int)nr, buf)] = NUL;
ga_concat(&ga, buf);
#else

2
src/misc1.c
View File

@ -1197,7 +1197,7 @@ open_line(
int i;
int l;
for (i = 0; p[i] != NUL && i < lead_len; i += l)
for (i = 0; i < lead_len && p[i] != NUL; i += l)
{
l = (*mb_ptr2len)(p + i);
if (vim_strnsize(p, i + l) > repl_size)

2
src/ops.c
View File

@ -5709,7 +5709,7 @@ do_addsub(
if (buf1 == NULL)
goto theend;
ptr = buf1;
if (negative && (!visual || (visual && was_positive)))
if (negative && (!visual || was_positive))
{
*ptr++ = '-';
}

17
src/regexp_nfa.c
View File

@ -5515,14 +5515,9 @@ nfa_regmatch(
int add_off = 0;
int toplevel = start->c == NFA_MOPEN;
#ifdef NFA_REGEXP_DEBUG_LOG
FILE *debug = fopen(NFA_REGEXP_DEBUG_LOG, "a");
if (debug == NULL)
{
EMSG2(_("(NFA) COULD NOT OPEN %s !"), NFA_REGEXP_DEBUG_LOG);
return FALSE;
}
FILE *debug;
#endif
/* Some patterns may take a long time to match, especially when using
* recursive_regmatch(). Allow interrupting them with CTRL-C. */
fast_breakcheck();
@ -5533,6 +5528,14 @@ nfa_regmatch(
return FALSE;
#endif
#ifdef NFA_REGEXP_DEBUG_LOG
debug = fopen(NFA_REGEXP_DEBUG_LOG, "a");
if (debug == NULL)
{
EMSG2(_("(NFA) COULD NOT OPEN %s !"), NFA_REGEXP_DEBUG_LOG);
return FALSE;
}
#endif
nfa_match = FALSE;
/* Allocate memory for the lists of nodes. */

2
src/version.c
View File

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