r4575 - trunk/varnish-cache/bin/varnishd

phk at projects.linpro.no phk at projects.linpro.no
Wed Feb 17 20:03:11 CET 2010


Author: phk
Date: 2010-02-17 20:03:08 +0100 (Wed, 17 Feb 2010)
New Revision: 4575

Modified:
   trunk/varnish-cache/bin/varnishd/mgt_child.c
Log:
Use %jd for pid_t's to make -1 look sensible.



Modified: trunk/varnish-cache/bin/varnishd/mgt_child.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_child.c	2010-02-17 15:03:10 UTC (rev 4574)
+++ trunk/varnish-cache/bin/varnishd/mgt_child.c	2010-02-17 19:03:08 UTC (rev 4575)
@@ -136,7 +136,7 @@
 {
 	(void)priv;
 
-	REPORT(LOG_NOTICE, "Child (%ju) said %s", (uintmax_t)child_pid, p);
+	REPORT(LOG_NOTICE, "Child (%jd) said %s", (intmax_t)child_pid, p);
 	return (0);
 }
 
@@ -173,8 +173,8 @@
 	if (!mgt_cli_askchild(NULL, NULL, "ping\n"))
 		return (0);
 	REPORT(LOG_ERR,
-	    "Child (%ju) not responding to ping, killing it.",
-	    (uintmax_t)child_pid);
+	    "Child (%jd) not responding to ping, killing it.",
+	    (intmax_t)child_pid);
 	if (params->diag_bitmap & 0x1000)
 		(void)kill(child_pid, SIGKILL);
 	else
@@ -357,7 +357,7 @@
 
 		exit(1);
 	}
-	REPORT(LOG_NOTICE, "child (%ju) Started", (uintmax_t)pid);
+	REPORT(LOG_NOTICE, "child (%jd) Started", (intmax_t)pid);
 
 	/* Close stuff the child got */
 	closex(&heritage.std_fd);
@@ -440,7 +440,7 @@
 	VSL_Panic(&l, &p);
 	if (*p == '\0')
 		return;
-	REPORT(LOG_ERR, "Child (%ju) Panic message: %s", (uintmax_t)r, p);
+	REPORT(LOG_ERR, "Child (%jd) Panic message: %s", (intmax_t)r, p);
 }
 
 /*--------------------------------------------------------------------*/



More information about the varnish-commit mailing list