]> granicus.if.org Git - vim/commitdiff
updated for version 7.3.1156 v7.3.1156
authorBram Moolenaar <Bram@vim.org>
Sun, 9 Jun 2013 18:51:00 +0000 (20:51 +0200)
committerBram Moolenaar <Bram@vim.org>
Sun, 9 Jun 2013 18:51:00 +0000 (20:51 +0200)
Problem:    Compiler warnings. (dv1445)
Solution:   Initialize variables, even when the value isn't really used.

src/eval.c
src/regexp_nfa.c
src/version.c

index da3d2bd7921b97fa7534c55c9836bc8b2c9aed0b..7250556fc22b1c504cff682c45ae80666f74dde1 100644 (file)
@@ -2734,6 +2734,8 @@ get_lval(name, rettv, lp, unlet, skip, quiet, fne_flags)
                    prevval = key[len];
                    key[len] = NUL;
                }
+               else
+                   prevval = 0; /* avoid compiler warning */
                wrong = (lp->ll_dict->dv_scope == VAR_DEF_SCOPE
                               && rettv->v_type == VAR_FUNC
                               && var_check_func_name(key, lp->ll_di == NULL))
index 7e9b04ca78ee23e4c9a108d5646e68368f2d8f09..9a89b49ecf3809844350b23abc831292d96b24da 100644 (file)
@@ -3045,7 +3045,7 @@ post2nfa(postfix, end, nfa_calc_size)
                    start_state = NFA_START_INVISIBLE_BEFORE_NEG;
                    end_state = NFA_END_INVISIBLE_NEG;
                    break;
-               case NFA_PREV_ATOM_LIKE_PATTERN:
+               default: /* NFA_PREV_ATOM_LIKE_PATTERN: */
                    start_state = NFA_START_PATTERN;
                    end_state = NFA_END_PATTERN;
                    break;
@@ -4853,7 +4853,7 @@ nfa_regmatch(prog, start, submatch, m)
     nfa_state_T *add_state;
     int                add_here;
     int                add_count;
-    int                add_off;
+    int                add_off = 0;
     int                toplevel = start->c == NFA_MOPEN;
 #ifdef NFA_REGEXP_DEBUG_LOG
     FILE       *debug = fopen(NFA_REGEXP_DEBUG_LOG, "a");
index 6e419dd147a2f1686137493106d7829f650bea4b..3b2fc8340d6870106a1896a2dd406830d36a7a90 100644 (file)
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1156,
 /**/
     1155,
 /**/