aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/core/end2end
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@google.com>2016-03-18 12:19:33 -0700
committerGravatar Jan Tattermusch <jtattermusch@google.com>2016-03-18 13:55:30 -0700
commit38da4491cc85710ff2870f980cc4389b1fc0ffb0 (patch)
tree456f4a2b292e4b4e64934282352846cbc38216fb /test/core/end2end
parent9bb7062f20aa3831f7a11e80a8053ee6e891f825 (diff)
fix -Wshadow warning
Diffstat (limited to 'test/core/end2end')
-rw-r--r--test/core/end2end/fixtures/h2_uchannel.c7
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 87bbd64d09..0795ef18e7 100644
--- a/test/core/end2end/fixtures/h2_uchannel.c
+++ b/test/core/end2end/fixtures/h2_uchannel.c
@@ -285,7 +285,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);
@@ -302,9 +302,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);