r589 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2006-08-01 17:09:20 +0200 (Tue, 01 Aug 2006)
New Revision: 589

Modified:
   trunk/varnish-cache/bin/varnishd/cache_vrt.c
   trunk/varnish-cache/bin/varnishd/cache_vrt_acl.c
   trunk/varnish-cache/bin/varnishd/cache_vrt_re.c
Log:
Flinting.


Modified: trunk/varnish-cache/bin/varnishd/cache_vrt.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_vrt.c	2006-08-01 15:08:54 UTC (rev 588)
+++ trunk/varnish-cache/bin/varnishd/cache_vrt.c	2006-08-01 15:09:20 UTC (rev 589)
@@ -136,7 +136,8 @@
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
 	CHECK_OBJ_NOTNULL(sp->obj, OBJECT_MAGIC);	/* XXX */
-	VSL(SLT_TTL, sp->fd, "%u VCL %.0f %u", sp->obj->xid, a, sp->t_req);
+	VSL(SLT_TTL, sp->fd, "%u VCL %.0f %u",
+	    sp->obj->xid, a, sp->t_req.tv_sec);
 	if (a < 0)
 		a = 0;
 	sp->obj->ttl = sp->t_req.tv_sec + (int)a;

Modified: trunk/varnish-cache/bin/varnishd/cache_vrt_acl.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_vrt_acl.c	2006-08-01 15:08:54 UTC (rev 588)
+++ trunk/varnish-cache/bin/varnishd/cache_vrt_acl.c	2006-08-01 15:09:20 UTC (rev 589)
@@ -13,7 +13,6 @@
 
 #include "shmlog.h"
 #include "vrt.h"
-#include "vrt_obj.h"
 #include "vcl.h"
 #include "cache.h"
 #include <sys/types.h>

Modified: trunk/varnish-cache/bin/varnishd/cache_vrt_re.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_vrt_re.c	2006-08-01 15:08:54 UTC (rev 588)
+++ trunk/varnish-cache/bin/varnishd/cache_vrt_re.c	2006-08-01 15:09:20 UTC (rev 589)
@@ -12,7 +12,6 @@
 
 #include "shmlog.h"
 #include "vrt.h"
-#include "vrt_obj.h"
 #include "sbuf.h"
 #include "vcl.h"
 #include "cache.h"
@@ -55,7 +54,7 @@
 int
 VRT_re_test(struct sbuf *sb, const char *re)
 {
-	int i, j;
+	int i;
 	regex_t	t;	
 	char buf[BUFSIZ];
 
@@ -65,7 +64,7 @@
 		regfree(&t);
 		return (0);
 	}
-	j = regerror(i, &t, buf, sizeof buf);
+	(void)regerror(i, &t, buf, sizeof buf);
 	sbuf_printf(sb, "Regexp compilation error:\n\n%s\n\n", buf);
 	regfree(&t);
 	return (1);