From: phk <phk@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Tue, 1 Aug 2006 15:09:20 +0000 (+0000)
Subject: Flinting.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fd0e21e59bbee53ad85ecae43afe6cd7f4b71c3;p=varnish

Flinting.


git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@589 d4fa192b-c00b-0410-8231-f00ffab90ce4
---

diff --git a/varnish-cache/bin/varnishd/cache_vrt.c b/varnish-cache/bin/varnishd/cache_vrt.c
index 4e29b0cd..0600a4db 100644
--- a/varnish-cache/bin/varnishd/cache_vrt.c
+++ b/varnish-cache/bin/varnishd/cache_vrt.c
@@ -136,7 +136,8 @@ VRT_l_obj_ttl(struct sess *sp, double a)
 
 	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;
diff --git a/varnish-cache/bin/varnishd/cache_vrt_acl.c b/varnish-cache/bin/varnishd/cache_vrt_acl.c
index 4674cef2..18160ab4 100644
--- a/varnish-cache/bin/varnishd/cache_vrt_acl.c
+++ b/varnish-cache/bin/varnishd/cache_vrt_acl.c
@@ -13,7 +13,6 @@
 
 #include "shmlog.h"
 #include "vrt.h"
-#include "vrt_obj.h"
 #include "vcl.h"
 #include "cache.h"
 #include <sys/types.h>
diff --git a/varnish-cache/bin/varnishd/cache_vrt_re.c b/varnish-cache/bin/varnishd/cache_vrt_re.c
index c7393337..d83ba47e 100644
--- a/varnish-cache/bin/varnishd/cache_vrt_re.c
+++ b/varnish-cache/bin/varnishd/cache_vrt_re.c
@@ -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 @@ VRT_re_match(const char *s, void *re)
 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 @@ VRT_re_test(struct sbuf *sb, const char *re)
 		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);