diff options
| author |  jboeuf <jboeuf@users.noreply.github.com> | 2015-06-23 22:43:07 +0200 |
|---|---|---|
| committer | jboeuf <jboeuf@users.noreply.github.com> | 2015-06-23 22:43:07 +0200 |
| commit | bcd1ff2fc3b87a9830eb785fb8cadc50a55cc2d5 (patch) | |
| tree | ffb185eb7a95429fda4e9963d34fc432d3ffa6a9 /src/core/security/security_connector.c | |
| parent | 04da718e902fa67bbe2b3551ad88ffa636ed31b0 (diff) | |
| parent | 25c5f2d0f633e3382d649430940ef33adc4abcda (diff) | |
Merge pull request #2143 from murgatroid99/core_security_conversion_warnings
Fixed integer conversion warnings in src/core/security
Diffstat (limited to 'src/core/security/security_connector.c')
| -rw-r--r-- | src/core/security/security_connector.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/core/security/security_connector.c b/src/core/security/security_connector.c index 54d151ad5a..5512bb177a 100644 --- a/src/core/security/security_connector.c +++ b/src/core/security/security_connector.c @@ -538,7 +538,7 @@ grpc_security_status grpc_ssl_channel_security_connector_create( alpn_protocol_strings[i] = (const unsigned char *)grpc_chttp2_get_alpn_version_index(i); alpn_protocol_string_lengths[i] = - strlen(grpc_chttp2_get_alpn_version_index(i)); + (unsigned char)strlen(grpc_chttp2_get_alpn_version_index(i)); } if (config == NULL || target_name == NULL) { @@ -577,7 +577,7 @@ grpc_security_status grpc_ssl_channel_security_connector_create( config->pem_private_key, config->pem_private_key_size, config->pem_cert_chain, config->pem_cert_chain_size, pem_root_certs, pem_root_certs_size, ssl_cipher_suites(), alpn_protocol_strings, - alpn_protocol_string_lengths, num_alpn_protocols, &c->handshaker_factory); + alpn_protocol_string_lengths, (uint16_t)num_alpn_protocols, &c->handshaker_factory); if (result != TSI_OK) { gpr_log(GPR_ERROR, "Handshaker factory creation failed with %s.", tsi_result_to_string(result)); @@ -611,7 +611,7 @@ grpc_security_status grpc_ssl_server_security_connector_create( alpn_protocol_strings[i] = (const unsigned char *)grpc_chttp2_get_alpn_version_index(i); alpn_protocol_string_lengths[i] = - strlen(grpc_chttp2_get_alpn_version_index(i)); + (unsigned char)strlen(grpc_chttp2_get_alpn_version_index(i)); } if (config == NULL || config->num_key_cert_pairs == 0) { @@ -630,7 +630,7 @@ grpc_security_status grpc_ssl_server_security_connector_create( (const unsigned char **)config->pem_cert_chains, config->pem_cert_chains_sizes, config->num_key_cert_pairs, config->pem_root_certs, config->pem_root_certs_size, ssl_cipher_suites(), - alpn_protocol_strings, alpn_protocol_string_lengths, num_alpn_protocols, + alpn_protocol_strings, alpn_protocol_string_lengths, (uint16_t)num_alpn_protocols, &c->handshaker_factory); if (result != TSI_OK) { gpr_log(GPR_ERROR, "Handshaker factory creation failed with %s.", @@ -649,4 +649,3 @@ error: gpr_free(alpn_protocol_string_lengths); return GRPC_SECURITY_ERROR; } - |