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 /test/core/channel | |
| parent | 6997c3473b0e152b00cb5696cf5717e5adb37cb6 (diff) | |
| parent | 22b28264f9242b6d049f9e6d5b792bd5be048a97 (diff) | |
Merge github.com:grpc/grpc into slice_with_exec_ctx
Diffstat (limited to 'test/core/channel')
| -rw-r--r-- | test/core/channel/channel_stack_test.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/core/channel/channel_stack_test.c b/test/core/channel/channel_stack_test.c index 54575ae499..080c56f134 100644 --- a/test/core/channel/channel_stack_test.c +++ b/test/core/channel/channel_stack_test.c @@ -41,9 +41,9 @@ #include "test/core/util/test_config.h" -static void channel_init_func(grpc_exec_ctx *exec_ctx, - grpc_channel_element *elem, - grpc_channel_element_args *args) { +static grpc_error *channel_init_func(grpc_exec_ctx *exec_ctx, + grpc_channel_element *elem, + grpc_channel_element_args *args) { GPR_ASSERT(args->channel_args->num_args == 1); GPR_ASSERT(args->channel_args->args[0].type == GRPC_ARG_INTEGER); GPR_ASSERT(0 == strcmp(args->channel_args->args[0].key, "test_key")); @@ -51,6 +51,7 @@ static void channel_init_func(grpc_exec_ctx *exec_ctx, GPR_ASSERT(args->is_first); GPR_ASSERT(args->is_last); *(int *)(elem->channel_data) = 0; + return GRPC_ERROR_NONE; } static grpc_error *call_init_func(grpc_exec_ctx *exec_ctx, |