diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-12-27 08:38:35 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-12-27 08:38:35 -0800 |
| commit | 0704727c2d5bcdbf7a0c60de5b810ed79186f59e (patch) | |
| tree | f09e088a030e6fb29fc82527d6e8c6b480561c98 /src/core/lib/channel/http_client_filter.c | |
| parent | 6997c3473b0e152b00cb5696cf5717e5adb37cb6 (diff) | |
| parent | 22b28264f9242b6d049f9e6d5b792bd5be048a97 (diff) | |
Merge github.com:grpc/grpc into slice_with_exec_ctx
Diffstat (limited to 'src/core/lib/channel/http_client_filter.c')
| -rw-r--r-- | src/core/lib/channel/http_client_filter.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/lib/channel/http_client_filter.c b/src/core/lib/channel/http_client_filter.c index 81310741ac..1a87a6a961 100644 --- a/src/core/lib/channel/http_client_filter.c +++ b/src/core/lib/channel/http_client_filter.c @@ -450,9 +450,9 @@ static grpc_mdstr *user_agent_from_args(const grpc_channel_args *args, } /* Constructor for channel_data */ -static void init_channel_elem(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem, - grpc_channel_element_args *args) { +static grpc_error *init_channel_elem(grpc_exec_ctx *exec_ctx, + grpc_channel_element *elem, + grpc_channel_element_args *args) { channel_data *chand = elem->channel_data; GPR_ASSERT(!args->is_last); GPR_ASSERT(args->optional_transport != NULL); @@ -463,6 +463,7 @@ static void init_channel_elem(grpc_exec_ctx *exec_ctx, exec_ctx, GRPC_MDSTR_USER_AGENT, user_agent_from_args(args->channel_args, args->optional_transport->vtable->name)); + return GRPC_ERROR_NONE; } /* Destructor for channel data */ |