[master] a37d3cc Fix a struct member hit by a global name-space edit
Poul-Henning Kamp
phk at varnish-cache.org
Thu Nov 10 11:08:42 CET 2011
commit a37d3cc15b5fa9b5f381481a8c95581c3b29bf2c
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Thu Nov 10 09:12:04 2011 +0000
Fix a struct member hit by a global name-space edit
diff --git a/bin/varnishd/cache_cli.c b/bin/varnishd/cache_cli.c
index ac2afc1..1e09d23 100644
--- a/bin/varnishd/cache_cli.c
+++ b/bin/varnishd/cache_cli.c
@@ -102,7 +102,7 @@ CLI_Run(void)
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 {
i = VCLS_Poll(cls, -1);
diff --git a/bin/varnishd/heritage.h b/bin/varnishd/heritage.h
index 39fc03e..e6e6558 100644
--- a/bin/varnishd/heritage.h
+++ b/bin/varnishd/heritage.h
@@ -46,7 +46,7 @@ struct heritage {
/* Two pipe(2)'s for CLI connection between cache and mgt. */
int cli_in;
- int VCLI_Out;
+ int cli_out;
/* File descriptor for stdout/stderr */
int std_fd;
diff --git a/bin/varnishd/mgt/mgt_child.c b/bin/varnishd/mgt/mgt_child.c
index 9503e5b..cfe0b2f 100644
--- a/bin/varnishd/mgt/mgt_child.c
+++ b/bin/varnishd/mgt/mgt_child.c
@@ -303,8 +303,8 @@ start_child(struct cli *cli)
/* Open pipe for child->mgr CLI */
AZ(pipe(cp));
- heritage.VCLI_Out = cp[1];
- mgt_child_inherit(heritage.VCLI_Out, "VCLI_Out");
+ heritage.cli_out = cp[1];
+ mgt_child_inherit(heritage.cli_out, "cli_out");
child_cli_in = cp[0];
/*
@@ -356,8 +356,8 @@ start_child(struct cli *cli)
mgt_child_inherit(heritage.cli_in, NULL);
closex(&heritage.cli_in);
- mgt_child_inherit(heritage.VCLI_Out, NULL);
- closex(&heritage.VCLI_Out);
+ mgt_child_inherit(heritage.cli_out, NULL);
+ closex(&heritage.cli_out);
close_sockets();
More information about the varnish-commit
mailing list