r2406 - in trunk/varnish-cache: include lib/libvarnish

[phk at projects.linpro.no]

Author: phk
Date: 2008-01-30 11:08:42 +0100 (Wed, 30 Jan 2008)
New Revision: 2406

Modified:
   trunk/varnish-cache/include/cli_common.h
   trunk/varnish-cache/include/cli_priv.h
   trunk/varnish-cache/lib/libvarnish/cli_common.c
Log:
Flexelint silencing: constification, mark ignored returnvalues etc.


Modified: trunk/varnish-cache/include/cli_common.h
===================================================================
--- trunk/varnish-cache/include/cli_common.h	2008-01-30 10:03:51 UTC (rev 2405)
+++ trunk/varnish-cache/include/cli_common.h	2008-01-30 10:08:42 UTC (rev 2406)
@@ -34,7 +34,7 @@
 	enum cli_status_e	result;
 };
 
-int cli_writeres(int fd, struct cli *cli);
+int cli_writeres(int fd, const struct cli *cli);
 int cli_readres(int fd, unsigned *status, char **ptr, double tmo);
 extern struct cli_proto CLI_cmds[];
 

Modified: trunk/varnish-cache/include/cli_priv.h
===================================================================
--- trunk/varnish-cache/include/cli_priv.h	2008-01-30 10:03:51 UTC (rev 2405)
+++ trunk/varnish-cache/include/cli_priv.h	2008-01-30 10:08:42 UTC (rev 2406)
@@ -53,7 +53,7 @@
 };
 
 /* The implementation must provide these functions */
-void cli_out(struct cli *cli, const char *fmt, ...);
+void cli_out(const struct cli *cli, const char *fmt, ...);
 void cli_param(struct cli *cli);
 void cli_result(struct cli *cli, unsigned r);
 

Modified: trunk/varnish-cache/lib/libvarnish/cli_common.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/cli_common.c	2008-01-30 10:03:51 UTC (rev 2405)
+++ trunk/varnish-cache/lib/libvarnish/cli_common.c	2008-01-30 10:08:42 UTC (rev 2406)
@@ -32,7 +32,6 @@
 #include <sys/types.h>
 #include <sys/uio.h>
 
-#include <assert.h>
 #include <ctype.h>
 #include <errno.h>
 #include <poll.h>
@@ -47,20 +46,22 @@
 
 #include "vsb.h"
 
+#include "libvarnish.h"
+
 #include "cli.h"
 #include "cli_priv.h"
 #include "cli_common.h"
 
 void
-cli_out(struct cli *cli, const char *fmt, ...)
+cli_out(const struct cli *cli, const char *fmt, ...)
 {
 	va_list ap;
 
 	va_start(ap, fmt);
 	if (cli != NULL)
-		vsb_vprintf(cli->sb, fmt, ap);
+		(void)vsb_vprintf(cli->sb, fmt, ap);
 	else
-		vfprintf(stdout, fmt, ap);
+		(void)vfprintf(stdout, fmt, ap);
 	va_end(ap);
 }
 
@@ -84,7 +85,7 @@
 }
 
 int
-cli_writeres(int fd, struct cli *cli)
+cli_writeres(int fd, const struct cli *cli)
 {
 	int i, l;
 	struct iovec iov[3];