Commit a37d3cc1 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Fix a struct member hit by a global name-space edit

parent e4fa4c7a
...@@ -102,7 +102,7 @@ CLI_Run(void) ...@@ -102,7 +102,7 @@ CLI_Run(void)
add_check = 1; add_check = 1;
AN(VCLS_AddFd(cls, heritage.cli_in, heritage.VCLI_Out, NULL, NULL)); AN(VCLS_AddFd(cls, heritage.cli_in, heritage.cli_out, NULL, NULL));
do { do {
i = VCLS_Poll(cls, -1); i = VCLS_Poll(cls, -1);
......
...@@ -46,7 +46,7 @@ struct heritage { ...@@ -46,7 +46,7 @@ struct heritage {
/* Two pipe(2)'s for CLI connection between cache and mgt. */ /* Two pipe(2)'s for CLI connection between cache and mgt. */
int cli_in; int cli_in;
int VCLI_Out; int cli_out;
/* File descriptor for stdout/stderr */ /* File descriptor for stdout/stderr */
int std_fd; int std_fd;
......
...@@ -303,8 +303,8 @@ start_child(struct cli *cli) ...@@ -303,8 +303,8 @@ start_child(struct cli *cli)
/* Open pipe for child->mgr CLI */ /* Open pipe for child->mgr CLI */
AZ(pipe(cp)); AZ(pipe(cp));
heritage.VCLI_Out = cp[1]; heritage.cli_out = cp[1];
mgt_child_inherit(heritage.VCLI_Out, "VCLI_Out"); mgt_child_inherit(heritage.cli_out, "cli_out");
child_cli_in = cp[0]; child_cli_in = cp[0];
/* /*
...@@ -356,8 +356,8 @@ start_child(struct cli *cli) ...@@ -356,8 +356,8 @@ start_child(struct cli *cli)
mgt_child_inherit(heritage.cli_in, NULL); mgt_child_inherit(heritage.cli_in, NULL);
closex(&heritage.cli_in); closex(&heritage.cli_in);
mgt_child_inherit(heritage.VCLI_Out, NULL); mgt_child_inherit(heritage.cli_out, NULL);
closex(&heritage.VCLI_Out); closex(&heritage.cli_out);
close_sockets(); close_sockets();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment