aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/lib/compression
diff options
context:
space:
mode:
authorGravatar Muxi Yan <mxyan@google.com>2017-09-19 10:12:25 -0700
committerGravatar Muxi Yan <mxyan@google.com>2017-09-19 10:12:25 -0700
commit3f583b78290fef31202f4a05fac589d88d586111 (patch)
tree7e13f1d54ec9cec5abce904151258e6cd2670db7 /src/core/lib/compression
parent3218e2b975a71cc32aedad71d00267e07244c109 (diff)
parentaafa875cb389140cf721d8470a3a05cf930f74b2 (diff)
Merge remote-tracking branch 'upstream/master' into fix-stream-compression-transport-duplicate
Diffstat (limited to 'src/core/lib/compression')
-rw-r--r--src/core/lib/compression/compression.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/lib/compression/compression.c b/src/core/lib/compression/compression.c
index ec84c01811..1cfac23129 100644
--- a/src/core/lib/compression/compression.c
+++ b/src/core/lib/compression/compression.c
@@ -60,7 +60,7 @@ int grpc_stream_compression_algorithm_parse(
}
int grpc_compression_algorithm_name(grpc_compression_algorithm algorithm,
- char **name) {
+ const char **name) {
GRPC_API_TRACE("grpc_compression_algorithm_parse(algorithm=%d, name=%p)", 2,
((int)algorithm, name));
switch (algorithm) {
@@ -80,7 +80,7 @@ int grpc_compression_algorithm_name(grpc_compression_algorithm algorithm,
}
int grpc_stream_compression_algorithm_name(
- grpc_stream_compression_algorithm algorithm, char **name) {
+ grpc_stream_compression_algorithm algorithm, const char **name) {
GRPC_API_TRACE(
"grpc_stream_compression_algorithm_parse(algorithm=%d, name=%p)", 2,
((int)algorithm, name));