diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-12-14 12:11:01 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-12-14 12:11:01 -0800 |
| commit | 0bdc3a58f68e5cf601ba5d2718a8f319d286c855 (patch) | |
| tree | 0d35cf8fc555f3a1704ca028f62da02703e8c10a /src/core/surface/channel.c | |
| parent | 4bf292890c48d408e7dc0acd82e85ddcc9e0dde2 (diff) | |
| parent | 620e965c1b522173aaf2d12e9fcf9c8f5d8754be (diff) | |
Merge branch 'cf' into proxy-crash
Diffstat (limited to 'src/core/surface/channel.c')
| -rw-r--r-- | src/core/surface/channel.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/surface/channel.c b/src/core/surface/channel.c index a873c39441..d0a8b0be09 100644 --- a/src/core/surface/channel.c +++ b/src/core/surface/channel.c @@ -198,8 +198,8 @@ grpc_call *grpc_channel_create_call(grpc_channel *channel, "deadline=gpr_timespec { tv_sec: %lld, tv_nsec: %d, clock_type: %d }, " "reserved=%p)", 10, (channel, parent_call, (unsigned)propagation_mask, cq, method, host, - (long long)deadline.tv_sec, (int)deadline.tv_nsec, (int)deadline.clock_type, - reserved)); + (long long)deadline.tv_sec, (int)deadline.tv_nsec, + (int)deadline.clock_type, reserved)); GPR_ASSERT(!reserved); return grpc_channel_create_call_internal( channel, parent_call, propagation_mask, cq, @@ -242,8 +242,8 @@ grpc_call *grpc_channel_create_registered_call( "deadline=gpr_timespec { tv_sec: %lld, tv_nsec: %d, clock_type: %d }, " "reserved=%p)", 9, (channel, parent_call, (unsigned)propagation_mask, completion_queue, - registered_call_handle, (long long)deadline.tv_sec, (int)deadline.tv_nsec, - (int)deadline.clock_type, reserved)); + registered_call_handle, (long long)deadline.tv_sec, + (int)deadline.tv_nsec, (int)deadline.clock_type, reserved)); GPR_ASSERT(!reserved); return grpc_channel_create_call_internal( channel, parent_call, propagation_mask, completion_queue, |