diff options
| author |  Muxi Yan <mxyan@google.com> | 2017-09-25 12:38:17 -0700 |
|---|---|---|
| committer | Muxi Yan <mxyan@google.com> | 2017-09-25 12:38:17 -0700 |
| commit | 1c285b98122ef8fe31aa3325a4c10f5b05107ca8 (patch) | |
| tree | f811ca6879a76bb526a7af7a35e987780d1bcba8 /src/core/ext/filters/http | |
| parent | d4bb9bddd6cd1bfa4829deee9c3163c6065dafcb (diff) | |
| parent | 008a173a7e2ba1d5c0933aa7a77395945ba2024d (diff) | |
Merge remote-tracking branch 'upstream/master' into fix-stream-compression-config-interface
Diffstat (limited to 'src/core/ext/filters/http')
| -rw-r--r-- | src/core/ext/filters/http/message_compress/message_compress_filter.c | 4 | ||||
| -rw-r--r-- | src/core/ext/filters/http/server/http_server_filter.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/ext/filters/http/message_compress/message_compress_filter.c b/src/core/ext/filters/http/message_compress/message_compress_filter.c index a66916fbe1..f4c01f75a6 100644 --- a/src/core/ext/filters/http/message_compress/message_compress_filter.c +++ b/src/core/ext/filters/http/message_compress/message_compress_filter.c @@ -225,7 +225,7 @@ static void finish_send_message(grpc_exec_ctx *exec_ctx, exec_ctx, calld->message_compression_algorithm, &calld->slices, &tmp); if (did_compress) { if (GRPC_TRACER_ON(grpc_compression_trace)) { - char *algo_name; + const char *algo_name; const size_t before_size = calld->slices.length; const size_t after_size = tmp.length; const float savings_ratio = 1.0f - (float)after_size / (float)before_size; @@ -239,7 +239,7 @@ static void finish_send_message(grpc_exec_ctx *exec_ctx, send_flags |= GRPC_WRITE_INTERNAL_COMPRESS; } else { if (GRPC_TRACER_ON(grpc_compression_trace)) { - char *algo_name; + const char *algo_name; GPR_ASSERT(grpc_message_compression_algorithm_name( calld->message_compression_algorithm, &algo_name)); gpr_log(GPR_DEBUG, diff --git a/src/core/ext/filters/http/server/http_server_filter.c b/src/core/ext/filters/http/server/http_server_filter.c index 554a7f530d..03958136b4 100644 --- a/src/core/ext/filters/http/server/http_server_filter.c +++ b/src/core/ext/filters/http/server/http_server_filter.c @@ -83,12 +83,12 @@ static grpc_error *server_filter_outgoing_metadata(grpc_exec_ctx *exec_ctx, } static void add_error(const char *error_name, grpc_error **cumulative, - grpc_error *new) { - if (new == GRPC_ERROR_NONE) return; + grpc_error *new_err) { + if (new_err == GRPC_ERROR_NONE) return; if (*cumulative == GRPC_ERROR_NONE) { *cumulative = GRPC_ERROR_CREATE_FROM_COPIED_STRING(error_name); } - *cumulative = grpc_error_add_child(*cumulative, new); + *cumulative = grpc_error_add_child(*cumulative, new_err); } static grpc_error *server_filter_incoming_metadata(grpc_exec_ctx *exec_ctx, |