]> err.no Git - varnish/commitdiff
projects / varnish / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 57d3666)
Misc changes:
authorphk <phk@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Tue, 25 Sep 2007 07:40:01 +0000 (07:40 +0000)
committerphk <phk@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Tue, 25 Sep 2007 07:40:01 +0000 (07:40 +0000)
A couple of XXX comments
Some returnvalue asserts
Some pdiff() uses
Change WRK_Flush() to return unsigned

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

varnish-cache/bin/varnishd/cache.h patch | blob | history
varnish-cache/bin/varnishd/cache_hash.c patch | blob | history
varnish-cache/bin/varnishd/cache_pool.c patch | blob | history
varnish-cache/bin/varnishd/cache_synthetic.c patch | blob | history
varnish-cache/bin/varnishd/mgt_vcc.c patch | blob | history
varnish-cache/bin/varnishd/stevedore.c patch | blob | history

diff --git a/varnish-cache/bin/varnishd/cache.h b/varnish-cache/bin/varnishd/cache.h
index c3b21c5d403dc297bda02ab5b7e42cd23262660c..3384710e070c54896b164abdb01c5a16fd00cb9b 100644 (file)
--- a/varnish-cache/bin/varnishd/cache.h
+++ b/varnish-cache/bin/varnishd/cache.h
@@ -490,7 +490,7 @@ void PipeSession(struct sess *sp);
 void WRK_Init(void);
 void WRK_QueueSession(struct sess *sp);
 void WRK_Reset(struct worker *w, int *fd);
-int WRK_Flush(struct worker *w);
+unsigned WRK_Flush(struct worker *w);
 unsigned WRK_Write(struct worker *w, const void *ptr, int len);
 unsigned WRK_WriteH(struct worker *w, struct http_hdr *hh, const char *suf);
 #ifdef HAVE_SENDFILE
diff --git a/varnish-cache/bin/varnishd/cache_hash.c b/varnish-cache/bin/varnishd/cache_hash.c
index e72fff873d1b24e91f774659efdb2b2d6f764fb2..eccb479f1281e82d4631889557901e58008223b4 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_hash.c
+++ b/varnish-cache/bin/varnishd/cache_hash.c
@@ -146,7 +146,7 @@ HSH_Copy(const struct sess *sp, const struct objhead *obj)
        assert(obj->hashlen >= sp->lhashptr);
        b = obj->hash;
        for (u = 0; u < sp->ihashptr; u += 2) {
-               v = sp->hashptr[u + 1] - sp->hashptr[u];
+               v = pdiff(sp->hashptr[u], sp->hashptr[u + 1]);
                memcpy(b, sp->hashptr[u], v);
                b += v;
                *b++ = '#';
diff --git a/varnish-cache/bin/varnishd/cache_pool.c b/varnish-cache/bin/varnishd/cache_pool.c
index 459cf669429c9bad3c1c6d7273f668f6e1946e50..d66ed3c7d44559e2b9ded88bc40d0b4b2f50e739 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_pool.c
+++ b/varnish-cache/bin/varnishd/cache_pool.c
@@ -91,7 +91,7 @@ WRK_Reset(struct worker *w, int *fd)
        w->wfd = fd;
 }
 
-int
+unsigned
 WRK_Flush(struct worker *w)
 {
        int i;
diff --git a/varnish-cache/bin/varnishd/cache_synthetic.c b/varnish-cache/bin/varnishd/cache_synthetic.c
index caa17c6e4d8624a4e7e2f9a3c79a9b8f026653eb..63e5d0685e2413cffd17832537d495489216b7cf 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_synthetic.c
+++ b/varnish-cache/bin/varnishd/cache_synthetic.c
@@ -91,7 +91,7 @@ SYN_ErrorPage(struct sess *sp, int status, const char *reason, int ttl)
        TAILQ_INSERT_TAIL(&sp->obj->store, st, list);
 
        /* generate body */
-       vsb_new(&vsb, (char *)st->ptr, st->space, VSB_FIXEDLEN);
+       AN(vsb_new(&vsb, (char *)st->ptr, st->space, VSB_FIXEDLEN));
        vsb_printf(&vsb,
            "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
            "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"\n"
diff --git a/varnish-cache/bin/varnishd/mgt_vcc.c b/varnish-cache/bin/varnishd/mgt_vcc.c
index 2046cc1a55ed7751f1ee05c9d32a17cf60fe6d67..cc69b0498ae2bd35f2b115be72ba43780e80e747 100644 (file)
--- a/varnish-cache/bin/varnishd/mgt_vcc.c
+++ b/varnish-cache/bin/varnishd/mgt_vcc.c
@@ -277,6 +277,11 @@ mgt_CallCc(const char *source, struct vsb *sb)
                return (NULL);
        } 
 
+       /*
+        * XXX: we should look up and check the handle in the loaded
+        * object
+        */
+
        AZ(dlclose(p));
        return (of);
 }
@@ -618,6 +623,9 @@ mcf_config_list(struct cli *cli, char **av, void *priv)
        }
 }
 
+/*
+ * XXX: This should take an option argument to show all (include) files
+ */
 void
 mcf_config_show(struct cli *cli, char **av, void *priv)
 {
@@ -635,12 +643,12 @@ mcf_config_show(struct cli *cli, char **av, void *priv)
                        cli_out(cli, "failed to locate source for %s: %s\n",
                            vp->name, dlerror());
                        cli_result(cli, CLIS_CANT);
-                       dlclose(dlh);
+                       AZ(dlclose(dlh));
                } else {
                        src = sym;
                        cli_out(cli, src[0]);
                        /* cli_out(cli, src[1]); */
-                       dlclose(dlh);
+                       AZ(dlclose(dlh));
                }
        }
 }
diff --git a/varnish-cache/bin/varnishd/stevedore.c b/varnish-cache/bin/varnishd/stevedore.c
index 132d54cd94278f636bf13208993b63bdd6e97f27..9fa75f3b7e1147ab134c72ad468fbdaffabe2a44 100644 (file)
--- a/varnish-cache/bin/varnishd/stevedore.c
+++ b/varnish-cache/bin/varnishd/stevedore.c
@@ -94,9 +94,12 @@ STV_free(struct storage *st)
 static int
 cmp_storage(const struct stevedore *s, const char *p, const char *q)
 {
-       if (strlen(s->name) != q - p)
+       unsigned u;
+
+       u = pdiff(p, q);
+       if (strlen(s->name) != u)
                return (1);
-       if (strncmp(s->name, p, q - p))
+       if (strncmp(s->name, p, u))
                return (1);
        return (0);
 }
Varnish, the HTTP accelerator