Author: jhb
Date: Wed Oct 13 13:22:11 2010
New Revision: 213775
URL: http://svn.freebsd.org/changeset/base/213775
Log:
Make DEBUG traces 64-bit clean:
- Use %t to print ptrdiff_t values.
- Cast a ptrdiff_t value explicitly to int for a field width specifier.
While here, sort includes.
Submitted by: Garrett Cooper
Modified:
head/bin/sh/expand.c
head/bin/sh/jobs.c
Modified: head/bin/sh/expand.c
==============================================================================
--- head/bin/sh/expand.c Wed Oct 13 13:17:38 2010 (r213774)
+++ head/bin/sh/expand.c Wed Oct 13 13:22:11 2010 (r213775)
@@ -43,14 +43,15 @@ __FBSDID("$FreeBSD$");
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
-#include <errno.h>
#include <dirent.h>
-#include <unistd.h>
-#include <pwd.h>
-#include <stdlib.h>
+#include <errno.h>
+#include <inttypes.h>
#include <limits.h>
+#include <pwd.h>
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
+#include <unistd.h>
/*
* Routines to expand arguments to commands. We have to deal with
@@ -497,9 +498,9 @@ expbackq(union node *cmd, int quoted, in
exitstatus = waitforjob(in.jp, (int *)NULL);
if (quoted == 0)
recordregion(startloc, dest - stackblock(), 0);
- TRACE(("evalbackq: size=%d: \"%.*s\"\n",
- (dest - stackblock()) - startloc,
- (dest - stackblock()) - startloc,
+ TRACE(("expbackq: size=%td: \"%.*s\"\n",
+ ((dest - stackblock()) - startloc),
+ (int)((dest - stackblock()) - startloc),
stackblock() + startloc));
expdest = dest;
INTON;
Modified: head/bin/sh/jobs.c
==============================================================================
--- head/bin/sh/jobs.c Wed Oct 13 13:17:38 2010 (r213774)
+++ head/bin/sh/jobs.c Wed Oct 13 13:22:11 2010 (r213775)
@@ -38,18 +38,18 @@ static char sccsid[] = "@(#)jobs.c 8.5 (
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include <fcntl.h>
-#include <signal.h>
-#include <errno.h>
-#include <paths.h>
-#include <unistd.h>
-#include <stdlib.h>
+#include <sys/ioctl.h>
#include <sys/param.h>
-#include <sys/wait.h>
-#include <sys/time.h>
#include <sys/resource.h>
+#include <sys/stddef.h>
+#include <sys/time.h>
+#include <sys/wait.h>
+#include <errno.h>
+#include <fcntl.h>
#include <paths.h>
-#include <sys/ioctl.h>
+#include <signal.h>
+#include <stdlib.h>
+#include <unistd.h>
#include "shell.h"
#if JOBS
@@ -680,7 +680,7 @@ makejob(union node *node __unused, int n
jp->ps = &jp->ps0;
}
INTON;
- TRACE(("makejob(%p, %d) returns %%%d\n", (void *)node, nprocs,
+ TRACE(("makejob(%p, %d) returns %%%td\n", (void *)node, nprocs,
jp - jobtab + 1));
return jp;
}
@@ -766,7 +766,7 @@ forkshell(struct job *jp, union node *n,
pid_t pid;
pid_t pgrp;
- TRACE(("forkshell(%%%d, %p, %d) called\n", jp - jobtab, (void *)n,
+ TRACE(("forkshell(%%%td, %p, %d) called\n", jp - jobtab, (void *)n,
mode));
INTOFF;
if (mode == FORK_BG)
@@ -903,7 +903,7 @@ waitforjob(struct job *jp, int *origstat
int st;
INTOFF;
- TRACE(("waitforjob(%%%d) called\n", jp - jobtab + 1));
+ TRACE(("waitforjob(%%%td) called\n", jp - jobtab + 1));
while (jp->state == 0)
if (dowait(1, jp) == -1)
dotrap();
@@ -1004,7 +1004,7 @@ dowait(int block, struct job *job)
if (stopped) { /* stopped or done */
int state = done? JOBDONE : JOBSTOPPED;
if (jp->state != state) {
- TRACE(("Job %d: changing state from %d
to %d\n", jp - jobtab + 1, jp->state, state));
+ TRACE(("Job %td: changing state from %d
to %d\n", jp - jobtab + 1, jp->state, state));
jp->state = state;
if (jp != job) {
if (done && !jp->remembered &&
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
