patch 7.4.1531

Problem:    Compiler warning for unitinialized variable. (Dominique Pelle)
Solution:   Always give the variable a value.

diff --git a/src/channel.c b/src/channel.c
index e7cee1998143d1d3e94d942e6c30de3fbb27e10f..d77a4b7d1bbc3dbeeb6652d0958a27b058c2bae9 100644 (file)
--- 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);

diff --git a/src/version.c b/src/version.c
index e1ee16dcef46ec8645937b1fa426d088e20fbd8b..d7d518109f31ae53f3c674a4ed491f4fa65138d0 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1531,
 /**/
     1530,
 /**/