diff options
| author |  Yash Tibrewal <yashkt@google.com> | 2017-11-16 19:31:28 -0800 |
|---|---|---|
| committer | Yash Tibrewal <yashkt@google.com> | 2017-11-16 19:31:28 -0800 |
| commit | 177039b2f89e73ad0d048da021f939f3a153c4e2 (patch) | |
| tree | c7f10f04cd9a0872863e2b181162bc9928160cd8 /test/core/security/secure_endpoint_test.cc | |
| parent | 995aa91bbbc68deb6dfd7c667cfee3af2bedec08 (diff) | |
| parent | 82c8f945302f128495e261b853ac49f1dfbe69a1 (diff) | |
Merge master
Diffstat (limited to 'test/core/security/secure_endpoint_test.cc')
| -rw-r--r-- | test/core/security/secure_endpoint_test.cc | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/test/core/security/secure_endpoint_test.cc b/test/core/security/secure_endpoint_test.cc index 7cee0dd3fe..14ca0a8927 100644 --- a/test/core/security/secure_endpoint_test.cc +++ b/test/core/security/secure_endpoint_test.cc @@ -40,15 +40,17 @@ static grpc_endpoint_test_fixture secure_endpoint_create_fixture_tcp_socketpair( bool use_zero_copy_protector) { grpc_core::ExecCtx _local_exec_ctx; tsi_frame_protector* fake_read_protector = - tsi_create_fake_frame_protector(NULL); + tsi_create_fake_frame_protector(nullptr); tsi_frame_protector* fake_write_protector = - tsi_create_fake_frame_protector(NULL); + tsi_create_fake_frame_protector(nullptr); tsi_zero_copy_grpc_protector* fake_read_zero_copy_protector = - use_zero_copy_protector ? tsi_create_fake_zero_copy_grpc_protector(NULL) - : NULL; + use_zero_copy_protector + ? tsi_create_fake_zero_copy_grpc_protector(nullptr) + : nullptr; tsi_zero_copy_grpc_protector* fake_write_zero_copy_protector = - use_zero_copy_protector ? tsi_create_fake_zero_copy_grpc_protector(NULL) - : NULL; + use_zero_copy_protector + ? tsi_create_fake_zero_copy_grpc_protector(nullptr) + : nullptr; grpc_endpoint_test_fixture f; grpc_endpoint_pair tcp; @@ -64,7 +66,7 @@ static grpc_endpoint_test_fixture secure_endpoint_create_fixture_tcp_socketpair( if (leftover_nslices == 0) { f.client_ep = grpc_secure_endpoint_create(fake_read_protector, fake_read_zero_copy_protector, - tcp.client, NULL, 0); + tcp.client, nullptr, 0); } else { unsigned i; tsi_result result; @@ -114,21 +116,21 @@ static grpc_endpoint_test_fixture secure_endpoint_create_fixture_tcp_socketpair( f.server_ep = grpc_secure_endpoint_create(fake_write_protector, fake_write_zero_copy_protector, - tcp.server, NULL, 0); + tcp.server, nullptr, 0); return f; } static grpc_endpoint_test_fixture secure_endpoint_create_fixture_tcp_socketpair_noleftover(size_t slice_size) { - return secure_endpoint_create_fixture_tcp_socketpair(slice_size, NULL, 0, + return secure_endpoint_create_fixture_tcp_socketpair(slice_size, nullptr, 0, false); } static grpc_endpoint_test_fixture secure_endpoint_create_fixture_tcp_socketpair_noleftover_zero_copy( size_t slice_size) { - return secure_endpoint_create_fixture_tcp_socketpair(slice_size, NULL, 0, + return secure_endpoint_create_fixture_tcp_socketpair(slice_size, nullptr, 0, true); } |