Two minor logging fixes:

 - change the type of vsl_handler()'s tag argument from unsigned int to
   enum shmlogtag to allow gcc to check switch statements and gdb to show
   its value by name rather than by number.

 - fix the "missing newline after VCL_call" bug in varnishlog (#95)

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

diff --git a/varnish-cache/bin/varnishhist/varnishhist.c b/varnish-cache/bin/varnishhist/varnishhist.c
index 42e63e8956f4976e0297aae9adef789380405e7e..731ccfb7166f1e2b633de0603b46c1d8098855d0 100644 (file)
--- a/varnish-cache/bin/varnishhist/varnishhist.c
+++ b/varnish-cache/bin/varnishhist/varnishhist.c
@@ -112,7 +112,7 @@ r_hist(void)
 }
 
 static int
-h_hist(void *priv, unsigned tag, unsigned fd, unsigned len, unsigned spec, const char *ptr)
+h_hist(void *priv, enum shmlogtag tag, unsigned fd, unsigned len, unsigned spec, const char *ptr)
 {
        double b;
        int i, j;

diff --git a/varnish-cache/bin/varnishlog/varnishlog.c b/varnish-cache/bin/varnishlog/varnishlog.c
index ab51b9df0813c94284fa9b08028cce1db4806504..b146e1039f20ca79e1828cd221bd186c17a5ed6a 100644 (file)
--- a/varnish-cache/bin/varnishlog/varnishlog.c
+++ b/varnish-cache/bin/varnishlog/varnishlog.c
@@ -94,7 +94,7 @@ clean_order(void)
 }
 
 static int
-h_order(void *priv, unsigned tag, unsigned fd, unsigned len, unsigned spec, const char *ptr)
+h_order(void *priv, enum shmlogtag tag, unsigned fd, unsigned len, unsigned spec, const char *ptr)
 {
 
        (void)priv;
@@ -114,7 +114,7 @@ h_order(void *priv, unsigned tag, unsigned fd, unsigned len, unsigned spec, cons
        switch (tag) {
        case SLT_VCL_call:
                flg[fd] |= F_INVCL;
-               vsb_printf(ob[fd], "%5d %-12s %c %.*s",
+               vsb_printf(ob[fd], "%5d %-12s %c %.*s\n",
                    fd, VSL_tags[tag],
                    ((spec & VSL_S_CLIENT) ? 'c' : \
                    (spec & VSL_S_BACKEND) ? 'b' : '-'),

diff --git a/varnish-cache/bin/varnishncsa/varnishncsa.c b/varnish-cache/bin/varnishncsa/varnishncsa.c
index b04ebb8d227a92f33d7a5c0c833b6c9cfe8ba322..a2596b87b36deab7f9ea74836a5cf77315d081e0 100644 (file)
--- a/varnish-cache/bin/varnishncsa/varnishncsa.c
+++ b/varnish-cache/bin/varnishncsa/varnishncsa.c
@@ -164,7 +164,7 @@ trimline(const char *str, const char *end)
 }
 
 static int
-h_ncsa(void *priv, unsigned tag, unsigned fd,
+h_ncsa(void *priv, enum shmlogtag tag, unsigned fd,
     unsigned len, unsigned spec, const char *ptr)
 {
        const char *end, *next;

diff --git a/varnish-cache/include/varnishapi.h b/varnish-cache/include/varnishapi.h
index 2c27bed641d6ecd5add91aaf2edd32e7ff69bc18..340329b57fbb2a00b67ebc36d6e7b20784909394 100644 (file)
--- a/varnish-cache/include/varnishapi.h
+++ b/varnish-cache/include/varnishapi.h
@@ -32,6 +32,8 @@
 #ifndef VARNISHAPI_H_INCLUDED
 #define VARNISHAPI_H_INCLUDED
 
+#include "shmlog.h"
+
 #define V_DEAD __attribute__ ((noreturn))
 
 /* base64.c */
@@ -39,7 +41,7 @@ void base64_init(void);
 int base64_decode(char *d, unsigned dlen, const char *s);
 
 /* shmlog.c */
-typedef int vsl_handler(void *priv, unsigned tag, unsigned fd, unsigned len, unsigned spec, const char *ptr);
+typedef int vsl_handler(void *priv, enum shmlogtag tag, unsigned fd, unsigned len, unsigned spec, const char *ptr);
 #define VSL_S_CLIENT   (1 << 0)
 #define VSL_S_BACKEND  (1 << 1)
 #define VSL_ARGS       "bCcdI:i:r:X:x:"

diff --git a/varnish-cache/lib/libvarnishapi/shmlog.c b/varnish-cache/lib/libvarnishapi/shmlog.c
index 4fe1e89f0d1e3189f3f3aa6e0d0888d42b0a5d26..3b92e13da24c7a40f52bed5b3e9fefcd2a2e8183 100644 (file)
--- a/varnish-cache/lib/libvarnishapi/shmlog.c
+++ b/varnish-cache/lib/libvarnishapi/shmlog.c
@@ -326,7 +326,7 @@ VSL_Dispatch(struct VSL_data *vd, vsl_handler *func, void *priv)
 /*--------------------------------------------------------------------*/
 
 int
-VSL_H_Print(void *priv, unsigned tag, unsigned fd, unsigned len, unsigned spec, const char *ptr)
+VSL_H_Print(void *priv, enum shmlogtag tag, unsigned fd, unsigned len, unsigned spec, const char *ptr)
 {
        FILE *fo = priv;