Merge github.com:grpc/grpc into grpc_millis

1 files changed, 18 insertions, 18 deletions

diff --git a/test/core/end2end/fixtures/proxy.c b/test/core/end2end/fixtures/proxy.c
index d457aeefe8..9ad862728f 100644
--- a/test/core/end2end/fixtures/proxy.c
+++ b/test/core/end2end/fixtures/proxy.c
@@ -80,7 +80,7 @@ grpc_end2end_proxy *grpc_end2end_proxy_create(const grpc_end2end_proxy_def *def,
   int proxy_port = grpc_pick_unused_port_or_die();
   int server_port = grpc_pick_unused_port_or_die();
 
-  grpc_end2end_proxy *proxy = gpr_malloc(sizeof(*proxy));
+  grpc_end2end_proxy *proxy = (grpc_end2end_proxy *)gpr_malloc(sizeof(*proxy));
   memset(proxy, 0, sizeof(*proxy));
 
   gpr_join_host_port(&proxy->proxy_port, "localhost", proxy_port);
@@ -106,14 +106,14 @@ grpc_end2end_proxy *grpc_end2end_proxy_create(const grpc_end2end_proxy_def *def,
 }
 
 static closure *new_closure(void (*func)(void *arg, int success), void *arg) {
-  closure *cl = gpr_malloc(sizeof(*cl));
+  closure *cl = (closure *)gpr_malloc(sizeof(*cl));
   cl->func = func;
   cl->arg = arg;
   return cl;
 }
 
 static void shutdown_complete(void *arg, int success) {
-  grpc_end2end_proxy *proxy = arg;
+  grpc_end2end_proxy *proxy = (grpc_end2end_proxy *)arg;
   proxy->shutdown = 1;
   grpc_completion_queue_shutdown(proxy->cq);
 }
@@ -146,12 +146,12 @@ static void unrefpc(proxy_call *pc, const char *reason) {
 static void refpc(proxy_call *pc, const char *reason) { gpr_ref(&pc->refs); }
 
 static void on_c2p_sent_initial_metadata(void *arg, int success) {
-  proxy_call *pc = arg;
+  proxy_call *pc = (proxy_call *)arg;
   unrefpc(pc, "on_c2p_sent_initial_metadata");
 }
 
 static void on_p2s_recv_initial_metadata(void *arg, int success) {
-  proxy_call *pc = arg;
+  proxy_call *pc = (proxy_call *)arg;
   grpc_op op;
   grpc_call_error err;
 
@@ -172,14 +172,14 @@ static void on_p2s_recv_initial_metadata(void *arg, int success) {
 }
 
 static void on_p2s_sent_initial_metadata(void *arg, int success) {
-  proxy_call *pc = arg;
+  proxy_call *pc = (proxy_call *)arg;
   unrefpc(pc, "on_p2s_sent_initial_metadata");
 }
 
 static void on_c2p_recv_msg(void *arg, int success);
 
 static void on_p2s_sent_message(void *arg, int success) {
-  proxy_call *pc = arg;
+  proxy_call *pc = (proxy_call *)arg;
   grpc_op op;
   grpc_call_error err;
 
@@ -199,12 +199,12 @@ static void on_p2s_sent_message(void *arg, int success) {
 }
 
 static void on_p2s_sent_close(void *arg, int success) {
-  proxy_call *pc = arg;
+  proxy_call *pc = (proxy_call *)arg;
   unrefpc(pc, "on_p2s_sent_close");
 }
 
 static void on_c2p_recv_msg(void *arg, int success) {
-  proxy_call *pc = arg;
+  proxy_call *pc = (proxy_call *)arg;
   grpc_op op;
   grpc_call_error err;
 
@@ -235,7 +235,7 @@ static void on_c2p_recv_msg(void *arg, int success) {
 static void on_p2s_recv_msg(void *arg, int success);
 
 static void on_c2p_sent_message(void *arg, int success) {
-  proxy_call *pc = arg;
+  proxy_call *pc = (proxy_call *)arg;
   grpc_op op;
   grpc_call_error err;
 
@@ -255,7 +255,7 @@ static void on_c2p_sent_message(void *arg, int success) {
 }
 
 static void on_p2s_recv_msg(void *arg, int success) {
-  proxy_call *pc = arg;
+  proxy_call *pc = (proxy_call *)arg;
   grpc_op op;
   grpc_call_error err;
 
@@ -275,12 +275,12 @@ static void on_p2s_recv_msg(void *arg, int success) {
 }
 
 static void on_c2p_sent_status(void *arg, int success) {
-  proxy_call *pc = arg;
+  proxy_call *pc = (proxy_call *)arg;
   unrefpc(pc, "on_c2p_sent_status");
 }
 
 static void on_p2s_status(void *arg, int success) {
-  proxy_call *pc = arg;
+  proxy_call *pc = (proxy_call *)arg;
   grpc_op op;
   grpc_call_error err;
 
@@ -305,18 +305,18 @@ static void on_p2s_status(void *arg, int success) {
 }
 
 static void on_c2p_closed(void *arg, int success) {
-  proxy_call *pc = arg;
+  proxy_call *pc = (proxy_call *)arg;
   unrefpc(pc, "on_c2p_closed");
 }
 
 static void on_new_call(void *arg, int success) {
-  grpc_end2end_proxy *proxy = arg;
+  grpc_end2end_proxy *proxy = (grpc_end2end_proxy *)arg;
   grpc_call_error err;
 
   if (success) {
     grpc_op op;
     memset(&op, 0, sizeof(op));
-    proxy_call *pc = gpr_malloc(sizeof(*pc));
+    proxy_call *pc = (proxy_call *)gpr_malloc(sizeof(*pc));
     memset(pc, 0, sizeof(*pc));
     pc->proxy = proxy;
     GPR_SWAP(grpc_metadata_array, pc->c2p_initial_metadata,
@@ -404,7 +404,7 @@ static void request_call(grpc_end2end_proxy *proxy) {
 }
 
 static void thread_main(void *arg) {
-  grpc_end2end_proxy *proxy = arg;
+  grpc_end2end_proxy *proxy = (grpc_end2end_proxy *)arg;
   closure *cl;
   for (;;) {
     grpc_event ev = grpc_completion_queue_next(
@@ -416,7 +416,7 @@ static void thread_main(void *arg) {
       case GRPC_QUEUE_SHUTDOWN:
         return;
       case GRPC_OP_COMPLETE:
-        cl = ev.tag;
+        cl = (closure *)ev.tag;
         cl->func(cl->arg, ev.success);
         gpr_free(cl);
         break;