From 2da975fe4d34b454b431d57a719a18a3baa8e731 Mon Sep 17 00:00:00 2001
From: phk <phk@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Thu, 6 Apr 2006 09:38:00 +0000
Subject: [PATCH] Output the fd in decimal instead of hex.

Do Id Keyword


git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@133 d4fa192b-c00b-0410-8231-f00ffab90ce4
---
 varnish-cache/bin/varnishlog/Makefile.am  | 2 +-
 varnish-cache/bin/varnishlog/varnishlog.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/varnish-cache/bin/varnishlog/Makefile.am b/varnish-cache/bin/varnishlog/Makefile.am
index fa0d2324..fbf4bfc6 100644
--- a/varnish-cache/bin/varnishlog/Makefile.am
+++ b/varnish-cache/bin/varnishlog/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am 62 2006-03-23 15:31:20Z phk $
+# $Id$
 
 INCLUDES = -I$(top_srcdir)/include
 
diff --git a/varnish-cache/bin/varnishlog/varnishlog.c b/varnish-cache/bin/varnishlog/varnishlog.c
index ea3a961b..b3b62ad2 100644
--- a/varnish-cache/bin/varnishlog/varnishlog.c
+++ b/varnish-cache/bin/varnishlog/varnishlog.c
@@ -39,6 +39,7 @@ main(int argc, char **argv)
 {
 	int fd;
 	int i;
+	unsigned u;
 	struct shmloghead slh;
 	unsigned char *p;
 
@@ -82,9 +83,9 @@ main(int argc, char **argv)
 				fflush(stdout);
 				sleep(1);
 			}
-			printf("%02x %02d %02x%02x %-12s <",
-			    p[0], p[1], p[2], p[3],
-			    tagnames[p[0]]);
+			u = (p[2] << 8) | p[3];
+			printf("%02x %02d %4d %-12s <",
+			    p[0], p[1], u, tagnames[p[0]]);
 			if (p[1] > 0)
 				fwrite(p + 4, p[1], 1, stdout);
 			printf(">\n");
-- 
2.39.5