From be82e64b3debcdb1d9ec6a149fc85af0d46bfb7e Mon Sep 17 00:00:00 2001 From: Noah Eisen Date: Fri, 9 Feb 2018 09:16:55 -0800 Subject: Autofix c casts to c++ casts --- test/core/handshake/client_ssl.cc | 22 +++++++++++----------- .../handshake/readahead_handshaker_server_ssl.cc | 2 +- test/core/handshake/server_ssl_common.cc | 18 +++++++++--------- 3 files changed, 21 insertions(+), 21 deletions(-) (limited to 'test/core/handshake') diff --git a/test/core/handshake/client_ssl.cc b/test/core/handshake/client_ssl.cc index 2302e3da2f..d04295a735 100644 --- a/test/core/handshake/client_ssl.cc +++ b/test/core/handshake/client_ssl.cc @@ -68,7 +68,7 @@ static int create_socket(int* out_port) { return -1; } - if (bind(s, (struct sockaddr*)&addr, sizeof(addr)) < 0) { + if (bind(s, reinterpret_cast(&addr), sizeof(addr)) < 0) { perror("Unable to bind"); gpr_log(GPR_ERROR, "%s", "Unable to bind to any port"); close(s); @@ -82,7 +82,7 @@ static int create_socket(int* out_port) { } addr_len = sizeof(addr); - if (getsockname(s, (struct sockaddr*)&addr, &addr_len) != 0 || + if (getsockname(s, reinterpret_cast(&addr), &addr_len) != 0 || addr_len > sizeof(addr)) { perror("getsockname"); gpr_log(GPR_ERROR, "%s", "Unable to get socket local address"); @@ -98,19 +98,19 @@ static int create_socket(int* out_port) { // SSL_CTX_set_alpn_select_cb. static int alpn_select_cb(SSL* ssl, const uint8_t** out, uint8_t* out_len, const uint8_t* in, unsigned in_len, void* arg) { - const uint8_t* alpn_preferred = (const uint8_t*)arg; + const uint8_t* alpn_preferred = static_cast(arg); *out = alpn_preferred; - *out_len = (uint8_t)strlen((char*)alpn_preferred); + *out_len = static_cast(strlen((char*)alpn_preferred)); // Validate that the ALPN list includes "h2" and "grpc-exp", that "grpc-exp" // precedes "h2". bool grpc_exp_seen = false; bool h2_seen = false; - const char* inp = (const char*)in; + const char* inp = reinterpret_cast(in); const char* in_end = inp + in_len; while (inp < in_end) { - const size_t length = (size_t)*inp++; + const size_t length = static_cast(*inp++); if (length == strlen("grpc-exp") && strncmp(inp, "grpc-exp", length) == 0) { grpc_exp_seen = true; GPR_ASSERT(!h2_seen); @@ -133,7 +133,7 @@ static int alpn_select_cb(SSL* ssl, const uint8_t** out, uint8_t* out_len, // https://wiki.openssl.org/index.php/Simple_TLS_Server and the gRPC core // internals in src/core/tsi/ssl_transport_security.c. static void server_thread(void* arg) { - const server_args* args = (server_args*)arg; + const server_args* args = static_cast(arg); SSL_load_error_strings(); OpenSSL_add_ssl_algorithms(); @@ -175,7 +175,7 @@ static void server_thread(void* arg) { gpr_log(GPR_INFO, "Server listening"); struct sockaddr_in addr; socklen_t len = sizeof(addr); - const int client = accept(sock, (struct sockaddr*)&addr, &len); + const int client = accept(sock, reinterpret_cast(&addr), &len); if (client < 0) { perror("Unable to accept"); abort(); @@ -243,9 +243,9 @@ static bool client_ssl_test(char* server_alpn_preferred) { grpc_load_file(SSL_CERT_PATH, 1, &cert_slice))); GPR_ASSERT(GRPC_LOG_IF_ERROR("load_file", grpc_load_file(SSL_KEY_PATH, 1, &key_slice))); - const char* ca_cert = (const char*)GRPC_SLICE_START_PTR(ca_slice); - pem_key_cert_pair.private_key = (const char*)GRPC_SLICE_START_PTR(key_slice); - pem_key_cert_pair.cert_chain = (const char*)GRPC_SLICE_START_PTR(cert_slice); + const char* ca_cert = reinterpret_castGRPC_SLICE_START_PTR(ca_slice); + pem_key_cert_pair.private_key = reinterpret_castGRPC_SLICE_START_PTR(key_slice); + pem_key_cert_pair.cert_chain = reinterpret_castGRPC_SLICE_START_PTR(cert_slice); grpc_channel_credentials* ssl_creds = grpc_ssl_credentials_create(ca_cert, &pem_key_cert_pair, nullptr); diff --git a/test/core/handshake/readahead_handshaker_server_ssl.cc b/test/core/handshake/readahead_handshaker_server_ssl.cc index 599e0e16e2..a4f182e643 100644 --- a/test/core/handshake/readahead_handshaker_server_ssl.cc +++ b/test/core/handshake/readahead_handshaker_server_ssl.cc @@ -67,7 +67,7 @@ const grpc_handshaker_vtable readahead_handshaker_vtable = { readahead_handshaker_do_handshake}; static grpc_handshaker* readahead_handshaker_create() { - grpc_handshaker* h = (grpc_handshaker*)gpr_zalloc(sizeof(grpc_handshaker)); + grpc_handshaker* h = static_cast(gpr_zalloc(sizeof(grpc_handshaker))); grpc_handshaker_init(&readahead_handshaker_vtable, h); return h; } diff --git a/test/core/handshake/server_ssl_common.cc b/test/core/handshake/server_ssl_common.cc index 0bf453a204..6ae2471807 100644 --- a/test/core/handshake/server_ssl_common.cc +++ b/test/core/handshake/server_ssl_common.cc @@ -48,7 +48,7 @@ static int create_socket(int port) { struct sockaddr_in addr; addr.sin_family = AF_INET; - addr.sin_port = htons((uint16_t)port); + addr.sin_port = htons(static_cast(port)); addr.sin_addr.s_addr = htonl(INADDR_ANY); s = socket(AF_INET, SOCK_STREAM, 0); @@ -57,7 +57,7 @@ static int create_socket(int port) { return -1; } - if (connect(s, (struct sockaddr*)&addr, sizeof(addr)) < 0) { + if (connect(s, reinterpret_cast(&addr), sizeof(addr)) < 0) { perror("Unable to connect"); return -1; } @@ -67,7 +67,7 @@ static int create_socket(int port) { // Simple gRPC server. This listens until client_handshake_complete occurs. static void server_thread(void* arg) { - const int port = *(int*)arg; + const int port = *static_cast(arg); // Load key pair and establish server SSL credentials. grpc_ssl_pem_key_cert_pair pem_key_cert_pair; @@ -78,9 +78,9 @@ static void server_thread(void* arg) { grpc_load_file(SSL_CERT_PATH, 1, &cert_slice))); GPR_ASSERT(GRPC_LOG_IF_ERROR("load_file", grpc_load_file(SSL_KEY_PATH, 1, &key_slice))); - const char* ca_cert = (const char*)GRPC_SLICE_START_PTR(ca_slice); - pem_key_cert_pair.private_key = (const char*)GRPC_SLICE_START_PTR(key_slice); - pem_key_cert_pair.cert_chain = (const char*)GRPC_SLICE_START_PTR(cert_slice); + const char* ca_cert = reinterpret_castGRPC_SLICE_START_PTR(ca_slice); + pem_key_cert_pair.private_key = reinterpret_castGRPC_SLICE_START_PTR(key_slice); + pem_key_cert_pair.cert_chain = reinterpret_castGRPC_SLICE_START_PTR(cert_slice); grpc_server_credentials* ssl_creds = grpc_ssl_server_credentials_create( ca_cert, &pem_key_cert_pair, 1, 0, nullptr); @@ -176,13 +176,13 @@ bool server_ssl_test(const char* alpn_list[], unsigned int alpn_list_len, // wire format, see documentation for SSL_CTX_set_alpn_protos. unsigned int alpn_protos_len = alpn_list_len; for (unsigned int i = 0; i < alpn_list_len; ++i) { - alpn_protos_len += (unsigned int)strlen(alpn_list[i]); + alpn_protos_len += static_cast(strlen(alpn_list[i])); } unsigned char* alpn_protos = static_cast(gpr_malloc(alpn_protos_len)); unsigned char* p = alpn_protos; for (unsigned int i = 0; i < alpn_list_len; ++i) { - const uint8_t len = (uint8_t)strlen(alpn_list[i]); + const uint8_t len = static_cast(strlen(alpn_list[i])); *p++ = len; memcpy(p, alpn_list[i], len); p += len; @@ -217,7 +217,7 @@ bool server_ssl_test(const char* alpn_list[], unsigned int alpn_list_len, unsigned int alpn_selected_len; SSL_get0_alpn_selected(ssl, &alpn_selected, &alpn_selected_len); if (strlen(alpn_expected) != alpn_selected_len || - strncmp((const char*)alpn_selected, alpn_expected, alpn_selected_len) != + strncmp(reinterpret_cast(alpn_selected), alpn_expected, alpn_selected_len) != 0) { gpr_log(GPR_ERROR, "Unexpected ALPN protocol preference"); success = false; -- cgit v1.2.3