aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/lib
diff options
context:
space:
mode:
authorGravatar ncteisen <ncteisen@gmail.com>2018-09-10 11:19:53 -0700
committerGravatar ncteisen <ncteisen@gmail.com>2018-09-10 11:19:53 -0700
commitef1a390d1d52ebc279aab7dc940676db3c02d5ed (patch)
tree097236887505f4a1ea272cbad4d2b11e30fcd82b /src/core/lib
parent5946ae5eff6cb97d0f5aed2bceda34811c6290fc (diff)
parent2edfddb66f84841fb39d01e335d19f13a09519cf (diff)
Merge branch 'master' of https://github.com/grpc/grpc into channelz-server
Diffstat (limited to 'src/core/lib')
-rw-r--r--src/core/lib/channel/connected_channel.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/lib/channel/connected_channel.cc b/src/core/lib/channel/connected_channel.cc
index 4a4f0e49d0..e2ea334ded 100644
--- a/src/core/lib/channel/connected_channel.cc
+++ b/src/core/lib/channel/connected_channel.cc
@@ -126,13 +126,11 @@ static void con_start_transport_stream_op_batch(
// closure for each one.
callback_state* state =
static_cast<callback_state*>(gpr_malloc(sizeof(*state)));
- intercept_callback(calld, state, true,
- "connected_on_complete (cancel_stream)",
+ intercept_callback(calld, state, true, "on_complete (cancel_stream)",
&batch->on_complete);
} else if (batch->on_complete != nullptr) {
callback_state* state = get_state_for_batch(calld, batch);
- intercept_callback(calld, state, false, "connected_on_complete",
- &batch->on_complete);
+ intercept_callback(calld, state, false, "on_complete", &batch->on_complete);
}
grpc_transport_perform_stream_op(
chand->transport, TRANSPORT_STREAM_FROM_CALL_DATA(calld), batch);