diff --git a/src/core/ext/filters/client_channel/http_connect_handshaker.cc b/src/core/ext/filters/client_channel/http_connect_handshaker.cc index 979248e279f..f469a5a9001 100644 --- a/src/core/ext/filters/client_channel/http_connect_handshaker.cc +++ b/src/core/ext/filters/client_channel/http_connect_handshaker.cc @@ -332,7 +332,7 @@ void HttpConnectHandshaker::DoHandshake(grpc_tcp_server_acceptor* /*acceptor*/, grpc_httpcli_request request; request.host = server_name; request.ssl_host_override = nullptr; - request.http.method = (char*)"CONNECT"; + request.http.method = const_cast("CONNECT"); request.http.path = server_name; request.http.version = GRPC_HTTP_HTTP10; // Set by OnReadDone request.http.hdrs = headers; diff --git a/src/core/ext/filters/client_channel/http_proxy.cc b/src/core/ext/filters/client_channel/http_proxy.cc index 9bd3fe3e015..8425a7afccd 100644 --- a/src/core/ext/filters/client_channel/http_proxy.cc +++ b/src/core/ext/filters/client_channel/http_proxy.cc @@ -172,7 +172,7 @@ class HttpProxyMapper : public ProxyMapperInterface { } grpc_arg args_to_add[2]; args_to_add[0] = grpc_channel_arg_string_create( - (char*)GRPC_ARG_HTTP_CONNECT_SERVER, + const_cast(GRPC_ARG_HTTP_CONNECT_SERVER), uri->path[0] == '/' ? uri->path + 1 : uri->path); if (user_cred != nullptr) { /* Use base64 encoding for user credentials as stated in RFC 7617 */ diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc index 646fe199076..d11cf9bcff9 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc @@ -1461,7 +1461,7 @@ void GrpcLb::ProcessAddressesAndChannelArgsLocked( // since we use this to trigger the client_load_reporting filter. static const char* args_to_remove[] = {GRPC_ARG_LB_POLICY_NAME}; grpc_arg new_arg = grpc_channel_arg_string_create( - (char*)GRPC_ARG_LB_POLICY_NAME, (char*)"grpclb"); + const_cast(GRPC_ARG_LB_POLICY_NAME), const_cast("grpclb")); grpc_channel_args_destroy(args_); args_ = grpc_channel_args_copy_and_add_and_remove( &args, args_to_remove, GPR_ARRAY_SIZE(args_to_remove), &new_arg, 1); diff --git a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc index 005de558ad7..8b405f717e0 100644 --- a/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc +++ b/src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc @@ -339,7 +339,7 @@ grpc_arg FakeResolverResponseGenerator::MakeChannelArg( FakeResolverResponseGenerator* generator) { grpc_arg arg; arg.type = GRPC_ARG_POINTER; - arg.key = (char*)GRPC_ARG_FAKE_RESOLVER_RESPONSE_GENERATOR; + arg.key = const_cast(GRPC_ARG_FAKE_RESOLVER_RESPONSE_GENERATOR); arg.value.pointer.p = generator; arg.value.pointer.vtable = &response_generator_arg_vtable; return arg; diff --git a/src/core/ext/filters/client_channel/subchannel.cc b/src/core/ext/filters/client_channel/subchannel.cc index 78d208353f7..6834ec65224 100644 --- a/src/core/ext/filters/client_channel/subchannel.cc +++ b/src/core/ext/filters/client_channel/subchannel.cc @@ -913,7 +913,7 @@ void Subchannel::ResetBackoff() { grpc_arg Subchannel::CreateSubchannelAddressArg( const grpc_resolved_address* addr) { return grpc_channel_arg_string_create( - (char*)GRPC_ARG_SUBCHANNEL_ADDRESS, + const_cast(GRPC_ARG_SUBCHANNEL_ADDRESS), gpr_strdup(addr->len > 0 ? grpc_sockaddr_to_uri(addr).c_str() : "")); } diff --git a/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc b/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc index ef2d7fd11ba..27e64fb8f3e 100644 --- a/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc +++ b/src/core/ext/transport/chttp2/client/insecure/channel_create_posix.cc @@ -42,7 +42,8 @@ grpc_channel* grpc_insecure_channel_create_from_fd( (target, fd, args)); grpc_arg default_authority_arg = grpc_channel_arg_string_create( - (char*)GRPC_ARG_DEFAULT_AUTHORITY, (char*)"test.authority"); + const_cast(GRPC_ARG_DEFAULT_AUTHORITY), + const_cast("test.authority")); grpc_channel_args* final_args = grpc_channel_args_copy_and_add(args, &default_authority_arg, 1); diff --git a/src/core/ext/transport/cronet/transport/cronet_transport.cc b/src/core/ext/transport/cronet/transport/cronet_transport.cc index 22d01f1957f..4b5a3ff29a3 100644 --- a/src/core/ext/transport/cronet/transport/cronet_transport.cc +++ b/src/core/ext/transport/cronet/transport/cronet_transport.cc @@ -1059,8 +1059,8 @@ static enum e_op_result execute_stream_op(struct op_and_state* oas) { unsigned int header_index; for (header_index = 0; header_index < s->header_array.count; header_index++) { - gpr_free(s->header_array.headers[header_index].key); - gpr_free(s->header_array.headers[header_index].value); + gpr_free(const_cast(s->header_array.headers[header_index].key)); + gpr_free(const_cast(s->header_array.headers[header_index].value)); } stream_state->state_op_done[OP_SEND_INITIAL_METADATA] = true; if (t->use_packet_coalescing) { diff --git a/src/core/ext/transport/inproc/inproc_transport.cc b/src/core/ext/transport/inproc/inproc_transport.cc index dbab879b1d0..8f9fdbc7469 100644 --- a/src/core/ext/transport/inproc/inproc_transport.cc +++ b/src/core/ext/transport/inproc/inproc_transport.cc @@ -1281,8 +1281,8 @@ grpc_channel* grpc_inproc_channel_create(grpc_server* server, // Add a default authority channel argument for the client grpc_arg default_authority_arg; default_authority_arg.type = GRPC_ARG_STRING; - default_authority_arg.key = (char*)GRPC_ARG_DEFAULT_AUTHORITY; - default_authority_arg.value.string = (char*)"inproc.authority"; + default_authority_arg.key = const_cast(GRPC_ARG_DEFAULT_AUTHORITY); + default_authority_arg.value.string = const_cast("inproc.authority"); grpc_channel_args* client_args = grpc_channel_args_copy_and_add(args, &default_authority_arg, 1); diff --git a/src/core/lib/compression/compression_args.cc b/src/core/lib/compression/compression_args.cc index 6bbda64e263..03e1a8881b6 100644 --- a/src/core/lib/compression/compression_args.cc +++ b/src/core/lib/compression/compression_args.cc @@ -55,7 +55,7 @@ grpc_channel_args* grpc_channel_args_set_channel_default_compression_algorithm( GPR_ASSERT(algorithm < GRPC_COMPRESS_ALGORITHMS_COUNT); grpc_arg tmp; tmp.type = GRPC_ARG_INTEGER; - tmp.key = (char*)GRPC_COMPRESSION_CHANNEL_DEFAULT_ALGORITHM; + tmp.key = const_cast(GRPC_COMPRESSION_CHANNEL_DEFAULT_ALGORITHM); tmp.value.integer = algorithm; return grpc_channel_args_copy_and_add(a, &tmp, 1); } @@ -108,7 +108,8 @@ grpc_channel_args* grpc_channel_args_compression_algorithm_set_state( /* create a new arg */ grpc_arg tmp; tmp.type = GRPC_ARG_INTEGER; - tmp.key = (char*)GRPC_COMPRESSION_CHANNEL_ENABLED_ALGORITHMS_BITSET; + tmp.key = + const_cast(GRPC_COMPRESSION_CHANNEL_ENABLED_ALGORITHMS_BITSET); /* all enabled by default */ tmp.value.integer = (1u << GRPC_COMPRESS_ALGORITHMS_COUNT) - 1; if (state != 0) { diff --git a/src/core/lib/gpr/string.cc b/src/core/lib/gpr/string.cc index 24376645d1e..71ec22c2cdd 100644 --- a/src/core/lib/gpr/string.cc +++ b/src/core/lib/gpr/string.cc @@ -119,7 +119,8 @@ static void asciidump(dump_out* out, const char* buf, size_t len) { dump_out_append(out, '\''); } for (cur = beg; cur != end; ++cur) { - dump_out_append(out, (isprint(*cur) ? *(char*)cur : '.')); + dump_out_append( + out, (isprint(*cur) ? *reinterpret_cast(cur) : '.')); } if (!out_was_empty) { dump_out_append(out, '\''); @@ -311,7 +312,7 @@ void gpr_string_split(const char* input, const char* sep, char*** strs, void* gpr_memrchr(const void* s, int c, size_t n) { if (s == nullptr) return nullptr; - char* b = (char*)s; + char* b = const_cast(reinterpret_cast(s)); size_t i; for (i = 0; i < n; i++) { if (b[n - i - 1] == c) { diff --git a/src/core/lib/http/httpcli.cc b/src/core/lib/http/httpcli.cc index bf93552df7a..8d024dd3ac5 100644 --- a/src/core/lib/http/httpcli.cc +++ b/src/core/lib/http/httpcli.cc @@ -209,7 +209,7 @@ static void next_address(internal_request* req, grpc_error* error) { GRPC_CLOSURE_INIT(&req->connected, on_connected, req, grpc_schedule_on_exec_ctx); grpc_arg arg = grpc_channel_arg_pointer_create( - (char*)GRPC_ARG_RESOURCE_QUOTA, req->resource_quota, + const_cast(GRPC_ARG_RESOURCE_QUOTA), req->resource_quota, grpc_resource_quota_arg_vtable()); grpc_channel_args args = {1, &arg}; grpc_tcp_client_connect(&req->connected, &req->ep, req->context->pollset_set, diff --git a/src/core/lib/iomgr/error.cc b/src/core/lib/iomgr/error.cc index 4cf153c2efa..b773b59997a 100644 --- a/src/core/lib/iomgr/error.cc +++ b/src/core/lib/iomgr/error.cc @@ -768,7 +768,7 @@ const char* grpc_error_string(grpc_error* err) { if (!gpr_atm_rel_cas(&err->atomics.error_string, 0, (gpr_atm)out)) { gpr_free(out); - out = (char*)gpr_atm_acq_load(&err->atomics.error_string); + out = reinterpret_cast(gpr_atm_acq_load(&err->atomics.error_string)); } return out; diff --git a/src/core/lib/iomgr/iomgr.cc b/src/core/lib/iomgr/iomgr.cc index 802e3bdcb4d..02646db428d 100644 --- a/src/core/lib/iomgr/iomgr.cc +++ b/src/core/lib/iomgr/iomgr.cc @@ -59,7 +59,7 @@ void grpc_iomgr_init() { gpr_cv_init(&g_rcv); grpc_core::Executor::InitAll(); g_root_object.next = g_root_object.prev = &g_root_object; - g_root_object.name = (char*)"root"; + g_root_object.name = const_cast("root"); grpc_iomgr_platform_init(); grpc_timer_list_init(); grpc_core::grpc_errqueue_init(); diff --git a/src/core/lib/iomgr/socket_factory_posix.cc b/src/core/lib/iomgr/socket_factory_posix.cc index 57137769c83..8d1bd71a111 100644 --- a/src/core/lib/iomgr/socket_factory_posix.cc +++ b/src/core/lib/iomgr/socket_factory_posix.cc @@ -87,8 +87,9 @@ static const grpc_arg_pointer_vtable socket_factory_arg_vtable = { socket_factory_arg_copy, socket_factory_arg_destroy, socket_factory_cmp}; grpc_arg grpc_socket_factory_to_arg(grpc_socket_factory* factory) { - return grpc_channel_arg_pointer_create((char*)GRPC_ARG_SOCKET_FACTORY, - factory, &socket_factory_arg_vtable); + return grpc_channel_arg_pointer_create( + const_cast(GRPC_ARG_SOCKET_FACTORY), factory, + &socket_factory_arg_vtable); } #endif diff --git a/src/core/lib/iomgr/socket_mutator.cc b/src/core/lib/iomgr/socket_mutator.cc index a448c9f61c3..918754adb07 100644 --- a/src/core/lib/iomgr/socket_mutator.cc +++ b/src/core/lib/iomgr/socket_mutator.cc @@ -78,6 +78,7 @@ static const grpc_arg_pointer_vtable socket_mutator_arg_vtable = { socket_mutator_arg_copy, socket_mutator_arg_destroy, socket_mutator_cmp}; grpc_arg grpc_socket_mutator_to_arg(grpc_socket_mutator* mutator) { - return grpc_channel_arg_pointer_create((char*)GRPC_ARG_SOCKET_MUTATOR, - mutator, &socket_mutator_arg_vtable); + return grpc_channel_arg_pointer_create( + const_cast(GRPC_ARG_SOCKET_MUTATOR), mutator, + &socket_mutator_arg_vtable); } diff --git a/src/core/lib/security/context/security_context.cc b/src/core/lib/security/context/security_context.cc index 28805a56b2d..d760d82f226 100644 --- a/src/core/lib/security/context/security_context.cc +++ b/src/core/lib/security/context/security_context.cc @@ -295,8 +295,9 @@ static const grpc_arg_pointer_vtable auth_context_pointer_vtable = { auth_context_pointer_cmp}; grpc_arg grpc_auth_context_to_arg(grpc_auth_context* c) { - return grpc_channel_arg_pointer_create((char*)GRPC_AUTH_CONTEXT_ARG, c, - &auth_context_pointer_vtable); + return grpc_channel_arg_pointer_create( + const_cast(GRPC_AUTH_CONTEXT_ARG), c, + &auth_context_pointer_vtable); } grpc_auth_context* grpc_auth_context_from_arg(const grpc_arg* arg) { diff --git a/src/core/lib/security/credentials/credentials.cc b/src/core/lib/security/credentials/credentials.cc index 8283090a156..d2f4c9c6bb5 100644 --- a/src/core/lib/security/credentials/credentials.cc +++ b/src/core/lib/security/credentials/credentials.cc @@ -67,9 +67,9 @@ static const grpc_arg_pointer_vtable credentials_pointer_vtable = { grpc_arg grpc_channel_credentials_to_arg( grpc_channel_credentials* credentials) { - return grpc_channel_arg_pointer_create((char*)GRPC_ARG_CHANNEL_CREDENTIALS, - credentials, - &credentials_pointer_vtable); + return grpc_channel_arg_pointer_create( + const_cast(GRPC_ARG_CHANNEL_CREDENTIALS), credentials, + &credentials_pointer_vtable); } grpc_channel_credentials* grpc_channel_credentials_from_arg( @@ -135,8 +135,8 @@ static const grpc_arg_pointer_vtable cred_ptr_vtable = { server_credentials_pointer_cmp}; grpc_arg grpc_server_credentials_to_arg(grpc_server_credentials* c) { - return grpc_channel_arg_pointer_create((char*)GRPC_SERVER_CREDENTIALS_ARG, c, - &cred_ptr_vtable); + return grpc_channel_arg_pointer_create( + const_cast(GRPC_SERVER_CREDENTIALS_ARG), c, &cred_ptr_vtable); } grpc_server_credentials* grpc_server_credentials_from_arg(const grpc_arg* arg) { diff --git a/src/core/lib/security/credentials/fake/fake_credentials.cc b/src/core/lib/security/credentials/fake/fake_credentials.cc index 8fd0493ee44..eef636d0043 100644 --- a/src/core/lib/security/credentials/fake/fake_credentials.cc +++ b/src/core/lib/security/credentials/fake/fake_credentials.cc @@ -76,7 +76,8 @@ grpc_fake_transport_security_server_credentials_create() { 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); + const_cast(GRPC_ARG_FAKE_SECURITY_EXPECTED_TARGETS), + expected_targets); } const char* grpc_fake_transport_get_expected_targets( diff --git a/src/core/lib/security/credentials/google_default/google_default_credentials.cc b/src/core/lib/security/credentials/google_default/google_default_credentials.cc index 9162bad47bc..46c792755db 100644 --- a/src/core/lib/security/credentials/google_default/google_default_credentials.cc +++ b/src/core/lib/security/credentials/google_default/google_default_credentials.cc @@ -175,8 +175,8 @@ static int is_metadata_server_reachable() { detector.is_done = 0; detector.success = 0; memset(&request, 0, sizeof(grpc_httpcli_request)); - request.host = (char*)GRPC_COMPUTE_ENGINE_DETECTION_HOST; - request.http.path = (char*)"/"; + request.host = const_cast(GRPC_COMPUTE_ENGINE_DETECTION_HOST); + request.http.path = const_cast("/"); grpc_httpcli_context_init(&context); grpc_resource_quota* resource_quota = grpc_resource_quota_create("google_default_credentials"); diff --git a/src/core/lib/security/credentials/jwt/jwt_verifier.cc b/src/core/lib/security/credentials/jwt/jwt_verifier.cc index 058715afff0..ec3aed8ad0a 100644 --- a/src/core/lib/security/credentials/jwt/jwt_verifier.cc +++ b/src/core/lib/security/credentials/jwt/jwt_verifier.cc @@ -696,7 +696,7 @@ static void on_openid_config_retrieved(void* user_data, grpc_error* /*error*/) { req.host = gpr_strdup(jwks_uri); req.http.path = const_cast(strchr(jwks_uri, '/')); if (req.http.path == nullptr) { - req.http.path = (char*)""; + req.http.path = const_cast(""); } else { *(req.host + (req.http.path - jwks_uri)) = '\0'; } diff --git a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc index 552183d4574..1ed839a57c9 100644 --- a/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc +++ b/src/core/lib/security/credentials/oauth2/oauth2_credentials.cc @@ -386,8 +386,9 @@ class grpc_compute_engine_token_fetcher_credentials const_cast("Google")}; grpc_httpcli_request request; memset(&request, 0, sizeof(grpc_httpcli_request)); - request.host = (char*)GRPC_COMPUTE_ENGINE_METADATA_HOST; - request.http.path = (char*)GRPC_COMPUTE_ENGINE_METADATA_TOKEN_PATH; + request.host = const_cast(GRPC_COMPUTE_ENGINE_METADATA_HOST); + request.http.path = + const_cast(GRPC_COMPUTE_ENGINE_METADATA_TOKEN_PATH); request.http.hdr_count = 1; request.http.hdrs = &header; /* TODO(ctiller): Carry the resource_quota in ctx and share it with the host @@ -445,8 +446,8 @@ void grpc_google_refresh_token_credentials::fetch_oauth2( GRPC_REFRESH_TOKEN_POST_BODY_FORMAT_STRING, refresh_token_.client_id, refresh_token_.client_secret, refresh_token_.refresh_token); memset(&request, 0, sizeof(grpc_httpcli_request)); - request.host = (char*)GRPC_GOOGLE_OAUTH2_SERVICE_HOST; - request.http.path = (char*)GRPC_GOOGLE_OAUTH2_SERVICE_TOKEN_PATH; + request.host = const_cast(GRPC_GOOGLE_OAUTH2_SERVICE_HOST); + request.http.path = const_cast(GRPC_GOOGLE_OAUTH2_SERVICE_TOKEN_PATH); request.http.hdr_count = 1; request.http.hdrs = &header; request.handshaker = &grpc_httpcli_ssl; diff --git a/src/core/lib/security/credentials/ssl/ssl_credentials.cc b/src/core/lib/security/credentials/ssl/ssl_credentials.cc index 7be8aa62410..e2a1ad03c0f 100644 --- a/src/core/lib/security/credentials/ssl/ssl_credentials.cc +++ b/src/core/lib/security/credentials/ssl/ssl_credentials.cc @@ -87,7 +87,7 @@ grpc_ssl_credentials::create_security_connector( return sc; } grpc_arg new_arg = grpc_channel_arg_string_create( - (char*)GRPC_ARG_HTTP2_SCHEME, (char*)"https"); + const_cast(GRPC_ARG_HTTP2_SCHEME), const_cast("https")); *new_args = grpc_channel_args_copy_and_add(args, &new_arg, 1); return sc; } diff --git a/src/core/lib/security/credentials/tls/tls_credentials.cc b/src/core/lib/security/credentials/tls/tls_credentials.cc index f2c4b3b807d..06887e760cc 100644 --- a/src/core/lib/security/credentials/tls/tls_credentials.cc +++ b/src/core/lib/security/credentials/tls/tls_credentials.cc @@ -92,7 +92,7 @@ TlsCredentials::create_security_connector( } if (args != nullptr) { grpc_arg new_arg = grpc_channel_arg_string_create( - (char*)GRPC_ARG_HTTP2_SCHEME, (char*)"https"); + const_cast(GRPC_ARG_HTTP2_SCHEME), const_cast("https")); *new_args = grpc_channel_args_copy_and_add(args, &new_arg, 1); } return sc; diff --git a/src/core/lib/security/security_connector/security_connector.cc b/src/core/lib/security/security_connector/security_connector.cc index b3825fe2267..822fe15c3f7 100644 --- a/src/core/lib/security/security_connector/security_connector.cc +++ b/src/core/lib/security/security_connector/security_connector.cc @@ -104,8 +104,9 @@ static const grpc_arg_pointer_vtable connector_arg_vtable = { connector_arg_copy, connector_arg_destroy, connector_cmp}; grpc_arg grpc_security_connector_to_arg(grpc_security_connector* sc) { - return grpc_channel_arg_pointer_create((char*)GRPC_ARG_SECURITY_CONNECTOR, sc, - &connector_arg_vtable); + return grpc_channel_arg_pointer_create( + const_cast(GRPC_ARG_SECURITY_CONNECTOR), sc, + &connector_arg_vtable); } grpc_security_connector* grpc_security_connector_from_arg(const grpc_arg* arg) { diff --git a/src/core/lib/security/transport/security_handshaker.cc b/src/core/lib/security/transport/security_handshaker.cc index 5563d5bd6a4..e7b98850132 100644 --- a/src/core/lib/security/transport/security_handshaker.cc +++ b/src/core/lib/security/transport/security_handshaker.cc @@ -241,8 +241,8 @@ void SecurityHandshaker::OnPeerCheckedInner(grpc_error* error) { handshaker_result_, &unused_bytes, &unused_bytes_size); // Create secure endpoint. if (unused_bytes_size > 0) { - grpc_slice slice = - grpc_slice_from_copied_buffer((char*)unused_bytes, unused_bytes_size); + grpc_slice slice = grpc_slice_from_copied_buffer( + reinterpret_cast(unused_bytes), unused_bytes_size); args_->endpoint = grpc_secure_endpoint_create( protector, zero_copy_protector, args_->endpoint, &slice, 1); grpc_slice_unref_internal(slice); diff --git a/src/core/lib/surface/call.cc b/src/core/lib/surface/call.cc index 7f87d0e190f..b45043f32a8 100644 --- a/src/core/lib/surface/call.cc +++ b/src/core/lib/surface/call.cc @@ -649,7 +649,8 @@ static void execute_batch(grpc_call* call, } char* grpc_call_get_peer(grpc_call* call) { - char* peer_string = (char*)gpr_atm_acq_load(&call->peer_string); + char* peer_string = + reinterpret_cast(gpr_atm_acq_load(&call->peer_string)); if (peer_string != nullptr) return gpr_strdup(peer_string); peer_string = grpc_channel_get_target(call->channel); if (peer_string != nullptr) return peer_string; diff --git a/test/core/handshake/client_ssl.cc b/test/core/handshake/client_ssl.cc index af78fcd04c1..86a7d76fcd6 100644 --- a/test/core/handshake/client_ssl.cc +++ b/test/core/handshake/client_ssl.cc @@ -106,7 +106,8 @@ static int alpn_select_cb(SSL* /*ssl*/, const uint8_t** out, uint8_t* out_len, const uint8_t* alpn_preferred = static_cast(arg); *out = alpn_preferred; - *out_len = static_cast(strlen((char*)alpn_preferred)); + *out_len = static_cast( + strlen(reinterpret_cast(alpn_preferred))); // Validate that the ALPN list includes "h2" and "grpc-exp", that "grpc-exp" // precedes "h2". diff --git a/test/core/util/cmdline_test.cc b/test/core/util/cmdline_test.cc index c15e5e36df9..c1eb5e39a0f 100644 --- a/test/core/util/cmdline_test.cc +++ b/test/core/util/cmdline_test.cc @@ -30,7 +30,7 @@ static void test_simple_int(void) { int x = 1; gpr_cmdline* cl; - char* args[] = {(char*)__FILE__, const_cast("-foo"), + char* args[] = {const_cast(__FILE__), const_cast("-foo"), const_cast("3")}; LOG_TEST(); @@ -46,7 +46,7 @@ static void test_simple_int(void) { static void test_eq_int(void) { int x = 1; gpr_cmdline* cl; - char* args[] = {(char*)__FILE__, const_cast("-foo=3")}; + char* args[] = {const_cast(__FILE__), const_cast("-foo=3")}; LOG_TEST(); @@ -61,7 +61,7 @@ static void test_eq_int(void) { static void test_2dash_int(void) { int x = 1; gpr_cmdline* cl; - char* args[] = {(char*)__FILE__, const_cast("--foo"), + char* args[] = {const_cast(__FILE__), const_cast("--foo"), const_cast("3")}; LOG_TEST(); @@ -77,7 +77,7 @@ static void test_2dash_int(void) { static void test_2dash_eq_int(void) { int x = 1; gpr_cmdline* cl; - char* args[] = {(char*)__FILE__, const_cast("--foo=3")}; + char* args[] = {const_cast(__FILE__), const_cast("--foo=3")}; LOG_TEST(); @@ -92,7 +92,7 @@ static void test_2dash_eq_int(void) { static void test_simple_string(void) { const char* x = nullptr; gpr_cmdline* cl; - char* args[] = {(char*)__FILE__, const_cast("-foo"), + char* args[] = {const_cast(__FILE__), const_cast("-foo"), const_cast("3")}; LOG_TEST(); @@ -108,7 +108,7 @@ static void test_simple_string(void) { static void test_eq_string(void) { const char* x = nullptr; gpr_cmdline* cl; - char* args[] = {(char*)__FILE__, const_cast("-foo=3")}; + char* args[] = {const_cast(__FILE__), const_cast("-foo=3")}; LOG_TEST(); @@ -123,7 +123,7 @@ static void test_eq_string(void) { static void test_2dash_string(void) { const char* x = nullptr; gpr_cmdline* cl; - char* args[] = {(char*)__FILE__, const_cast("--foo"), + char* args[] = {const_cast(__FILE__), const_cast("--foo"), const_cast("3")}; LOG_TEST(); @@ -139,7 +139,7 @@ static void test_2dash_string(void) { static void test_2dash_eq_string(void) { const char* x = nullptr; gpr_cmdline* cl; - char* args[] = {(char*)__FILE__, const_cast("--foo=3")}; + char* args[] = {const_cast(__FILE__), const_cast("--foo=3")}; LOG_TEST(); @@ -154,7 +154,7 @@ static void test_2dash_eq_string(void) { static void test_flag_on(void) { int x = 2; gpr_cmdline* cl; - char* args[] = {(char*)__FILE__, const_cast("--foo")}; + char* args[] = {const_cast(__FILE__), const_cast("--foo")}; LOG_TEST(); @@ -169,7 +169,7 @@ static void test_flag_on(void) { static void test_flag_no(void) { int x = 2; gpr_cmdline* cl; - char* args[] = {(char*)__FILE__, const_cast("--no-foo")}; + char* args[] = {const_cast(__FILE__), const_cast("--no-foo")}; LOG_TEST(); @@ -184,7 +184,7 @@ static void test_flag_no(void) { static void test_flag_val_1(void) { int x = 2; gpr_cmdline* cl; - char* args[] = {(char*)__FILE__, const_cast("--foo=1")}; + char* args[] = {const_cast(__FILE__), const_cast("--foo=1")}; LOG_TEST(); @@ -199,7 +199,7 @@ static void test_flag_val_1(void) { static void test_flag_val_0(void) { int x = 2; gpr_cmdline* cl; - char* args[] = {(char*)__FILE__, const_cast("--foo=0")}; + char* args[] = {const_cast(__FILE__), const_cast("--foo=0")}; LOG_TEST(); @@ -214,7 +214,7 @@ static void test_flag_val_0(void) { static void test_flag_val_true(void) { int x = 2; gpr_cmdline* cl; - char* args[] = {(char*)__FILE__, const_cast("--foo=true")}; + char* args[] = {const_cast(__FILE__), const_cast("--foo=true")}; LOG_TEST(); @@ -229,7 +229,8 @@ static void test_flag_val_true(void) { static void test_flag_val_false(void) { int x = 2; gpr_cmdline* cl; - char* args[] = {(char*)__FILE__, const_cast("--foo=false")}; + char* args[] = {const_cast(__FILE__), + const_cast("--foo=false")}; LOG_TEST(); @@ -247,7 +248,7 @@ static void test_many(void) { int flag = 2; gpr_cmdline* cl; - char* args[] = {(char*)__FILE__, const_cast("--str"), + char* args[] = {const_cast(__FILE__), const_cast("--str"), const_cast("hello"), const_cast("-x=4"), const_cast("-no-flag")}; @@ -275,7 +276,7 @@ static void extra_arg_cb(void* user_data, const char* arg) { static void test_extra(void) { gpr_cmdline* cl; int count = 0; - char* args[] = {(char*)__FILE__, const_cast("a"), + char* args[] = {const_cast(__FILE__), const_cast("a"), const_cast("b"), const_cast("c")}; LOG_TEST(); @@ -291,7 +292,7 @@ static void test_extra(void) { static void test_extra_dashdash(void) { gpr_cmdline* cl; int count = 0; - char* args[] = {(char*)__FILE__, const_cast("--"), + char* args[] = {const_cast(__FILE__), const_cast("--"), const_cast("a"), const_cast("b"), const_cast("c")}; @@ -341,7 +342,7 @@ static void test_help(void) { int x = 0; int flag = 2; - char* help[] = {(char*)__FILE__, const_cast("-h")}; + char* help[] = {const_cast(__FILE__), const_cast("-h")}; LOG_TEST(); @@ -365,7 +366,8 @@ static void test_badargs1(void) { int x = 0; int flag = 2; - char* bad_arg_name[] = {(char*)__FILE__, const_cast("--y")}; + char* bad_arg_name[] = {const_cast(__FILE__), + const_cast("--y")}; LOG_TEST(); @@ -390,7 +392,8 @@ static void test_badargs2(void) { int x = 0; int flag = 2; - char* bad_int_value[] = {(char*)__FILE__, const_cast("--x"), + char* bad_int_value[] = {const_cast(__FILE__), + const_cast("--x"), const_cast("henry")}; LOG_TEST(); @@ -416,7 +419,8 @@ static void test_badargs3(void) { int x = 0; int flag = 2; - char* bad_bool_value[] = {(char*)__FILE__, const_cast("--flag=henry")}; + char* bad_bool_value[] = {const_cast(__FILE__), + const_cast("--flag=henry")}; LOG_TEST(); @@ -441,7 +445,8 @@ static void test_badargs4(void) { int x = 0; int flag = 2; - char* bad_bool_value[] = {(char*)__FILE__, const_cast("--no-str")}; + char* bad_bool_value[] = {const_cast(__FILE__), + const_cast("--no-str")}; LOG_TEST();