diff options
| author | rburnett@bk-internal.mysql.com <> | 2005-05-06 15:08:10 +0200 |
|---|---|---|
| committer | rburnett@bk-internal.mysql.com <> | 2005-05-06 15:08:10 +0200 |
| commit | e4523c23193dace1f7e4d398d181f49df631cf8d (patch) | |
| tree | b6b5950dd0695d108e0a13315eba184e9ee8a897 /vio | |
| parent | e7d7c0f23630cd75d6912feb4196a84f82566a57 (diff) | |
| download | mariadb-git-e4523c23193dace1f7e4d398d181f49df631cf8d.tar.gz | |
Bug #9721 net_write_timeout not used on Windows
viosocket.c:
Use ?: syntax to simplify code for setting both timeouts
Diffstat (limited to 'vio')
| -rw-r--r-- | vio/viosocket.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/vio/viosocket.c b/vio/viosocket.c index b6aa793f57b..172d9127dc2 100644 --- a/vio/viosocket.c +++ b/vio/viosocket.c @@ -323,12 +323,9 @@ void vio_timeout(Vio *vio __attribute__((unused)), { #ifdef __WIN__ ulong wait_timeout= (ulong) timeout * 1000; - if (which == 0) - (void) setsockopt(vio->sd, SOL_SOCKET, SO_RCVTIMEO, (char*) &wait_timeout, - sizeof(wait_timeout)); - else - (void) setsockopt(vio->sd, SOL_SOCKET, SO_SNDTIMEO, (char*) &wait_timeout, - sizeof(wait_timeout)); + (void) setsockopt(vio->sd, SOL_SOCKET, + which ? SO_SNDTIMEO : SO_RCVTIMEO, (char*) &wait_timeout, + sizeof(wait_timeout)); #endif /* __WIN__ */ } |