diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-11 05:06:27 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-11 05:06:27 +0000 |
| commit | 34da454f0209204d849a46aa0b7268046353393f (patch) | |
| tree | c2eb33e9f35209fc54055b6b567986219c3c37f4 /grpc/src/core/lib/iomgr/tcp_client_windows.cc | |
| parent | 94abafcdecf4bdc6755ee06abbc2d4a392aba3eb (diff) | |
| parent | 3a165cd5fcf97ca2405b5dfa46716b18df9a6cb3 (diff) | |
| download | grpcio-sys-34da454f0209204d849a46aa0b7268046353393f.tar.gz | |
Snap for 8570526 from 3a165cd5fcf97ca2405b5dfa46716b18df9a6cb3 to mainline-scheduling-releaseaml_sch_331113000aml_sch_331111000android13-mainline-scheduling-release
Change-Id: I87228c4cb8860c4900bfe524cc6b2c57fa30881c
Diffstat (limited to 'grpc/src/core/lib/iomgr/tcp_client_windows.cc')
| -rw-r--r-- | grpc/src/core/lib/iomgr/tcp_client_windows.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/grpc/src/core/lib/iomgr/tcp_client_windows.cc b/grpc/src/core/lib/iomgr/tcp_client_windows.cc index 061e7039..ef260cad 100644 --- a/grpc/src/core/lib/iomgr/tcp_client_windows.cc +++ b/grpc/src/core/lib/iomgr/tcp_client_windows.cc @@ -31,10 +31,10 @@ #include <grpc/support/log.h> #include <grpc/support/log_windows.h> +#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/iocp_windows.h" #include "src/core/lib/iomgr/sockaddr.h" -#include "src/core/lib/iomgr/sockaddr_utils.h" #include "src/core/lib/iomgr/socket_windows.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/iomgr/tcp_windows.h" @@ -66,7 +66,7 @@ static void async_connect_unlock_and_cleanup(async_connect* ac, if (socket != NULL) grpc_winsocket_destroy(socket); } -static void on_alarm(void* acp, grpc_error* error) { +static void on_alarm(void* acp, grpc_error_handle error) { async_connect* ac = (async_connect*)acp; gpr_mu_lock(&ac->mu); grpc_winsocket* socket = ac->socket; @@ -77,7 +77,7 @@ static void on_alarm(void* acp, grpc_error* error) { async_connect_unlock_and_cleanup(ac, socket); } -static void on_connect(void* acp, grpc_error* error) { +static void on_connect(void* acp, grpc_error_handle error) { async_connect* ac = (async_connect*)acp; grpc_endpoint** ep = ac->endpoint; GPR_ASSERT(*ep == NULL); @@ -137,7 +137,7 @@ static void tcp_connect(grpc_closure* on_done, grpc_endpoint** endpoint, GUID guid = WSAID_CONNECTEX; DWORD ioctl_num_bytes; grpc_winsocket_callback_info* info; - grpc_error* error = GRPC_ERROR_NONE; + grpc_error_handle error = GRPC_ERROR_NONE; async_connect* ac = NULL; *endpoint = NULL; @@ -213,7 +213,7 @@ static void tcp_connect(grpc_closure* on_done, grpc_endpoint** endpoint, failure: GPR_ASSERT(error != GRPC_ERROR_NONE); std::string target_uri = grpc_sockaddr_to_uri(addr); - grpc_error* final_error = + grpc_error_handle final_error = grpc_error_set_str(GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( "Failed to connect", &error, 1), GRPC_ERROR_STR_TARGET_ADDRESS, |