Merge with master

1 files changed, 27 insertions, 27 deletions

diff --git a/test/core/util/port_server_client.cc b/test/core/util/port_server_client.cc
index 253a1df29e..2cabd560ee 100644
--- a/test/core/util/port_server_client.cc
+++ b/test/core/util/port_server_client.cc
@@ -35,19 +35,19 @@
 #include "src/core/lib/http/httpcli.h"
 
 typedef struct freereq {
-  gpr_mu *mu;
+  gpr_mu* mu;
   grpc_polling_entity pops;
   int done;
 } freereq;
 
-static void destroy_pops_and_shutdown(void *p, grpc_error *error) {
-  grpc_pollset *pollset = grpc_polling_entity_pollset((grpc_polling_entity *)p);
+static void destroy_pops_and_shutdown(void* p, grpc_error* error) {
+  grpc_pollset* pollset = grpc_polling_entity_pollset((grpc_polling_entity*)p);
   grpc_pollset_destroy(pollset);
   gpr_free(pollset);
 }
 
-static void freed_port_from_server(void *arg, grpc_error *error) {
-  freereq *pr = (freereq *)arg;
+static void freed_port_from_server(void* arg, grpc_error* error) {
+  freereq* pr = (freereq*)arg;
   gpr_mu_lock(pr->mu);
   pr->done = 1;
   GRPC_LOG_IF_ERROR(
@@ -61,9 +61,9 @@ void grpc_free_port_using_server(int port) {
   grpc_httpcli_request req;
   grpc_httpcli_response rsp;
   freereq pr;
-  char *path;
+  char* path;
   ExecCtx _local_exec_ctx;
-  grpc_closure *shutdown_closure;
+  grpc_closure* shutdown_closure;
 
   grpc_init();
 
@@ -71,18 +71,18 @@ void grpc_free_port_using_server(int port) {
   memset(&req, 0, sizeof(req));
   memset(&rsp, 0, sizeof(rsp));
 
-  grpc_pollset *pollset = (grpc_pollset *)gpr_zalloc(grpc_pollset_size());
+  grpc_pollset* pollset = (grpc_pollset*)gpr_zalloc(grpc_pollset_size());
   grpc_pollset_init(pollset, &pr.mu);
   pr.pops = grpc_polling_entity_create_from_pollset(pollset);
   shutdown_closure = GRPC_CLOSURE_CREATE(destroy_pops_and_shutdown, &pr.pops,
                                          grpc_schedule_on_exec_ctx);
 
-  req.host = (char *)GRPC_PORT_SERVER_ADDRESS;
+  req.host = const_cast<char*>(GRPC_PORT_SERVER_ADDRESS);
   gpr_asprintf(&path, "/drop/%d", port);
   req.http.path = path;
 
   grpc_httpcli_context_init(&context);
-  grpc_resource_quota *resource_quota =
+  grpc_resource_quota* resource_quota =
       grpc_resource_quota_create("port_server_client/free");
   grpc_httpcli_get(&context, &pr.pops, resource_quota, &req,
                    grpc_exec_ctx_now() + 30 * GPR_MS_PER_SEC,
@@ -93,7 +93,7 @@ void grpc_free_port_using_server(int port) {
   grpc_exec_ctx_flush();
   gpr_mu_lock(pr.mu);
   while (!pr.done) {
-    grpc_pollset_worker *worker = NULL;
+    grpc_pollset_worker* worker = NULL;
     if (!GRPC_LOG_IF_ERROR(
             "pollset_work",
             grpc_pollset_work(grpc_polling_entity_pollset(&pr.pops), &worker,
@@ -114,25 +114,25 @@ void grpc_free_port_using_server(int port) {
 }
 
 typedef struct portreq {
-  gpr_mu *mu;
+  gpr_mu* mu;
   grpc_polling_entity pops;
   int port;
   int retries;
-  char *server;
-  grpc_httpcli_context *ctx;
+  char* server;
+  grpc_httpcli_context* ctx;
   grpc_httpcli_response response;
 } portreq;
 
-static void got_port_from_server(void *arg, grpc_error *error) {
+static void got_port_from_server(void* arg, grpc_error* error) {
   size_t i;
   int port = 0;
-  portreq *pr = (portreq *)arg;
+  portreq* pr = (portreq*)arg;
   int failed = 0;
-  grpc_httpcli_response *response = &pr->response;
+  grpc_httpcli_response* response = &pr->response;
 
   if (error != GRPC_ERROR_NONE) {
     failed = 1;
-    const char *msg = grpc_error_string(error);
+    const char* msg = grpc_error_string(error);
     gpr_log(GPR_DEBUG, "failed port pick from server: retrying [%s]", msg);
 
   } else if (response->status != 200) {
@@ -161,10 +161,10 @@ static void got_port_from_server(void *arg, grpc_error *error) {
             GPR_TIMESPAN)));
     pr->retries++;
     req.host = pr->server;
-    req.http.path = (char *)"/get";
+    req.http.path = const_cast<char*>("/get");
     grpc_http_response_destroy(&pr->response);
     memset(&pr->response, 0, sizeof(pr->response));
-    grpc_resource_quota *resource_quota =
+    grpc_resource_quota* resource_quota =
         grpc_resource_quota_create("port_server_client/pick_retry");
     grpc_httpcli_get(pr->ctx, &pr->pops, resource_quota, &req,
                      grpc_exec_ctx_now() + 30 * GPR_MS_PER_SEC,
@@ -194,26 +194,26 @@ int grpc_pick_port_using_server(void) {
   grpc_httpcli_request req;
   portreq pr;
   ExecCtx _local_exec_ctx;
-  grpc_closure *shutdown_closure;
+  grpc_closure* shutdown_closure;
 
   grpc_init();
 
   memset(&pr, 0, sizeof(pr));
   memset(&req, 0, sizeof(req));
-  grpc_pollset *pollset = (grpc_pollset *)gpr_zalloc(grpc_pollset_size());
+  grpc_pollset* pollset = (grpc_pollset*)gpr_zalloc(grpc_pollset_size());
   grpc_pollset_init(pollset, &pr.mu);
   pr.pops = grpc_polling_entity_create_from_pollset(pollset);
   shutdown_closure = GRPC_CLOSURE_CREATE(destroy_pops_and_shutdown, &pr.pops,
                                          grpc_schedule_on_exec_ctx);
   pr.port = -1;
-  pr.server = (char *)GRPC_PORT_SERVER_ADDRESS;
+  pr.server = const_cast<char*>(GRPC_PORT_SERVER_ADDRESS);
   pr.ctx = &context;
 
-  req.host = (char *)GRPC_PORT_SERVER_ADDRESS;
-  req.http.path = (char *)"/get";
+  req.host = const_cast<char*>(GRPC_PORT_SERVER_ADDRESS);
+  req.http.path = const_cast<char*>("/get");
 
   grpc_httpcli_context_init(&context);
-  grpc_resource_quota *resource_quota =
+  grpc_resource_quota* resource_quota =
       grpc_resource_quota_create("port_server_client/pick");
   grpc_httpcli_get(
       &context, &pr.pops, resource_quota, &req,
@@ -224,7 +224,7 @@ int grpc_pick_port_using_server(void) {
   grpc_exec_ctx_flush();
   gpr_mu_lock(pr.mu);
   while (pr.port == -1) {
-    grpc_pollset_worker *worker = NULL;
+    grpc_pollset_worker* worker = NULL;
     if (!GRPC_LOG_IF_ERROR(
             "pollset_work",
             grpc_pollset_work(grpc_polling_entity_pollset(&pr.pops), &worker,