Skip to content

Commit 40e8cb2

Browse files
committed
patch 7.4.1531
Problem: Compiler warning for unitinialized variable. (Dominique Pelle) Solution: Always give the variable a value.
1 parent 75578a3 commit 40e8cb2

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

src/channel.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -686,6 +686,10 @@ channel_open(
686686
return NULL;
687687
}
688688

689+
/* Limit the waittime to 50 msec. If it doesn't work within this
690+
* time we close the socket and try creating it again. */
691+
waitnow = waittime > 50 ? 50 : waittime;
692+
689693
/* If connect() didn't finish then try using select() to wait for the
690694
* connection to be made. For Win32 always use select() to wait. */
691695
#ifndef WIN32
@@ -701,10 +705,6 @@ channel_open(
701705
struct timeval start_tv;
702706
struct timeval end_tv;
703707
#endif
704-
/* Limit the waittime to 50 msec. If it doesn't work within this
705-
* time we close the socket and try creating it again. */
706-
waitnow = waittime > 50 ? 50 : waittime;
707-
708708
FD_ZERO(&rfds);
709709
FD_SET(sd, &rfds);
710710
FD_ZERO(&wfds);

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -743,6 +743,8 @@ static char *(features[]) =
743743

744744
static int included_patches[] =
745745
{ /* Add new patch number below this line */
746+
/**/
747+
1531,
746748
/**/
747749
1530,
748750
/**/

0 commit comments

Comments
 (0)