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

[phk at projects.linpro.no]

Author: phk
Date: 2008-01-30 11:24:54 +0100 (Wed, 30 Jan 2008)
New Revision: 2410

Modified:
   trunk/varnish-cache/include/vsb.h
   trunk/varnish-cache/lib/libvarnish/vsb.c
Log:
Flexelint silencing: a (), a couple of const and cast.


Modified: trunk/varnish-cache/include/vsb.h
===================================================================
--- trunk/varnish-cache/include/vsb.h	2008-01-30 10:20:54 UTC (rev 2409)
+++ trunk/varnish-cache/include/vsb.h	2008-01-30 10:24:54 UTC (rev 2410)
@@ -69,11 +69,11 @@
 #endif
 int		 vsb_putc(struct vsb *, int);
 int		 vsb_trim(struct vsb *);
-int		 vsb_overflowed(struct vsb *);
+int		 vsb_overflowed(const struct vsb *);
 void		 vsb_finish(struct vsb *);
 char		*vsb_data(struct vsb *);
 int		 vsb_len(struct vsb *);
-int		 vsb_done(struct vsb *);
+int		 vsb_done(const struct vsb *);
 void		 vsb_delete(struct vsb *);
 #ifdef __cplusplus
 };

Modified: trunk/varnish-cache/lib/libvarnish/vsb.c
===================================================================
--- trunk/varnish-cache/lib/libvarnish/vsb.c	2008-01-30 10:20:54 UTC (rev 2409)
+++ trunk/varnish-cache/lib/libvarnish/vsb.c	2008-01-30 10:24:54 UTC (rev 2410)
@@ -51,7 +51,7 @@
 #define	VSB_ISFINISHED(s)	((s)->s_flags & VSB_FINISHED)
 #define	VSB_HASOVERFLOWED(s)	((s)->s_flags & VSB_OVERFLOWED)
 #define	VSB_HASROOM(s)		((s)->s_len < (s)->s_size - 1)
-#define	VSB_FREESPACE(s)	((s)->s_size - (s)->s_len - 1)
+#define	VSB_FREESPACE(s)	((s)->s_size - ((s)->s_len + 1))
 #define	VSB_CANEXTEND(s)	((s)->s_flags & VSB_AUTOEXTEND)
 
 /*
@@ -373,7 +373,7 @@
 		return (-1);
 	}
 	if (c != '\0')
-	    s->s_buf[s->s_len++] = c;
+	    s->s_buf[s->s_len++] = (char)c;
 	return (0);
 }
 
@@ -399,7 +399,7 @@
  * Check if an vsb overflowed
  */
 int
-vsb_overflowed(struct vsb *s)
+vsb_overflowed(const struct vsb *s)
 {
     return VSB_HASOVERFLOWED(s);
 }
@@ -467,7 +467,7 @@
  * Check if an vsb has been finished.
  */
 int
-vsb_done(struct vsb *s)
+vsb_done(const struct vsb *s)
 {
 
 	return(VSB_ISFINISHED(s));