changeset 8481:8924d7adbc22 v7.4.1531

commit https://github.com/vim/vim/commit/40e8cb292c36f5057628e570591e8917ac1ca121 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Mar 10 21:10:58 2016 +0100 patch 7.4.1531 Problem: Compiler warning for unitinialized variable. (Dominique Pelle) Solution: Always give the variable a value.
author Christian Brabandt <cb@256bit.org>
date Thu, 10 Mar 2016 21:15:13 +0100
parents 70fabc40d228
children b0e1295c1edf
files src/channel.c src/version.c
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/channel.c
+++ b/src/channel.c
@@ -686,6 +686,10 @@ channel_open(
 	    return NULL;
 	}
 
+	/* Limit the waittime to 50 msec.  If it doesn't work within this
+	 * time we close the socket and try creating it again. */
+	waitnow = waittime > 50 ? 50 : waittime;
+
 	/* If connect() didn't finish then try using select() to wait for the
 	 * connection to be made. For Win32 always use select() to wait. */
 #ifndef WIN32
@@ -701,10 +705,6 @@ channel_open(
 	    struct timeval	start_tv;
 	    struct timeval	end_tv;
 #endif
-	    /* Limit the waittime to 50 msec.  If it doesn't work within this
-	     * time we close the socket and try creating it again. */
-	    waitnow = waittime > 50 ? 50 : waittime;
-
 	    FD_ZERO(&rfds);
 	    FD_SET(sd, &rfds);
 	    FD_ZERO(&wfds);
--- a/src/version.c
+++ b/src/version.c
@@ -744,6 +744,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1531,
+/**/
     1530,
 /**/
     1529,