Merge with master

1 files changed, 38 insertions, 38 deletions

diff --git a/src/core/lib/iomgr/tcp_client_windows.cc b/src/core/lib/iomgr/tcp_client_windows.cc
index 94ae9365f0..d67addd11c 100644
--- a/src/core/lib/iomgr/tcp_client_windows.cc
+++ b/src/core/lib/iomgr/tcp_client_windows.cc
@@ -40,20 +40,20 @@
 #include "src/core/lib/iomgr/timer.h"
 
 typedef struct {
-  grpc_closure *on_done;
+  grpc_closure* on_done;
   gpr_mu mu;
-  grpc_winsocket *socket;
+  grpc_winsocket* socket;
   grpc_timer alarm;
   grpc_closure on_alarm;
-  char *addr_name;
+  char* addr_name;
   int refs;
   grpc_closure on_connect;
-  grpc_endpoint **endpoint;
-  grpc_channel_args *channel_args;
+  grpc_endpoint** endpoint;
+  grpc_channel_args* channel_args;
 } async_connect;
 
-static void async_connect_unlock_and_cleanup(async_connect *ac,
-                                             grpc_winsocket *socket) {
+static void async_connect_unlock_and_cleanup(async_connect* ac,
+                                             grpc_winsocket* socket) {
   int done = (--ac->refs == 0);
   gpr_mu_unlock(&ac->mu);
   if (done) {
@@ -65,10 +65,10 @@ 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) {
-  async_connect *ac = (async_connect *)acp;
+static void on_alarm(void* acp, grpc_error* error) {
+  async_connect* ac = (async_connect*)acp;
   gpr_mu_lock(&ac->mu);
-  grpc_winsocket *socket = ac->socket;
+  grpc_winsocket* socket = ac->socket;
   ac->socket = NULL;
   if (socket != NULL) {
     grpc_winsocket_shutdown(socket);
@@ -76,16 +76,16 @@ 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) {
-  async_connect *ac = (async_connect *)acp;
-  grpc_endpoint **ep = ac->endpoint;
+static void on_connect(void* acp, grpc_error* error) {
+  async_connect* ac = (async_connect*)acp;
+  grpc_endpoint** ep = ac->endpoint;
   GPR_ASSERT(*ep == NULL);
-  grpc_closure *on_done = ac->on_done;
+  grpc_closure* on_done = ac->on_done;
 
   GRPC_ERROR_REF(error);
 
   gpr_mu_lock(&ac->mu);
-  grpc_winsocket *socket = ac->socket;
+  grpc_winsocket* socket = ac->socket;
   ac->socket = NULL;
   gpr_mu_unlock(&ac->mu);
 
@@ -120,24 +120,24 @@ static void on_connect(void *acp, grpc_error *error) {
 
 /* Tries to issue one async connection, then schedules both an IOCP
    notification request for the connection, and one timeout alert. */
-static void tcp_client_connect_impl(grpc_closure *on_done,
-                                    grpc_endpoint **endpoint,
-                                    grpc_pollset_set *interested_parties,
-                                    const grpc_channel_args *channel_args,
-                                    const grpc_resolved_address *addr,
+static void tcp_client_connect_impl(grpc_closure* on_done,
+                                    grpc_endpoint** endpoint,
+                                    grpc_pollset_set* interested_parties,
+                                    const grpc_channel_args* channel_args,
+                                    const grpc_resolved_address* addr,
                                     grpc_millis deadline) {
   SOCKET sock = INVALID_SOCKET;
   BOOL success;
   int status;
   grpc_resolved_address addr6_v4mapped;
   grpc_resolved_address local_address;
-  async_connect *ac;
-  grpc_winsocket *socket = NULL;
+  async_connect* ac;
+  grpc_winsocket* socket = NULL;
   LPFN_CONNECTEX ConnectEx;
   GUID guid = WSAID_CONNECTEX;
   DWORD ioctl_num_bytes;
-  grpc_winsocket_callback_info *info;
-  grpc_error *error = GRPC_ERROR_NONE;
+  grpc_winsocket_callback_info* info;
+  grpc_error* error = GRPC_ERROR_NONE;
 
   *endpoint = NULL;
 
@@ -172,8 +172,8 @@ static void tcp_client_connect_impl(grpc_closure *on_done,
 
   grpc_sockaddr_make_wildcard6(0, &local_address);
 
-  status = bind(sock, (struct sockaddr *)&local_address.addr,
-                (int)local_address.len);
+  status =
+      bind(sock, (struct sockaddr*)&local_address.addr, (int)local_address.len);
   if (status != 0) {
     error = GRPC_WSA_ERROR(WSAGetLastError(), "bind");
     goto failure;
@@ -181,8 +181,8 @@ static void tcp_client_connect_impl(grpc_closure *on_done,
 
   socket = grpc_winsocket_create(sock, "client");
   info = &socket->write_info;
-  success = ConnectEx(sock, (struct sockaddr *)&addr->addr, (int)addr->len,
-                      NULL, 0, NULL, &info->overlapped);
+  success = ConnectEx(sock, (struct sockaddr*)&addr->addr, (int)addr->len, NULL,
+                      0, NULL, &info->overlapped);
 
   /* It wouldn't be unusual to get a success immediately. But we'll still get
      an IOCP notification, so let's ignore it. */
@@ -194,7 +194,7 @@ static void tcp_client_connect_impl(grpc_closure *on_done,
     }
   }
 
-  ac = (async_connect *)gpr_malloc(sizeof(async_connect));
+  ac = (async_connect*)gpr_malloc(sizeof(async_connect));
   ac->on_done = on_done;
   ac->socket = socket;
   gpr_mu_init(&ac->mu);
@@ -211,8 +211,8 @@ static void tcp_client_connect_impl(grpc_closure *on_done,
 
 failure:
   GPR_ASSERT(error != GRPC_ERROR_NONE);
-  char *target_uri = grpc_sockaddr_to_uri(addr);
-  grpc_error *final_error = grpc_error_set_str(
+  char* target_uri = grpc_sockaddr_to_uri(addr);
+  grpc_error* final_error = grpc_error_set_str(
       GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING("Failed to connect",
                                                        &error, 1),
       GRPC_ERROR_STR_TARGET_ADDRESS, grpc_slice_from_copied_string(target_uri));
@@ -228,16 +228,16 @@ failure:
 // overridden by api_fuzzer.c
 extern "C" {
 void (*grpc_tcp_client_connect_impl)(
-    grpc_closure *closure, grpc_endpoint **ep,
-    grpc_pollset_set *interested_parties, const grpc_channel_args *channel_args,
-    const grpc_resolved_address *addr,
+    grpc_closure* closure, grpc_endpoint** ep,
+    grpc_pollset_set* interested_parties, const grpc_channel_args* channel_args,
+    const grpc_resolved_address* addr,
     grpc_millis deadline) = tcp_client_connect_impl;
 }
 
-void grpc_tcp_client_connect(grpc_closure *closure, grpc_endpoint **ep,
-                             grpc_pollset_set *interested_parties,
-                             const grpc_channel_args *channel_args,
-                             const grpc_resolved_address *addr,
+void grpc_tcp_client_connect(grpc_closure* closure, grpc_endpoint** ep,
+                             grpc_pollset_set* interested_parties,
+                             const grpc_channel_args* channel_args,
+                             const grpc_resolved_address* addr,
                              grpc_millis deadline) {
   grpc_tcp_client_connect_impl(closure, ep, interested_parties, channel_args,
                                addr, deadline);