diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-09-24 13:58:16 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-09-24 13:58:16 -0700 |
| commit | 8dc09711330ad675d90021e1a7c525cc57d3d956 (patch) | |
| tree | b239706af1471312e84208d765fe237cc872d387 /src/core/surface/secure_channel_create.c | |
| parent | 7f0273fd02ba134fdf2b2cd533a47a18223ff970 (diff) | |
| parent | 2c6206c32d09453a49723bae051fdd688b902265 (diff) | |
Merge github.com:grpc/grpc into shindig
Diffstat (limited to 'src/core/surface/secure_channel_create.c')
| -rw-r--r-- | src/core/surface/secure_channel_create.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/surface/secure_channel_create.c b/src/core/surface/secure_channel_create.c index 0c1cb01749..94d9f496af 100644 --- a/src/core/surface/secure_channel_create.c +++ b/src/core/surface/secure_channel_create.c @@ -237,7 +237,7 @@ grpc_channel *grpc_secure_channel_create(grpc_credentials *creds, grpc_arg connector_arg; grpc_channel_args *args_copy; grpc_channel_args *new_args_from_connector; - grpc_channel_security_connector *connector; + grpc_channel_security_connector *security_connector; grpc_mdctx *mdctx; grpc_resolver *resolver; subchannel_factory *f; @@ -255,15 +255,15 @@ grpc_channel *grpc_secure_channel_create(grpc_credentials *creds, } if (grpc_credentials_create_security_connector( - creds, target, args, NULL, &connector, &new_args_from_connector) != - GRPC_SECURITY_OK) { + creds, target, args, NULL, &security_connector, + &new_args_from_connector) != GRPC_SECURITY_OK) { return grpc_lame_client_channel_create( target, GRPC_STATUS_INVALID_ARGUMENT, "Failed to create security connector."); } mdctx = grpc_mdctx_create(); - connector_arg = grpc_security_connector_to_arg(&connector->base); + connector_arg = grpc_security_connector_to_arg(&security_connector->base); args_copy = grpc_channel_args_copy_and_add( new_args_from_connector != NULL ? new_args_from_connector : args, &connector_arg, 1); @@ -282,8 +282,8 @@ grpc_channel *grpc_secure_channel_create(grpc_credentials *creds, gpr_ref_init(&f->refs, 1); grpc_mdctx_ref(mdctx); f->mdctx = mdctx; - GRPC_SECURITY_CONNECTOR_REF(&connector->base, "subchannel_factory"); - f->security_connector = connector; + GRPC_SECURITY_CONNECTOR_REF(&security_connector->base, "subchannel_factory"); + f->security_connector = security_connector; f->merge_args = grpc_channel_args_copy(args_copy); f->master = channel; GRPC_CHANNEL_INTERNAL_REF(channel, "subchannel_factory"); @@ -296,7 +296,7 @@ grpc_channel *grpc_secure_channel_create(grpc_credentials *creds, &exec_ctx, grpc_channel_get_channel_stack(channel), resolver); GRPC_RESOLVER_UNREF(&exec_ctx, resolver, "create"); grpc_subchannel_factory_unref(&exec_ctx, &f->base); - GRPC_SECURITY_CONNECTOR_UNREF(&connector->base, "channel_create"); + GRPC_SECURITY_CONNECTOR_UNREF(&security_connector->base, "channel_create"); grpc_channel_args_destroy(args_copy); if (new_args_from_connector != NULL) { |