diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-09-11 12:06:52 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-09-11 12:06:52 -0700 |
| commit | f73fe507b6014d3a4e66971dde4e5cddca56b9a0 (patch) | |
| tree | c4f1376b9151dd56cff21ede859dcc08f0fc29a2 /src/core/lib/slice/b64.c | |
| parent | d7b112e9011bee614950ac2bf4e91bca5b397c5a (diff) | |
| parent | 55c4b31389d5557b88d39bde6d783d68aa747de7 (diff) | |
Merge github.com:grpc/grpc into server_stats
Diffstat (limited to 'src/core/lib/slice/b64.c')
| -rw-r--r-- | src/core/lib/slice/b64.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/lib/slice/b64.c b/src/core/lib/slice/b64.c index d02f303bdb..50264719a4 100644 --- a/src/core/lib/slice/b64.c +++ b/src/core/lib/slice/b64.c @@ -58,7 +58,7 @@ char *grpc_base64_encode(const void *vdata, size_t data_size, int url_safe, int multiline) { size_t result_projected_size = grpc_base64_estimate_encoded_size(data_size, url_safe, multiline); - char *result = gpr_malloc(result_projected_size); + char *result = (char *)gpr_malloc(result_projected_size); grpc_base64_encode_core(result, vdata, data_size, url_safe, multiline); return result; } @@ -75,7 +75,7 @@ size_t grpc_base64_estimate_encoded_size(size_t data_size, int url_safe, void grpc_base64_encode_core(char *result, const void *vdata, size_t data_size, int url_safe, int multiline) { - const unsigned char *data = vdata; + const unsigned char *data = (const unsigned char *)vdata; const char *base64_chars = url_safe ? base64_url_safe_chars : base64_url_unsafe_chars; const size_t result_projected_size = |