d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build:

Browse Source 
- Use %ll instead of %q for explicit long long casts;
 - Use %j instead of %q in XFS and cast to intmax_t.

Tested with:	make universe
This commit is contained in:
Xin LI 2012-05-23 06:49:50 +00:00
parent 00b6d640df
commit 64c06aeb8d
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/esp/ncr53c9x.c
View File

@ -1504,7 +1504,7 @@ ncr53c9x_dequeue(struct ncr53c9x_softc *sc, struct ncr53c9x_ecb *ecb)
li = TINFO_LUN(ti, lun);
#ifdef DIAGNOSTIC
if (li == NULL || li->lun != lun)
panic("%s: lun %qx for ecb %p does not exist", __func__,
panic("%s: lun %llx for ecb %p does not exist", __func__,
(long long)lun, ecb);
#endif
if (li->untagged == ecb) {
@ -1515,7 +1515,7 @@ ncr53c9x_dequeue(struct ncr53c9x_softc *sc, struct ncr53c9x_ecb *ecb)
#ifdef DIAGNOSTIC
if (li->queued[ecb->tag[1]] != NULL &&
(li->queued[ecb->tag[1]] != ecb))
panic("%s: slot %d for lun %qx has %p instead of ecb "
panic("%s: slot %d for lun %llx has %p instead of ecb "
"%p", __func__, ecb->tag[1], (long long)lun,
li->queued[ecb->tag[1]], ecb);
#endif

4
sys/gnu/fs/xfs/FreeBSD/xfs_buf.c
View File

@ -50,8 +50,8 @@ xfs_buf_read_flags(xfs_buftarg_t *target, xfs_daddr_t blkno, size_t len, int fla
KASSERT((target != NULL), ("got NULL buftarg_t"));
if (bread(target->specvp, blkno, BBTOB(len), NOCRED, &bp)) {
printf("bread failed specvp %p blkno %qd BBTOB(len) %ld\n",
target->specvp, blkno, (long)BBTOB(len));
printf("bread failed specvp %p blkno %jd BBTOB(len) %ld\n",
target->specvp, (intmax_t)blkno, (long)BBTOB(len));
bp = NULL;
}

14
usr.sbin/ppp/throughput.c
View File

@ -115,14 +115,14 @@ throughput_disp(struct pppThroughput *t, struct prompt *prompt)
prompt_Printf(prompt, "%llu packets in, %llu packets out\n",
t->PacketsIn, t->PacketsOut);
if (t->rolling) {
prompt_Printf(prompt, " overall %6qu bytes/sec\n",
prompt_Printf(prompt, " overall %6llu bytes/sec\n",
(t->OctetsIn + t->OctetsOut) / divisor);
prompt_Printf(prompt, " %s %6qu bytes/sec in, %6qu bytes/sec out "
prompt_Printf(prompt, " %s %6llu bytes/sec in, %6llu bytes/sec out "
"(over the last %d secs)\n",
t->downtime ? "average " : "currently",
t->in.OctetsPerSecond, t->out.OctetsPerSecond,
secs_up > t->SamplePeriod ? t->SamplePeriod : secs_up);
prompt_Printf(prompt, " peak %6qu bytes/sec on %s",
prompt_Printf(prompt, " peak %6llu bytes/sec on %s",
t->BestOctetsPerSecond, ctime(&t->BestOctetsPerSecondTime));
} else
prompt_Printf(prompt, "Overall %llu bytes/sec\n",
@ -266,7 +266,7 @@ throughput_clear(struct pppThroughput *t, int clear_type, struct prompt *prompt)
if ((divisor = throughput_uptime(t)) == 0)
divisor = 1;
prompt_Printf(prompt, "overall cleared (was %6qu bytes/sec)\n",
prompt_Printf(prompt, "overall cleared (was %6llu bytes/sec)\n",
(t->OctetsIn + t->OctetsOut) / divisor);
t->OctetsIn = t->OctetsOut = t->PacketsIn = t->PacketsOut = 0;
t->downtime = 0;
@ -274,8 +274,8 @@ throughput_clear(struct pppThroughput *t, int clear_type, struct prompt *prompt)
}
if (clear_type & THROUGHPUT_CURRENT) {
prompt_Printf(prompt, "current cleared (was %6qu bytes/sec in,"
" %6qu bytes/sec out)\n",
prompt_Printf(prompt, "current cleared (was %6llu bytes/sec in,"
" %6llu bytes/sec out)\n",
t->in.OctetsPerSecond, t->out.OctetsPerSecond);
t->in.OctetsPerSecond = t->out.OctetsPerSecond = 0;
}
@ -287,7 +287,7 @@ throughput_clear(struct pppThroughput *t, int clear_type, struct prompt *prompt)
last = time_buf + strlen(time_buf);
if (last > time_buf && *--last == '\n')
*last = '\0';
prompt_Printf(prompt, "peak cleared (was %6qu bytes/sec on %s)\n",
prompt_Printf(prompt, "peak cleared (was %6llu bytes/sec on %s)\n",
t->BestOctetsPerSecond, time_buf);
t->BestOctetsPerSecond = 0;
time(&t->BestOctetsPerSecondTime);

2
usr.sbin/rpc.lockd/kern.c
View File

@ -595,7 +595,7 @@ show(LOCKD_MSG *mp)
syslog(LOG_DEBUG, "fh_len %d, fh %s\n", (int)mp->lm_fh_len, buf);
/* Show flock structure. */
syslog(LOG_DEBUG, "start %qu; len %qu; pid %lu; type %d; whence %d\n",
syslog(LOG_DEBUG, "start %llu; len %llu; pid %lu; type %d; whence %d\n",
(unsigned long long)mp->lm_fl.l_start,
(unsigned long long)mp->lm_fl.l_len, (u_long)mp->lm_fl.l_pid,
mp->lm_fl.l_type, mp->lm_fl.l_whence);