diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-03-10 21:10:58 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-03-10 21:10:58 +0100 |
| commit | 40e8cb292c36f5057628e570591e8917ac1ca121 (patch) | |
| tree | cc4e3e5bc3e55a94138dac660eb04811016b3c82 | |
| parent | 75578a388d2aff59dc330ceccd8894c79b4bc735 (diff) | |
patch 7.4.1531v7.4.1531
Problem: Compiler warning for unitinialized variable. (Dominique Pelle)
Solution: Always give the variable a value.
| -rw-r--r-- | src/channel.c | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/channel.c b/src/channel.c index e7cee19981..d77a4b7d1b 100644 --- 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 e1ee16dcef..d7d518109f 100644 --- 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, |