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 4e29b0cd54a24e242923f636e528fada79228373..0600a4db2336b7853c8781441899cd806e0df3b7 100644 (file)
--- 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 4674cef26433438ad1d8a4006912f3e880911d0e..18160ab44d4f46458a4b39a8703db1eca6a82fd4 100644 (file)
--- 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 c7393337521e7aa0b9fbb129cd4c36e6fd508c05..d83ba47ea8d75fea72e04df917d2a6a71e70c8b6 100644 (file)
--- 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);