diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-01-08 15:50:45 -0800 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-01-08 15:50:45 -0800 |
| commit | 4dfe317e5dc1c11688e8ab95c1a62c12553f43ad (patch) | |
| tree | 30461dcf9f15a6e656440dcbc47302713741c111 /src/core/security/base64.c | |
| parent | 8974a6681c430357632f5da4cc98f88ac46fe9e9 (diff) | |
| parent | 7f34c783c4735ce16c22cd4c92d989d4bb0e2822 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into grpclb_api
Diffstat (limited to 'src/core/security/base64.c')
| -rw-r--r-- | src/core/security/base64.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/core/security/base64.c b/src/core/security/base64.c index 5226d2c578..e68359602e 100644 --- a/src/core/security/base64.c +++ b/src/core/security/base64.c @@ -114,7 +114,7 @@ char *grpc_base64_encode(const void *vdata, size_t data_size, int url_safe, } GPR_ASSERT(current >= result); - GPR_ASSERT((gpr_uintptr)(current - result) < result_projected_size); + GPR_ASSERT((uintptr_t)(current - result) < result_projected_size); result[current - result] = '\0'; return result; } @@ -125,14 +125,14 @@ gpr_slice grpc_base64_decode(const char *b64, int url_safe) { static void decode_one_char(const unsigned char *codes, unsigned char *result, size_t *result_offset) { - gpr_uint32 packed = ((gpr_uint32)codes[0] << 2) | ((gpr_uint32)codes[1] >> 4); + uint32_t packed = ((uint32_t)codes[0] << 2) | ((uint32_t)codes[1] >> 4); result[(*result_offset)++] = (unsigned char)packed; } static void decode_two_chars(const unsigned char *codes, unsigned char *result, size_t *result_offset) { - gpr_uint32 packed = ((gpr_uint32)codes[0] << 10) | - ((gpr_uint32)codes[1] << 4) | ((gpr_uint32)codes[2] >> 2); + uint32_t packed = ((uint32_t)codes[0] << 10) | ((uint32_t)codes[1] << 4) | + ((uint32_t)codes[2] >> 2); result[(*result_offset)++] = (unsigned char)(packed >> 8); result[(*result_offset)++] = (unsigned char)(packed); } @@ -172,9 +172,8 @@ static int decode_group(const unsigned char *codes, size_t num_codes, decode_two_chars(codes, result, result_offset); } else { /* No padding. */ - gpr_uint32 packed = ((gpr_uint32)codes[0] << 18) | - ((gpr_uint32)codes[1] << 12) | - ((gpr_uint32)codes[2] << 6) | codes[3]; + uint32_t packed = ((uint32_t)codes[0] << 18) | ((uint32_t)codes[1] << 12) | + ((uint32_t)codes[2] << 6) | codes[3]; result[(*result_offset)++] = (unsigned char)(packed >> 16); result[(*result_offset)++] = (unsigned char)(packed >> 8); result[(*result_offset)++] = (unsigned char)(packed); |