diff options
author | Noah Eisen <ncteisen@google.com> | 2018-02-09 09:16:55 -0800 |
---|---|---|
committer | Noah Eisen <ncteisen@google.com> | 2018-02-09 09:16:55 -0800 |
commit | be82e64b3debcdb1d9ec6a149fc85af0d46bfb7e (patch) | |
tree | cc5e1234073eb250a2c319b5a4db2919fce060ea /src/core/lib/compression | |
parent | 194436342137924b4fb7429bede037a4b5ec7edb (diff) |
Autofix c casts to c++ casts
Diffstat (limited to 'src/core/lib/compression')
4 files changed, 14 insertions, 14 deletions
diff --git a/src/core/lib/compression/compression_internal.cc b/src/core/lib/compression/compression_internal.cc index 4bbaca2f98..e49c67f784 100644 --- a/src/core/lib/compression/compression_internal.cc +++ b/src/core/lib/compression/compression_internal.cc @@ -190,7 +190,7 @@ grpc_message_compression_algorithm grpc_message_compression_algorithm_for_level( GRPC_API_TRACE("grpc_message_compression_algorithm_for_level(level=%d)", 1, ((int)level)); if (level > GRPC_COMPRESS_LEVEL_HIGH) { - gpr_log(GPR_ERROR, "Unknown message compression level %d.", (int)level); + gpr_log(GPR_ERROR, "Unknown message compression level %d.", static_cast<int>(level)); abort(); } diff --git a/src/core/lib/compression/message_compress.cc b/src/core/lib/compression/message_compress.cc index 1e9b0f10ee..238eff780c 100644 --- a/src/core/lib/compression/message_compress.cc +++ b/src/core/lib/compression/message_compress.cc @@ -36,23 +36,23 @@ static int zlib_body(z_stream* zs, grpc_slice_buffer* input, int flush; size_t i; grpc_slice outbuf = GRPC_SLICE_MALLOC(OUTPUT_BLOCK_SIZE); - const uInt uint_max = ~(uInt)0; + const uInt uint_max = ~static_cast<uInt>(0); GPR_ASSERT(GRPC_SLICE_LENGTH(outbuf) <= uint_max); - zs->avail_out = (uInt)GRPC_SLICE_LENGTH(outbuf); + zs->avail_out = static_cast<uInt>GRPC_SLICE_LENGTH(outbuf); zs->next_out = GRPC_SLICE_START_PTR(outbuf); flush = Z_NO_FLUSH; for (i = 0; i < input->count; i++) { if (i == input->count - 1) flush = Z_FINISH; GPR_ASSERT(GRPC_SLICE_LENGTH(input->slices[i]) <= uint_max); - zs->avail_in = (uInt)GRPC_SLICE_LENGTH(input->slices[i]); + zs->avail_in = static_cast<uInt>GRPC_SLICE_LENGTH(input->slices[i]); zs->next_in = GRPC_SLICE_START_PTR(input->slices[i]); do { if (zs->avail_out == 0) { grpc_slice_buffer_add_indexed(output, outbuf); outbuf = GRPC_SLICE_MALLOC(OUTPUT_BLOCK_SIZE); GPR_ASSERT(GRPC_SLICE_LENGTH(outbuf) <= uint_max); - zs->avail_out = (uInt)GRPC_SLICE_LENGTH(outbuf); + zs->avail_out = static_cast<uInt>GRPC_SLICE_LENGTH(outbuf); zs->next_out = GRPC_SLICE_START_PTR(outbuf); } r = flate(zs, flush); diff --git a/src/core/lib/compression/stream_compression_gzip.cc b/src/core/lib/compression/stream_compression_gzip.cc index 897f3918a7..c48fe9305d 100644 --- a/src/core/lib/compression/stream_compression_gzip.cc +++ b/src/core/lib/compression/stream_compression_gzip.cc @@ -48,11 +48,11 @@ static bool gzip_flate(grpc_stream_compression_context_gzip* ctx, size_t slice_size = max_output_size < OUTPUT_BLOCK_SIZE ? max_output_size : OUTPUT_BLOCK_SIZE; grpc_slice slice_out = GRPC_SLICE_MALLOC(slice_size); - ctx->zs.avail_out = (uInt)slice_size; + ctx->zs.avail_out = static_cast<uInt>(slice_size); ctx->zs.next_out = GRPC_SLICE_START_PTR(slice_out); while (ctx->zs.avail_out > 0 && in->length > 0 && !eoc) { grpc_slice slice = grpc_slice_buffer_take_first(in); - ctx->zs.avail_in = (uInt)GRPC_SLICE_LENGTH(slice); + ctx->zs.avail_in = static_cast<uInt>GRPC_SLICE_LENGTH(slice); ctx->zs.next_in = GRPC_SLICE_START_PTR(slice); r = ctx->flate(&ctx->zs, Z_NO_FLUSH); if (r < 0 && r != Z_BUF_ERROR) { @@ -142,7 +142,7 @@ static bool grpc_stream_compress_gzip(grpc_stream_compression_context* ctx, return false; } grpc_stream_compression_context_gzip* gzip_ctx = - (grpc_stream_compression_context_gzip*)ctx; + reinterpret_cast<grpc_stream_compression_context_gzip*>(ctx); GPR_ASSERT(gzip_ctx->flate == deflate); int gzip_flush; switch (flush) { @@ -172,7 +172,7 @@ static bool grpc_stream_decompress_gzip(grpc_stream_compression_context* ctx, return false; } grpc_stream_compression_context_gzip* gzip_ctx = - (grpc_stream_compression_context_gzip*)ctx; + reinterpret_cast<grpc_stream_compression_context_gzip*>(ctx); GPR_ASSERT(gzip_ctx->flate == inflate); return gzip_flate(gzip_ctx, in, out, output_size, max_output_size, Z_SYNC_FLUSH, end_of_context); @@ -184,8 +184,8 @@ grpc_stream_compression_context_create_gzip( GPR_ASSERT(method == GRPC_STREAM_COMPRESSION_GZIP_COMPRESS || method == GRPC_STREAM_COMPRESSION_GZIP_DECOMPRESS); grpc_stream_compression_context_gzip* gzip_ctx = - (grpc_stream_compression_context_gzip*)gpr_zalloc( - sizeof(grpc_stream_compression_context_gzip)); + static_cast<grpc_stream_compression_context_gzip*>(gpr_zalloc( + sizeof(grpc_stream_compression_context_gzip))); int r; if (gzip_ctx == nullptr) { return nullptr; @@ -204,7 +204,7 @@ grpc_stream_compression_context_create_gzip( } gzip_ctx->base.vtable = &grpc_stream_compression_gzip_vtable; - return (grpc_stream_compression_context*)gzip_ctx; + return reinterpret_cast<grpc_stream_compression_context*>(gzip_ctx); } static void grpc_stream_compression_context_destroy_gzip( @@ -213,7 +213,7 @@ static void grpc_stream_compression_context_destroy_gzip( return; } grpc_stream_compression_context_gzip* gzip_ctx = - (grpc_stream_compression_context_gzip*)ctx; + reinterpret_cast<grpc_stream_compression_context_gzip*>(ctx); if (gzip_ctx->flate == inflate) { inflateEnd(&gzip_ctx->zs); } else { diff --git a/src/core/lib/compression/stream_compression_identity.cc b/src/core/lib/compression/stream_compression_identity.cc index af4051144c..933d24b3a1 100644 --- a/src/core/lib/compression/stream_compression_identity.cc +++ b/src/core/lib/compression/stream_compression_identity.cc @@ -79,7 +79,7 @@ grpc_stream_compression_context_create_identity( GPR_ASSERT(method == GRPC_STREAM_COMPRESSION_IDENTITY_COMPRESS || method == GRPC_STREAM_COMPRESSION_IDENTITY_DECOMPRESS); /* No context needed in this case. Use fake context instead. */ - return (grpc_stream_compression_context*)&identity_ctx; + return &identity_ctx; } static void grpc_stream_compression_context_destroy_identity( |