r133 - trunk/varnish-cache/bin/varnishlog

phk at projects.linpro.no phk at projects.linpro.no
Thu Apr 6 11:38:00 CEST 2006


Author: phk
Date: 2006-04-06 11:38:00 +0200 (Thu, 06 Apr 2006)
New Revision: 133

Modified:
   trunk/varnish-cache/bin/varnishlog/Makefile.am
   trunk/varnish-cache/bin/varnishlog/varnishlog.c
Log:
Output the fd in decimal instead of hex.

Do Id Keyword


Modified: trunk/varnish-cache/bin/varnishlog/Makefile.am
===================================================================
--- trunk/varnish-cache/bin/varnishlog/Makefile.am	2006-04-06 09:33:19 UTC (rev 132)
+++ trunk/varnish-cache/bin/varnishlog/Makefile.am	2006-04-06 09:38:00 UTC (rev 133)
@@ -1,4 +1,4 @@
-# $Id: Makefile.am 62 2006-03-23 15:31:20Z phk $
+# $Id$
 
 INCLUDES = -I$(top_srcdir)/include
 


Property changes on: trunk/varnish-cache/bin/varnishlog/Makefile.am
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: trunk/varnish-cache/bin/varnishlog/varnishlog.c
===================================================================
--- trunk/varnish-cache/bin/varnishlog/varnishlog.c	2006-04-06 09:33:19 UTC (rev 132)
+++ trunk/varnish-cache/bin/varnishlog/varnishlog.c	2006-04-06 09:38:00 UTC (rev 133)
@@ -39,6 +39,7 @@
 {
 	int fd;
 	int i;
+	unsigned u;
 	struct shmloghead slh;
 	unsigned char *p;
 
@@ -82,9 +83,9 @@
 				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");


Property changes on: trunk/varnish-cache/bin/varnishlog/varnishlog.c
___________________________________________________________________
Name: svn:keywords
   + Id




More information about the varnish-commit mailing list