aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2015-09-22 10:47:08 -0700
committerGravatar Craig Tiller <ctiller@google.com>2015-09-22 10:47:08 -0700
commit9f7dc3a4e5c3eeb6524472c6dc694f0600d03688 (patch)
tree8b7d92f3bdd000ec44011dd4c96bd3d9c39036fb /src/core/client_config/subchannel_factory_decorators/merge_channel_args.c
parent1be70ccdb84ec41975cc018f6b2a2a89cf5072ee (diff)
Move argument passing to start of list
Diffstat (limited to 'src/core/client_config/subchannel_factory_decorators/merge_channel_args.c')
-rw-r--r--src/core/client_config/subchannel_factory_decorators/merge_channel_args.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c b/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c
index 59af175da1..442862a4b8 100644
--- a/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c
+++ b/src/core/client_config/subchannel_factory_decorators/merge_channel_args.c
@@ -56,7 +56,7 @@ merge_args_factory_unref (grpc_exec_ctx * exec_ctx, grpc_subchannel_factory * sc
merge_args_factory *f = (merge_args_factory *) scf;
if (gpr_unref (&f->refs))
{
- grpc_subchannel_factory_unref (f->wrapped, closure_list);
+ grpc_subchannel_factory_unref (exec_ctx, f->wrapped);
grpc_channel_args_destroy (f->merge_args);
gpr_free (f);
}
@@ -69,7 +69,7 @@ merge_args_factory_create_subchannel (grpc_exec_ctx * exec_ctx, grpc_subchannel_
grpc_channel_args *final_args = grpc_channel_args_merge (args->args, f->merge_args);
grpc_subchannel *s;
args->args = final_args;
- s = grpc_subchannel_factory_create_subchannel (f->wrapped, args, closure_list);
+ s = grpc_subchannel_factory_create_subchannel (exec_ctx, f->wrapped, args);
grpc_channel_args_destroy (final_args);
return s;
}