Move arguments to the start of lists

5 files changed, 28 insertions, 28 deletions

diff --git a/test/core/security/credentials_test.c b/test/core/security/credentials_test.c
index 6769de1a60..281f14f3b7 100644
--- a/test/core/security/credentials_test.c
+++ b/test/core/security/credentials_test.c
@@ -286,7 +286,7 @@ check_metadata (expected_md * expected, grpc_credentials_md * md_elems, size_t n
 }
 
 static void
-check_google_iam_metadata (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list)
+check_google_iam_metadata (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status)
 {
   grpc_credentials *c = (grpc_credentials *) user_data;
   expected_md emd[] = { {GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY,
@@ -313,7 +313,7 @@ test_google_iam_creds (void)
 }
 
 static void
-check_access_token_metadata (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list)
+check_access_token_metadata (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status)
 {
   grpc_credentials *c = (grpc_credentials *) user_data;
   expected_md emd[] = { {GRPC_AUTHORIZATION_METADATA_KEY, "Bearer blah"} };
@@ -336,7 +336,7 @@ test_access_token_creds (void)
 }
 
 static void
-check_ssl_oauth2_composite_metadata (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list)
+check_ssl_oauth2_composite_metadata (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status)
 {
   grpc_credentials *c = (grpc_credentials *) user_data;
   expected_md emd[] = {
@@ -382,7 +382,7 @@ test_ssl_fake_transport_security_composite_creds_failure (void)
 }
 
 static void
-check_ssl_oauth2_google_iam_composite_metadata (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list)
+check_ssl_oauth2_google_iam_composite_metadata (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status)
 {
   grpc_credentials *c = (grpc_credentials *) user_data;
   expected_md emd[] = {
@@ -426,7 +426,7 @@ test_ssl_oauth2_google_iam_composite_creds (void)
 }
 
 static void
-on_oauth2_creds_get_metadata_success (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list)
+on_oauth2_creds_get_metadata_success (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status)
 {
   GPR_ASSERT (status == GRPC_CREDENTIALS_OK);
   GPR_ASSERT (num_md == 1);
@@ -437,7 +437,7 @@ on_oauth2_creds_get_metadata_success (void *user_data, grpc_credentials_md * md_
 }
 
 static void
-on_oauth2_creds_get_metadata_failure (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list)
+on_oauth2_creds_get_metadata_failure (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status)
 {
   GPR_ASSERT (status == GRPC_CREDENTIALS_ERROR);
   GPR_ASSERT (num_md == 0);
@@ -457,7 +457,7 @@ validate_compute_engine_http_request (const grpc_httpcli_request * request)
 }
 
 static int
-compute_engine_httpcli_get_success_override (const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list)
+compute_engine_httpcli_get_success_override (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data)
 {
   grpc_httpcli_response response = http_response (200, valid_oauth2_json_response);
   validate_compute_engine_http_request (request);
@@ -466,7 +466,7 @@ compute_engine_httpcli_get_success_override (const grpc_httpcli_request * reques
 }
 
 static int
-compute_engine_httpcli_get_failure_override (const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list)
+compute_engine_httpcli_get_failure_override (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data)
 {
   grpc_httpcli_response response = http_response (403, "Not Authorized.");
   validate_compute_engine_http_request (request);
@@ -475,14 +475,14 @@ compute_engine_httpcli_get_failure_override (const grpc_httpcli_request * reques
 }
 
 static int
-httpcli_post_should_not_be_called (const grpc_httpcli_request * request, const char *body_bytes, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list)
+httpcli_post_should_not_be_called (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, const char *body_bytes, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data)
 {
   GPR_ASSERT ("HTTP POST should not be called" == NULL);
   return 1;
 }
 
 static int
-httpcli_get_should_not_be_called (const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list)
+httpcli_get_should_not_be_called (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data)
 {
   GPR_ASSERT ("HTTP GET should not be called" == NULL);
   return 1;
@@ -544,7 +544,7 @@ validate_refresh_token_http_request (const grpc_httpcli_request * request, const
 }
 
 static int
-refresh_token_httpcli_post_success (const grpc_httpcli_request * request, const char *body, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list)
+refresh_token_httpcli_post_success (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, const char *body, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data)
 {
   grpc_httpcli_response response = http_response (200, valid_oauth2_json_response);
   validate_refresh_token_http_request (request, body, body_size);
@@ -553,7 +553,7 @@ refresh_token_httpcli_post_success (const grpc_httpcli_request * request, const
 }
 
 static int
-refresh_token_httpcli_post_failure (const grpc_httpcli_request * request, const char *body, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list)
+refresh_token_httpcli_post_failure (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, const char *body, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data)
 {
   grpc_httpcli_response response = http_response (403, "Not Authorized.");
   validate_refresh_token_http_request (request, body, body_size);
@@ -636,7 +636,7 @@ encode_and_sign_jwt_should_not_be_called (const grpc_auth_json_key * json_key, c
 }
 
 static void
-on_jwt_creds_get_metadata_success (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list)
+on_jwt_creds_get_metadata_success (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status)
 {
   char *expected_md_value;
   gpr_asprintf (&expected_md_value, "Bearer %s", test_signed_jwt);
@@ -650,7 +650,7 @@ on_jwt_creds_get_metadata_success (void *user_data, grpc_credentials_md * md_ele
 }
 
 static void
-on_jwt_creds_get_metadata_failure (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list)
+on_jwt_creds_get_metadata_failure (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status)
 {
   GPR_ASSERT (status == GRPC_CREDENTIALS_ERROR);
   GPR_ASSERT (num_md == 0);
@@ -811,7 +811,7 @@ plugin_get_metadata_failure (void *state, const char *service_url, grpc_credenti
 }
 
 static void
-on_plugin_metadata_received_success (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list)
+on_plugin_metadata_received_success (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status)
 {
   size_t i = 0;
   GPR_ASSERT (user_data == NULL);
@@ -825,7 +825,7 @@ on_plugin_metadata_received_success (void *user_data, grpc_credentials_md * md_e
 }
 
 static void
-on_plugin_metadata_received_failure (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list)
+on_plugin_metadata_received_failure (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status)
 {
   GPR_ASSERT (user_data == NULL);
   GPR_ASSERT (md_elems == NULL);
diff --git a/test/core/security/jwt_verifier_test.c b/test/core/security/jwt_verifier_test.c
index 15c19e2533..506918d27c 100644
--- a/test/core/security/jwt_verifier_test.c
+++ b/test/core/security/jwt_verifier_test.c
@@ -190,14 +190,14 @@ http_response (int status, char *body)
 }
 
 static int
-httpcli_post_should_not_be_called (const grpc_httpcli_request * request, const char *body_bytes, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list)
+httpcli_post_should_not_be_called (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, const char *body_bytes, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data)
 {
   GPR_ASSERT ("HTTP POST should not be called" == NULL);
   return 1;
 }
 
 static int
-httpcli_get_google_keys_for_email (const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list)
+httpcli_get_google_keys_for_email (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data)
 {
   grpc_httpcli_response response = http_response (200, good_google_email_keys ());
   GPR_ASSERT (request->handshaker == &grpc_httpcli_ssl);
@@ -240,7 +240,7 @@ test_jwt_verifier_google_email_issuer_success (void)
 }
 
 static int
-httpcli_get_custom_keys_for_email (const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list)
+httpcli_get_custom_keys_for_email (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data)
 {
   grpc_httpcli_response response = http_response (200, gpr_strdup (good_jwk_set));
   GPR_ASSERT (request->handshaker == &grpc_httpcli_ssl);
@@ -273,7 +273,7 @@ test_jwt_verifier_custom_email_issuer_success (void)
 }
 
 static int
-httpcli_get_jwk_set (const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list)
+httpcli_get_jwk_set (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data)
 {
   grpc_httpcli_response response = http_response (200, gpr_strdup (good_jwk_set));
   GPR_ASSERT (request->handshaker == &grpc_httpcli_ssl);
@@ -285,7 +285,7 @@ httpcli_get_jwk_set (const grpc_httpcli_request * request, gpr_timespec deadline
 }
 
 static int
-httpcli_get_openid_config (const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list)
+httpcli_get_openid_config (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data)
 {
   grpc_httpcli_response response = http_response (200, gpr_strdup (good_openid_config));
   GPR_ASSERT (request->handshaker == &grpc_httpcli_ssl);
@@ -327,7 +327,7 @@ on_verification_key_retrieval_error (void *user_data, grpc_jwt_verifier_status s
 }
 
 static int
-httpcli_get_bad_json (const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list)
+httpcli_get_bad_json (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data)
 {
   grpc_httpcli_response response = http_response (200, gpr_strdup ("{\"bad\": \"stuff\"}"));
   GPR_ASSERT (request->handshaker == &grpc_httpcli_ssl);
@@ -427,7 +427,7 @@ test_jwt_verifier_bad_signature (void)
 }
 
 static int
-httpcli_get_should_not_be_called (const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list)
+httpcli_get_should_not_be_called (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data)
 {
   GPR_ASSERT (0);
   return 1;
diff --git a/test/core/security/oauth2_utils.c b/test/core/security/oauth2_utils.c
index a490ba4668..9035557a41 100644
--- a/test/core/security/oauth2_utils.c
+++ b/test/core/security/oauth2_utils.c
@@ -52,7 +52,7 @@ typedef struct
 } oauth2_request;
 
 static void
-on_oauth2_response (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list)
+on_oauth2_response (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status)
 {
   oauth2_request *request = user_data;
   char *token = NULL;
@@ -77,7 +77,7 @@ on_oauth2_response (void *user_data, grpc_credentials_md * md_elems, size_t num_
 }
 
 static void
-do_nothing (void *unused, int success, grpc_closure_list * closure_list)
+do_nothing (grpc_exec_ctx * exec_ctx, void *unused, int success)
 {
 }
 
diff --git a/test/core/security/print_google_default_creds_token.c b/test/core/security/print_google_default_creds_token.c
index faac2c7846..3f6720b6ea 100644
--- a/test/core/security/print_google_default_creds_token.c
+++ b/test/core/security/print_google_default_creds_token.c
@@ -51,7 +51,7 @@ typedef struct
 } synchronizer;
 
 static void
-on_metadata_response (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list)
+on_metadata_response (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status)
 {
   synchronizer *sync = user_data;
   if (status == GRPC_CREDENTIALS_ERROR)
diff --git a/test/core/security/secure_endpoint_test.c b/test/core/security/secure_endpoint_test.c
index 32db8194e4..595e84c8b1 100644
--- a/test/core/security/secure_endpoint_test.c
+++ b/test/core/security/secure_endpoint_test.c
@@ -143,7 +143,7 @@ static grpc_endpoint_test_config configs[] = {
 };
 
 static void
-inc_call_ctr (void *arg, int success, grpc_closure_list * closure_list)
+inc_call_ctr (grpc_exec_ctx * exec_ctx, void *arg, int success)
 {
   ++*(int *) arg;
 }
@@ -179,7 +179,7 @@ test_leftover (grpc_endpoint_test_config config, size_t slice_size)
 }
 
 static void
-destroy_pollset (void *p, int success, grpc_closure_list * closure_list)
+destroy_pollset (grpc_exec_ctx * exec_ctx, void *p, int success)
 {
   grpc_pollset_destroy (p);
 }