diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-05-11 10:46:33 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-05-11 10:46:33 -0700 |
| commit | 9ec7f5ab81b98408b1cd4094ff536358528534c0 (patch) | |
| tree | 5ae068d99cc33863e5cb332b79558e428fa60f9d /src/core | |
| parent | b122e2ec9ff9c32b9ced1efbc02a06bc64178d9f (diff) | |
| parent | 34f9af40e985b5fea4cf65335d14066398f43e83 (diff) | |
Merge github.com:grpc/grpc into churn-churn-churn-the-api-gently-down-the-stream
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/iomgr/iocp_windows.c | 1 | ||||
| -rw-r--r-- | src/core/iomgr/tcp_client_windows.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/core/iomgr/iocp_windows.c b/src/core/iomgr/iocp_windows.c index 8827bb99bc..0c62bfccd5 100644 --- a/src/core/iomgr/iocp_windows.c +++ b/src/core/iomgr/iocp_windows.c @@ -121,7 +121,6 @@ static void do_iocp_work() { } static void iocp_loop(void *p) { - void * eventshutdown = NULL; while (gpr_atm_acq_load(&g_orphans) || gpr_atm_acq_load(&g_custom_events) || !gpr_event_get(&g_shutdown_iocp)) { diff --git a/src/core/iomgr/tcp_client_windows.c b/src/core/iomgr/tcp_client_windows.c index d95346f87a..cf5174327d 100644 --- a/src/core/iomgr/tcp_client_windows.c +++ b/src/core/iomgr/tcp_client_windows.c @@ -98,10 +98,10 @@ static void on_connect(void *acp, int from_iocp) { if (from_iocp) { DWORD transfered_bytes = 0; DWORD flags; - info->outstanding = 0; BOOL wsa_success = WSAGetOverlappedResult(sock, &info->overlapped, &transfered_bytes, FALSE, &flags); + info->outstanding = 0; GPR_ASSERT(transfered_bytes == 0); if (!wsa_success) { char *utf8_message = gpr_format_message(WSAGetLastError()); |