Merge master

1 files changed, 8 insertions, 8 deletions

diff --git a/test/core/security/verify_jwt.cc b/test/core/security/verify_jwt.cc
index c4c3541d19..1bd92bbc97 100644
--- a/test/core/security/verify_jwt.cc
+++ b/test/core/security/verify_jwt.cc
@@ -52,21 +52,21 @@ static void on_jwt_verification_done(void* user_data,
   sync->success = (status == GRPC_JWT_VERIFIER_OK);
   if (sync->success) {
     char* claims_str;
-    GPR_ASSERT(claims != NULL);
+    GPR_ASSERT(claims != nullptr);
     claims_str =
         grpc_json_dump_to_string((grpc_json*)grpc_jwt_claims_json(claims), 2);
     printf("Claims: \n\n%s\n", claims_str);
     gpr_free(claims_str);
     grpc_jwt_claims_destroy(claims);
   } else {
-    GPR_ASSERT(claims == NULL);
+    GPR_ASSERT(claims == nullptr);
     fprintf(stderr, "Verification failed with error %s\n",
             grpc_jwt_verifier_status_to_string(status));
   }
 
   gpr_mu_lock(sync->mu);
   sync->is_done = 1;
-  GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(sync->pollset, NULL));
+  GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(sync->pollset, nullptr));
   gpr_mu_unlock(sync->mu);
 }
 
@@ -74,8 +74,8 @@ int main(int argc, char** argv) {
   synchronizer sync;
   grpc_jwt_verifier* verifier;
   gpr_cmdline* cl;
-  const char* jwt = NULL;
-  const char* aud = NULL;
+  const char* jwt = nullptr;
+  const char* aud = nullptr;
   grpc_core::ExecCtx _local_exec_ctx;
 
   grpc_init();
@@ -83,11 +83,11 @@ int main(int argc, char** argv) {
   gpr_cmdline_add_string(cl, "jwt", "JSON web token to verify", &jwt);
   gpr_cmdline_add_string(cl, "aud", "Audience for the JWT", &aud);
   gpr_cmdline_parse(cl, argc, argv);
-  if (jwt == NULL || aud == NULL) {
+  if (jwt == nullptr || aud == nullptr) {
     print_usage_and_exit(cl, argv[0]);
   }
 
-  verifier = grpc_jwt_verifier_create(NULL, 0);
+  verifier = grpc_jwt_verifier_create(nullptr, 0);
 
   grpc_init();
 
@@ -100,7 +100,7 @@ int main(int argc, char** argv) {
 
   gpr_mu_lock(sync.mu);
   while (!sync.is_done) {
-    grpc_pollset_worker* worker = NULL;
+    grpc_pollset_worker* worker = nullptr;
     if (!GRPC_LOG_IF_ERROR(
             "pollset_work",
             grpc_pollset_work(sync.pollset, &worker, GRPC_MILLIS_INF_FUTURE)))