diff options
author | Craig Tiller <ctiller@google.com> | 2017-03-31 16:08:31 -0700 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2017-03-31 16:08:31 -0700 |
commit | d682c770c6d16185c178328b2608ccdd3cf11741 (patch) | |
tree | 9cd15e5802e0b1238dc0e8a33a8116b525f77ac9 /src/core/lib/surface/lame_client.c | |
parent | 0592526994b03d311c368eb45affad7781e28955 (diff) | |
parent | 59f036dc52e1cd97f5e252f2cc7a34e16e1b966d (diff) |
Merge github.com:grpc/grpc into daily_and_hourly
Diffstat (limited to 'src/core/lib/surface/lame_client.c')
-rw-r--r-- | src/core/lib/surface/lame_client.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/core/lib/surface/lame_client.c b/src/core/lib/surface/lame_client.c index 49bc4c114b..0c408aa288 100644 --- a/src/core/lib/surface/lame_client.c +++ b/src/core/lib/surface/lame_client.c @@ -90,7 +90,8 @@ static void lame_start_transport_stream_op(grpc_exec_ctx *exec_ctx, fill_metadata(exec_ctx, elem, op->recv_trailing_metadata); } grpc_transport_stream_op_finish_with_failure( - exec_ctx, op, GRPC_ERROR_CREATE("lame client channel")); + exec_ctx, op, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("lame client channel")); } static char *lame_get_peer(grpc_exec_ctx *exec_ctx, grpc_call_element *elem) { @@ -111,8 +112,9 @@ static void lame_start_transport_op(grpc_exec_ctx *exec_ctx, GRPC_ERROR_NONE); } if (op->send_ping != NULL) { - grpc_closure_sched(exec_ctx, op->send_ping, - GRPC_ERROR_CREATE("lame client channel")); + grpc_closure_sched( + exec_ctx, op->send_ping, + GRPC_ERROR_CREATE_FROM_STATIC_STRING("lame client channel")); } GRPC_ERROR_UNREF(op->disconnect_with_error); if (op->on_consumed != NULL) { @@ -130,8 +132,8 @@ static grpc_error *init_call_elem(grpc_exec_ctx *exec_ctx, static void destroy_call_elem(grpc_exec_ctx *exec_ctx, grpc_call_element *elem, const grpc_call_final_info *final_info, - void *and_free_memory) { - gpr_free(and_free_memory); + grpc_closure *then_schedule_closure) { + grpc_closure_sched(exec_ctx, then_schedule_closure, GRPC_ERROR_NONE); } static grpc_error *init_channel_elem(grpc_exec_ctx *exec_ctx, |