diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-06-15 10:11:11 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-06-15 10:11:11 -0700 |
| commit | 7dce09255d3862979b7009e26ef0d562dcdea589 (patch) | |
| tree | e717906a456020af043a22ff63ae09f4392e4053 /src/core/lib/security/transport/handshake.c | |
| parent | a9d8fef0397295a9f9fd3433a4d9ce02f2396093 (diff) | |
Fix merge errors
Diffstat (limited to 'src/core/lib/security/transport/handshake.c')
| -rw-r--r-- | src/core/lib/security/transport/handshake.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/lib/security/transport/handshake.c b/src/core/lib/security/transport/handshake.c index 2e91206e59..45af6cb08a 100644 --- a/src/core/lib/security/transport/handshake.c +++ b/src/core/lib/security/transport/handshake.c @@ -71,7 +71,7 @@ static void dump_state(const char *state, grpc_security_handshake *h, gpr_timespec ttl = gpr_time_sub(h->timer.deadline, gpr_now(h->timer.deadline.clock_type)); const char *msg = grpc_error_string(error); - gpr_log(GPR_DEBUG, "%p: %s ttl=%d.%09d err=%s", h, state, ttl.tv_sec, + gpr_log(GPR_DEBUG, "%p: %s ttl=%" PRId64 ".%09d err=%s", h, state, ttl.tv_sec, ttl.tv_nsec, msg); grpc_error_free_string(msg); GRPC_ERROR_UNREF(error); |