diff options
| author |  murgatroid99 <mlumish@google.com> | 2015-10-05 10:52:46 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2015-10-05 10:52:46 -0700 |
| commit | 243be4e447526598ddd0c6e5b20d260d6db93a4e (patch) | |
| tree | 12df612bbb10e61099c5c1a01255dd9c26d808ff /src/core/surface/channel.c | |
| parent | b0f3bf16cee1d893fc0414fcfe1060baac4eaa9b (diff) | |
| parent | 67eadf7c64b452b5edc630ce6c2140e3f38c2d62 (diff) | |
Resolved merge conflicts in grpc.gyp
Diffstat (limited to 'src/core/surface/channel.c')
| -rw-r--r-- | src/core/surface/channel.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/core/surface/channel.c b/src/core/surface/channel.c index 3ff11eb034..a9a5f828f2 100644 --- a/src/core/surface/channel.c +++ b/src/core/surface/channel.c @@ -217,13 +217,13 @@ grpc_call *grpc_channel_create_call(grpc_channel *channel, gpr_timespec deadline, void *reserved) { GRPC_API_TRACE( "grpc_channel_create_call(" - "channel=%p, parent_call=%p, propagation_mask=%x, cq=%p, method=%s, " - "host=%s, " - "deadline=gpr_timespec { tv_sec: %ld, tv_nsec: %d, clock_type: %d }, " - "reserved=%p)", - 10, (channel, parent_call, (unsigned)propagation_mask, cq, method, - host, (long)deadline.tv_sec, deadline.tv_nsec, - (int)deadline.clock_type, reserved)); + "channel=%p, parent_call=%p, propagation_mask=%x, cq=%p, method=%s, " + "host=%s, " + "deadline=gpr_timespec { tv_sec: %ld, tv_nsec: %d, clock_type: %d }, " + "reserved=%p)", + 10, (channel, parent_call, (unsigned)propagation_mask, cq, method, host, + (long)deadline.tv_sec, deadline.tv_nsec, (int)deadline.clock_type, + reserved)); GPR_ASSERT(!reserved); return grpc_channel_create_call_internal( channel, parent_call, propagation_mask, cq, @@ -268,10 +268,10 @@ grpc_call *grpc_channel_create_registered_call( registered_call *rc = registered_call_handle; GRPC_API_TRACE( "grpc_channel_create_registered_call(" - "channel=%p, parent_call=%p, propagation_mask=%x, completion_queue=%p, " - "registered_call_handle=%p, " - "deadline=gpr_timespec { tv_sec: %ld, tv_nsec: %d, clock_type: %d }, " - "reserved=%p)", + "channel=%p, parent_call=%p, propagation_mask=%x, completion_queue=%p, " + "registered_call_handle=%p, " + "deadline=gpr_timespec { tv_sec: %ld, tv_nsec: %d, clock_type: %d }, " + "reserved=%p)", 9, (channel, parent_call, (unsigned)propagation_mask, completion_queue, registered_call_handle, (long)deadline.tv_sec, deadline.tv_nsec, (int)deadline.clock_type, reserved)); |