aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00
Code Activity

patch 7.4.1531

Browse Source 
Problem:    Compiler warning for unitinialized variable. (Dominique Pelle)
Solution:   Always give the variable a value.
This commit is contained in:
Bram Moolenaar
2016-03-10 21:10:58 +01:00
parent 75578a388d
commit 40e8cb292c
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/channel.c
View File

@@ -686,6 +686,10 @@ channel_open(
return NULL; 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 /* If connect() didn't finish then try using select() to wait for the
* connection to be made. For Win32 always use select() to wait. */ * connection to be made. For Win32 always use select() to wait. */
#ifndef WIN32 #ifndef WIN32
@@ -701,10 +705,6 @@ channel_open(
struct timeval start_tv; struct timeval start_tv;
struct timeval end_tv; struct timeval end_tv;
#endif #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_ZERO(&rfds);
FD_SET(sd, &rfds); FD_SET(sd, &rfds);
FD_ZERO(&wfds); FD_ZERO(&wfds);

2
src/version.c
View File

@@ -743,6 +743,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1531,
/**/ /**/
1530, 1530,
/**/ /**/