To: vim_dev@googlegroups.com
Subject: Patch 7.4a.018
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.4a.018
Problem:    Compiler warning for code unreachable. (Charles Campbell)
Solution:   Use "while" instead of endless loop.  Change break to continue.
Files:	    src/regexp_nfa.c, src/ui.c


*** ../vim-7.4a.017/src/regexp_nfa.c	2013-06-30 23:17:46.000000000 +0200
--- src/regexp_nfa.c	2013-07-13 20:51:57.000000000 +0200
***************
*** 3739,3745 ****
      if (depth > 10)
  	return FALSE;
  
!     for (;;)
      {
  	switch (state->c)
  	{
--- 3739,3745 ----
      if (depth > 10)
  	return FALSE;
  
!     while (state != NULL)
      {
  	switch (state->c)
  	{
***************
*** 3765,3771 ****
  	    case NFA_COMPOSING:
  		/* skip ahead to next state */
  		state = state->out1->out;
! 		break;
  
  	    case NFA_ANY:
  	    case NFA_IDENT:
--- 3765,3771 ----
  	    case NFA_COMPOSING:
  		/* skip ahead to next state */
  		state = state->out1->out;
! 		continue;
  
  	    case NFA_ANY:
  	    case NFA_IDENT:
*** ../vim-7.4a.017/src/ui.c	2013-07-05 20:07:21.000000000 +0200
--- src/ui.c	2013-07-13 20:57:08.000000000 +0200
***************
*** 1467,1474 ****
      else
  # endif
  	return clip_x11_owner_exists(cbd);
! #endif
      return TRUE;
  }
  
  #endif /* FEAT_CLIPBOARD */
--- 1467,1475 ----
      else
  # endif
  	return clip_x11_owner_exists(cbd);
! #else
      return TRUE;
+ #endif
  }
  
  #endif /* FEAT_CLIPBOARD */
*** ../vim-7.4a.017/src/version.c	2013-07-13 16:34:19.000000000 +0200
--- src/version.c	2013-07-13 20:52:59.000000000 +0200
***************
*** 729,730 ****
--- 729,732 ----
  {   /* Add new patch number below this line */
+ /**/
+     18,
  /**/

-- 
Friends?  I have lots of friends!  In fact, I have all episodes ever made.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///