From owner-svn-src-head@FreeBSD.ORG Wed May 23 06:49:51 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5250F1065670; Wed, 23 May 2012 06:49:51 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3240B8FC0A; Wed, 23 May 2012 06:49:51 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4N6npOK053891; Wed, 23 May 2012 06:49:51 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4N6nofV053886; Wed, 23 May 2012 06:49:50 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201205230649.q4N6nofV053886@svn.freebsd.org> From: Xin LI Date: Wed, 23 May 2012 06:49:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r235822 - in head: sys/dev/esp sys/gnu/fs/xfs/FreeBSD usr.sbin/ppp usr.sbin/rpc.lockd X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 May 2012 06:49:51 -0000 Author: delphij Date: Wed May 23 06:49:50 2012 New Revision: 235822 URL: http://svn.freebsd.org/changeset/base/235822 Log: Fix build: - 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 Modified: head/sys/dev/esp/ncr53c9x.c head/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c head/usr.sbin/ppp/throughput.c head/usr.sbin/rpc.lockd/kern.c Modified: head/sys/dev/esp/ncr53c9x.c ============================================================================== --- head/sys/dev/esp/ncr53c9x.c Wed May 23 03:35:08 2012 (r235821) +++ head/sys/dev/esp/ncr53c9x.c Wed May 23 06:49:50 2012 (r235822) @@ -1504,7 +1504,7 @@ ncr53c9x_dequeue(struct ncr53c9x_softc * 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 * #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 Modified: head/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c ============================================================================== --- head/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c Wed May 23 03:35:08 2012 (r235821) +++ head/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c Wed May 23 06:49:50 2012 (r235822) @@ -50,8 +50,8 @@ xfs_buf_read_flags(xfs_buftarg_t *target 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; } Modified: head/usr.sbin/ppp/throughput.c ============================================================================== --- head/usr.sbin/ppp/throughput.c Wed May 23 03:35:08 2012 (r235821) +++ head/usr.sbin/ppp/throughput.c Wed May 23 06:49:50 2012 (r235822) @@ -115,14 +115,14 @@ throughput_disp(struct pppThroughput *t, 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 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 } 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 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); Modified: head/usr.sbin/rpc.lockd/kern.c ============================================================================== --- head/usr.sbin/rpc.lockd/kern.c Wed May 23 03:35:08 2012 (r235821) +++ head/usr.sbin/rpc.lockd/kern.c Wed May 23 06:49:50 2012 (r235822) @@ -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);