diff options
| author |  David Garcia Quintas <dgq@google.com> | 2015-08-17 14:03:50 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2015-08-17 18:28:00 -0700 |
| commit | 935c171ee8446a7327763608d8688b644a2436a0 (patch) | |
| tree | f4646cbbf7258367a16c9f4b8a81314313cd0d5e /src/core/surface/channel.c | |
| parent | 864d18650e007d9080257d685fc09bfbbf3a306e (diff) | |
| parent | 2461bf675ec23f513569a14933609f09b4ff3854 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into compression-interop
Diffstat (limited to 'src/core/surface/channel.c')
| -rw-r--r-- | src/core/surface/channel.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/core/surface/channel.c b/src/core/surface/channel.c index b80398858d..89fe152a0e 100644 --- a/src/core/surface/channel.c +++ b/src/core/surface/channel.c @@ -172,7 +172,8 @@ grpc_call *grpc_channel_create_call(grpc_channel *channel, gpr_uint32 propagation_mask, grpc_completion_queue *cq, const char *method, const char *host, - gpr_timespec deadline) { + gpr_timespec deadline, void *reserved) { + GPR_ASSERT(!reserved); return grpc_channel_create_call_internal( channel, parent_call, propagation_mask, cq, grpc_mdelem_from_metadata_strings( @@ -186,8 +187,9 @@ grpc_call *grpc_channel_create_call(grpc_channel *channel, } void *grpc_channel_register_call(grpc_channel *channel, const char *method, - const char *host) { + const char *host, void *reserved) { registered_call *rc = gpr_malloc(sizeof(registered_call)); + GPR_ASSERT(!reserved); rc->path = grpc_mdelem_from_metadata_strings( channel->metadata_context, GRPC_MDSTR_REF(channel->path_string), grpc_mdstr_from_string(channel->metadata_context, method, 0)); @@ -204,8 +206,9 @@ void *grpc_channel_register_call(grpc_channel *channel, const char *method, grpc_call *grpc_channel_create_registered_call( grpc_channel *channel, grpc_call *parent_call, gpr_uint32 propagation_mask, grpc_completion_queue *completion_queue, void *registered_call_handle, - gpr_timespec deadline) { + gpr_timespec deadline, void *reserved) { registered_call *rc = registered_call_handle; + GPR_ASSERT(!reserved); return grpc_channel_create_call_internal( channel, parent_call, propagation_mask, completion_queue, GRPC_MDELEM_REF(rc->path), |