r3684 - branches/2.0/varnish-cache/bin/varnishd

[tfheen at projects.linpro.no]

Author: tfheen
Date: 2009-02-06 15:50:45 +0100 (Fri, 06 Feb 2009)
New Revision: 3684

Modified:
   branches/2.0/varnish-cache/bin/varnishd/mgt_cli.c
Log:
Merge r3495: Properly ignore the return value from cli_readres(), we get it in status.



Modified: branches/2.0/varnish-cache/bin/varnishd/mgt_cli.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/mgt_cli.c	2009-02-06 14:46:21 UTC (rev 3683)
+++ branches/2.0/varnish-cache/bin/varnishd/mgt_cli.c	2009-02-06 14:50:45 UTC (rev 3684)
@@ -189,7 +189,7 @@
 		return (CLIS_COMMS);
 	}
 
-	i = cli_readres(cli_i, &u, resp, params->cli_timeout);
+	(void)cli_readres(cli_i, &u, resp, params->cli_timeout);
 	if (status != NULL)
 		*status = u;
 	return (u == CLIS_OK ? 0 : u);
@@ -270,7 +270,7 @@
 			xxxassert(i == strlen(p));
 			i = write(cli_o, "\n", 1);
 			xxxassert(i == 1);
-			i = cli_readres(cli_i, &u, &q, params->cli_timeout);
+			(void)cli_readres(cli_i, &u, &q, params->cli_timeout);
 			cli_result(cp->cli, u);
 			cli_out(cp->cli, "%s", q);
 			free(q);