Merge with master

2 files changed, 32 insertions, 33 deletions

diff --git a/src/core/lib/security/credentials/fake/fake_credentials.cc b/src/core/lib/security/credentials/fake/fake_credentials.cc
index 42257c7a13..0922b486a2 100644
--- a/src/core/lib/security/credentials/fake/fake_credentials.cc
+++ b/src/core/lib/security/credentials/fake/fake_credentials.cc
@@ -34,9 +34,9 @@
   "grpc.fake_security.expected_targets"
 
 static grpc_security_status fake_transport_security_create_security_connector(
-    grpc_channel_credentials *c, grpc_call_credentials *call_creds,
-    const char *target, const grpc_channel_args *args,
-    grpc_channel_security_connector **sc, grpc_channel_args **new_args) {
+    grpc_channel_credentials* c, grpc_call_credentials* call_creds,
+    const char* target, const grpc_channel_args* args,
+    grpc_channel_security_connector** sc, grpc_channel_args** new_args) {
   *sc =
       grpc_fake_channel_security_connector_create(c, call_creds, target, args);
   return GRPC_SECURITY_OK;
@@ -44,7 +44,7 @@ static grpc_security_status fake_transport_security_create_security_connector(
 
 static grpc_security_status
 fake_transport_security_server_create_security_connector(
-    grpc_server_credentials *c, grpc_server_security_connector **sc) {
+    grpc_server_credentials* c, grpc_server_security_connector** sc) {
   *sc = grpc_fake_server_security_connector_create(c);
   return GRPC_SECURITY_OK;
 }
@@ -57,20 +57,20 @@ static grpc_server_credentials_vtable
     fake_transport_security_server_credentials_vtable = {
         NULL, fake_transport_security_server_create_security_connector};
 
-grpc_channel_credentials *grpc_fake_transport_security_credentials_create(
+grpc_channel_credentials* grpc_fake_transport_security_credentials_create(
     void) {
-  grpc_channel_credentials *c =
-      (grpc_channel_credentials *)gpr_zalloc(sizeof(grpc_channel_credentials));
+  grpc_channel_credentials* c =
+      (grpc_channel_credentials*)gpr_zalloc(sizeof(grpc_channel_credentials));
   c->type = GRPC_CHANNEL_CREDENTIALS_TYPE_FAKE_TRANSPORT_SECURITY;
   c->vtable = &fake_transport_security_credentials_vtable;
   gpr_ref_init(&c->refcount, 1);
   return c;
 }
 
-grpc_server_credentials *grpc_fake_transport_security_server_credentials_create(
+grpc_server_credentials* grpc_fake_transport_security_server_credentials_create(
     void) {
-  grpc_server_credentials *c =
-      (grpc_server_credentials *)gpr_malloc(sizeof(grpc_server_credentials));
+  grpc_server_credentials* c =
+      (grpc_server_credentials*)gpr_malloc(sizeof(grpc_server_credentials));
   memset(c, 0, sizeof(grpc_server_credentials));
   c->type = GRPC_CHANNEL_CREDENTIALS_TYPE_FAKE_TRANSPORT_SECURITY;
   gpr_ref_init(&c->refcount, 1);
@@ -78,14 +78,14 @@ grpc_server_credentials *grpc_fake_transport_security_server_credentials_create(
   return c;
 }
 
-grpc_arg grpc_fake_transport_expected_targets_arg(char *expected_targets) {
+grpc_arg grpc_fake_transport_expected_targets_arg(char* expected_targets) {
   return grpc_channel_arg_string_create(
-      (char *)GRPC_ARG_FAKE_SECURITY_EXPECTED_TARGETS, expected_targets);
+      (char*)GRPC_ARG_FAKE_SECURITY_EXPECTED_TARGETS, expected_targets);
 }
 
-const char *grpc_fake_transport_get_expected_targets(
-    const grpc_channel_args *args) {
-  const grpc_arg *expected_target_arg =
+const char* grpc_fake_transport_get_expected_targets(
+    const grpc_channel_args* args) {
+  const grpc_arg* expected_target_arg =
       grpc_channel_args_find(args, GRPC_ARG_FAKE_SECURITY_EXPECTED_TARGETS);
   if (expected_target_arg != NULL &&
       expected_target_arg->type == GRPC_ARG_STRING) {
@@ -96,16 +96,16 @@ const char *grpc_fake_transport_get_expected_targets(
 
 /* -- Metadata-only test credentials. -- */
 
-static void md_only_test_destruct(grpc_call_credentials *creds) {
-  grpc_md_only_test_credentials *c = (grpc_md_only_test_credentials *)creds;
+static void md_only_test_destruct(grpc_call_credentials* creds) {
+  grpc_md_only_test_credentials* c = (grpc_md_only_test_credentials*)creds;
   GRPC_MDELEM_UNREF(c->md);
 }
 
 static bool md_only_test_get_request_metadata(
-    grpc_call_credentials *creds, grpc_polling_entity *pollent,
-    grpc_auth_metadata_context context, grpc_credentials_mdelem_array *md_array,
-    grpc_closure *on_request_metadata, grpc_error **error) {
-  grpc_md_only_test_credentials *c = (grpc_md_only_test_credentials *)creds;
+    grpc_call_credentials* creds, grpc_polling_entity* pollent,
+    grpc_auth_metadata_context context, grpc_credentials_mdelem_array* md_array,
+    grpc_closure* on_request_metadata, grpc_error** error) {
+  grpc_md_only_test_credentials* c = (grpc_md_only_test_credentials*)creds;
   grpc_credentials_mdelem_array_add(md_array, c->md);
   if (c->is_async) {
     GRPC_CLOSURE_SCHED(on_request_metadata, GRPC_ERROR_NONE);
@@ -115,8 +115,8 @@ static bool md_only_test_get_request_metadata(
 }
 
 static void md_only_test_cancel_get_request_metadata(
-    grpc_call_credentials *c, grpc_credentials_mdelem_array *md_array,
-    grpc_error *error) {
+    grpc_call_credentials* c, grpc_credentials_mdelem_array* md_array,
+    grpc_error* error) {
   GRPC_ERROR_UNREF(error);
 }
 
@@ -124,11 +124,10 @@ static grpc_call_credentials_vtable md_only_test_vtable = {
     md_only_test_destruct, md_only_test_get_request_metadata,
     md_only_test_cancel_get_request_metadata};
 
-grpc_call_credentials *grpc_md_only_test_credentials_create(
-    const char *md_key, const char *md_value, bool is_async) {
-  grpc_md_only_test_credentials *c =
-      (grpc_md_only_test_credentials *)gpr_zalloc(
-          sizeof(grpc_md_only_test_credentials));
+grpc_call_credentials* grpc_md_only_test_credentials_create(
+    const char* md_key, const char* md_value, bool is_async) {
+  grpc_md_only_test_credentials* c = (grpc_md_only_test_credentials*)gpr_zalloc(
+      sizeof(grpc_md_only_test_credentials));
   c->base.type = GRPC_CALL_CREDENTIALS_TYPE_OAUTH2;
   c->base.vtable = &md_only_test_vtable;
   gpr_ref_init(&c->base.refcount, 1);
diff --git a/src/core/lib/security/credentials/fake/fake_credentials.h b/src/core/lib/security/credentials/fake/fake_credentials.h
index ed3f893c58..b8b58cc8fd 100644
--- a/src/core/lib/security/credentials/fake/fake_credentials.h
+++ b/src/core/lib/security/credentials/fake/fake_credentials.h
@@ -28,10 +28,10 @@ extern "C" {
 /* -- Fake transport security credentials. -- */
 
 /* Creates a fake transport security credentials object for testing. */
-grpc_channel_credentials *grpc_fake_transport_security_credentials_create(void);
+grpc_channel_credentials* grpc_fake_transport_security_credentials_create(void);
 
 /* Creates a fake server transport security credentials object for testing. */
-grpc_server_credentials *grpc_fake_transport_security_server_credentials_create(
+grpc_server_credentials* grpc_fake_transport_security_server_credentials_create(
     void);
 
 /* Used to verify the target names given to the fake transport security
@@ -46,11 +46,11 @@ grpc_server_credentials *grpc_fake_transport_security_server_credentials_create(
  * That is to say, LB channels have a heading list of LB targets separated from
  * the list of backend targets by a semicolon. For non-LB channels, only the
  * latter is present. */
-grpc_arg grpc_fake_transport_expected_targets_arg(char *expected_targets);
+grpc_arg grpc_fake_transport_expected_targets_arg(char* expected_targets);
 
 /* Return the value associated with the expected targets channel arg or NULL */
-const char *grpc_fake_transport_get_expected_targets(
-    const grpc_channel_args *args);
+const char* grpc_fake_transport_get_expected_targets(
+    const grpc_channel_args* args);
 
 /* --  Metadata-only Test credentials. -- */