updated for version 7.4a.018

Problem:    Compiler warning for code unreachable. (Charles Campbell)
Solution:   Use "while" instead of endless loop.  Change break to continue.

diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index d8df13cb079a16c8da122542dc08eacc3eefca62..b16ba56ea6de55c607ae386f3115b92d086e5412 100644 (file)
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -3739,7 +3739,7 @@ match_follows(startstate, depth)
     if (depth > 10)
        return FALSE;
 
-    for (;;)
+    while (state != NULL)
     {
        switch (state->c)
        {
@@ -3765,7 +3765,7 @@ match_follows(startstate, depth)
            case NFA_COMPOSING:
                /* skip ahead to next state */
                state = state->out1->out;
-               break;
+               continue;
 
            case NFA_ANY:
            case NFA_IDENT:

diff --git a/src/ui.c b/src/ui.c
index 577b74230ae47c692904057ae4b9d32ebc6f3d22..18021c21ed1cdb298336f89bfc05f038c9ff09ce 100644 (file)
--- a/src/ui.c
+++ b/src/ui.c
@@ -1467,8 +1467,9 @@ clip_gen_owner_exists(cbd)
     else
 # endif
        return clip_x11_owner_exists(cbd);
-#endif
+#else
     return TRUE;
+#endif
 }
 
 #endif /* FEAT_CLIPBOARD */

diff --git a/src/version.c b/src/version.c
index 67230f5dadbdd75e4cddf9114431ebd19c4a53be..1744af4158f7fc02f4e012345e0d2d08fd5c36e6 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -727,6 +727,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    18,
 /**/
     17,
 /**/