diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-07-07 13:51:57 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-07-07 13:51:57 -0700 |
| commit | cf531785495330c86ce2531d2ec5dbff9da680c6 (patch) | |
| tree | 10a959ca0c0f68d75ec70bda9658fcf83c6e9978 /src/core/channel/client_setup.c | |
| parent | 6f9f812174d8c05a477106a299a5b60e68d660b1 (diff) | |
| parent | 87d2cac9813512bd06414013e79e9442701abde8 (diff) | |
Merge branch 'footprints-on-the-sands-of-time' of github.com:ctiller/grpc into footprints-on-the-sands-of-time
Diffstat (limited to 'src/core/channel/client_setup.c')
| -rw-r--r-- | src/core/channel/client_setup.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/channel/client_setup.c b/src/core/channel/client_setup.c index 9844f4e43e..3663130085 100644 --- a/src/core/channel/client_setup.c +++ b/src/core/channel/client_setup.c @@ -94,7 +94,8 @@ static void setup_initiate(grpc_transport_setup *sp) { int in_alarm = 0; r->setup = s; - r->deadline = gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), gpr_time_from_seconds(60)); + r->deadline = + gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), gpr_time_from_seconds(60)); gpr_mu_lock(&s->mu); GPR_ASSERT(s->refs > 0); @@ -231,7 +232,7 @@ int grpc_client_setup_request_should_continue(grpc_client_setup_request *r, return result; } -static void backoff_alarm_done(void *arg /* grpc_client_setup_request */, +static void backoff_alarm_done(void *arg /* grpc_client_setup_request */, int success) { grpc_client_setup_request *r = arg; grpc_client_setup *s = r->setup; |