diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-03-21 07:08:50 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-03-21 07:08:50 -0700 |
| commit | 3448887c901aab0db2b44b73f7840ed5b30b3c7d (patch) | |
| tree | 43cae1a2fbfa7513e15f0b6896802e8735ea0769 /test/core/end2end/fixtures | |
| parent | 6c59e1682606b47651b21977481e762a3b88f028 (diff) | |
| parent | ddd4d7f10f58bded28b47f09938780633c71fcaa (diff) | |
Merge github.com:grpc/grpc into filter-selection
Diffstat (limited to 'test/core/end2end/fixtures')
| -rw-r--r-- | test/core/end2end/fixtures/h2_uchannel.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/core/end2end/fixtures/h2_uchannel.c b/test/core/end2end/fixtures/h2_uchannel.c index 74915f81df..25a4804bea 100644 --- a/test/core/end2end/fixtures/h2_uchannel.c +++ b/test/core/end2end/fixtures/h2_uchannel.c @@ -276,7 +276,7 @@ static void chttp2_init_client_micro_fullstack(grpc_end2end_test_fixture *f, grpc_channel_args *client_args) { micro_fullstack_fixture_data *ffd = f->fixture_data; grpc_connectivity_state conn_state; - grpc_connected_subchannel *connected; + grpc_connected_subchannel *connected_subchannel; char *ipv4_localaddr; gpr_asprintf(&ipv4_localaddr, "ipv4:%s", ffd->localaddr); @@ -293,9 +293,10 @@ static void chttp2_init_client_micro_fullstack(grpc_end2end_test_fixture *f, GPR_ASSERT(conn_state == GRPC_CHANNEL_IDLE); GPR_ASSERT(ffd->sniffed_subchannel != NULL); - connected = connect_subchannel(ffd->sniffed_subchannel); + connected_subchannel = connect_subchannel(ffd->sniffed_subchannel); f->client = grpc_client_uchannel_create(ffd->sniffed_subchannel, client_args); - grpc_client_uchannel_set_connected_subchannel(f->client, connected); + grpc_client_uchannel_set_connected_subchannel(f->client, + connected_subchannel); gpr_log(GPR_INFO, "CHANNEL WRAPPING SUBCHANNEL: %p(%p)", f->client, ffd->sniffed_subchannel); |