From owner-freebsd-bugs@FreeBSD.ORG Mon Oct 26 18:20:01 2009 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BFAD1106566C for ; Mon, 26 Oct 2009 18:20:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 95AD58FC1B for ; Mon, 26 Oct 2009 18:20:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n9QIK1Mp021519 for ; Mon, 26 Oct 2009 18:20:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n9QIK1XI021518; Mon, 26 Oct 2009 18:20:01 GMT (envelope-from gnats) Resent-Date: Mon, 26 Oct 2009 18:20:01 GMT Resent-Message-Id: <200910261820.n9QIK1XI021518@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Ulrich Spörlein Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1041110656A8 for ; Mon, 26 Oct 2009 18:12:00 +0000 (UTC) (envelope-from uqs@spoerlein.net) Received: from acme.spoerlein.net (cl-43.dus-01.de.sixxs.net [IPv6:2a01:198:200:2a::2]) by mx1.freebsd.org (Postfix) with ESMTP id 9677C8FC20 for ; Mon, 26 Oct 2009 18:11:59 +0000 (UTC) Received: from roadrunner.spoerlein.net (pD9E5C51D.dip.t-dialin.net [217.229.197.29]) by acme.spoerlein.net (8.14.3/8.14.3) with ESMTP id n9QIBtLi060850 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 26 Oct 2009 19:11:57 +0100 (CET) (envelope-from uqs@spoerlein.net) Received: from roadrunner.spoerlein.net (localhost [127.0.0.1]) by roadrunner.spoerlein.net (8.14.3/8.14.3) with ESMTP id n9QIBeK0055079 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 26 Oct 2009 19:11:41 +0100 (CET) (envelope-from uqs@roadrunner.spoerlein.net) Received: (from uqs@localhost) by roadrunner.spoerlein.net (8.14.3/8.14.3/Submit) id n9QIBeFn055078; Mon, 26 Oct 2009 19:11:40 +0100 (CET) (envelope-from uqs) Message-Id: <200910261811.n9QIBeFn055078@roadrunner.spoerlein.net> Date: Mon, 26 Oct 2009 19:11:40 +0100 (CET) From: Ulrich Spörlein To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: bin/139994: fsirand(8): increase to WARNS=2 X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Oct 2009 18:20:01 -0000 >Number: 139994 >Category: bin >Synopsis: fsirand(8): increase to WARNS=2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Oct 26 18:20:00 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Ulrich Spörlein >Release: FreeBSD 9.0-CURRENT i386 >Organization: >Environment: >Description: Done by casting data types for printf(3) calls. Higher warns are tricky due to signed/unsigned comparisons. >How-To-Repeat: >Fix: --- fsirand.diff begins here --- diff -r dabb79c85f13 -r c12ebdc97282 sbin/fsirand/Makefile --- a/sbin/fsirand/Makefile Fri Oct 23 10:34:06 2009 +0200 +++ b/sbin/fsirand/Makefile Mon Oct 26 19:07:40 2009 +0100 @@ -2,7 +2,7 @@ # $FreeBSD$ PROG= fsirand -WARNS?= 0 +WARNS?= 2 MAN= fsirand.8 DPADD= ${LIBUTIL} LDADD= -lutil diff -r dabb79c85f13 -r c12ebdc97282 sbin/fsirand/fsirand.c --- a/sbin/fsirand/fsirand.c Fri Oct 23 10:34:06 2009 +0200 +++ b/sbin/fsirand/fsirand.c Mon Oct 26 19:07:40 2009 +0100 @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -141,8 +142,8 @@ for (i = 0; sblock_try[i] != -1; i++) { sblockloc = sblock_try[i]; if (lseek(devfd, sblockloc, SEEK_SET) == -1) { - warn("can't seek to superblock (%qd) on %s", - sblockloc, device); + warn("can't seek to superblock (%jd) on %s", + (intmax_t)sblockloc, device); return (1); } if ((n = read(devfd, (void *)sblock, SBLOCKSIZE))!=SBLOCKSIZE) { @@ -178,7 +179,7 @@ for (cg = 0; cg < sblock->fs_ncg; cg++) { dblk = fsbtodb(sblock, cgsblock(sblock, cg)); if (lseek(devfd, (off_t)dblk * bsize, SEEK_SET) < 0) { - warn("can't seek to %qd", (off_t)dblk * bsize); + warn("can't seek to %jd", (intmax_t)dblk * bsize); return (1); } else if ((n = write(devfd, (void *)sblock, SBLOCKSIZE)) != SBLOCKSIZE) { warn("can't read backup superblock %d on %s: %s", @@ -223,8 +224,8 @@ sblock->fs_id[1] = random(); if (lseek(devfd, sblockloc, SEEK_SET) == -1) { - warn("can't seek to superblock (%qd) on %s", sblockloc, - device); + warn("can't seek to superblock (%jd) on %s", + (intmax_t)sblockloc, device); return (1); } if ((n = write(devfd, (void *)sblock, SBLOCKSIZE)) != @@ -241,7 +242,8 @@ if (!printonly) { dblk = fsbtodb(sblock, cgsblock(sblock, cg)); if (lseek(devfd, (off_t)dblk * bsize, SEEK_SET) < 0) { - warn("can't seek to %qd", (off_t)dblk * bsize); + warn("can't seek to %jd", + (intmax_t)dblk * bsize); return (1); } else if ((n = write(devfd, (void *)sblock, SBLOCKSIZE)) != SBLOCKSIZE) { @@ -255,7 +257,7 @@ /* Read in inodes, then print or randomize generation nums */ dblk = fsbtodb(sblock, ino_to_fsba(sblock, inumber)); if (lseek(devfd, (off_t)dblk * bsize, SEEK_SET) < 0) { - warn("can't seek to %qd", (off_t)dblk * bsize); + warn("can't seek to %jd", (intmax_t)dblk * bsize); return (1); } else if ((n = read(devfd, inodebuf, ibufsize)) != ibufsize) { warnx("can't read inodes: %s", @@ -270,10 +272,10 @@ dp2 = &((struct ufs2_dinode *)inodebuf)[n]; if (inumber >= ROOTINO) { if (printonly) - (void)printf("ino %d gen %qx\n", + (void)printf("ino %d gen %x\n", inumber, sblock->fs_magic == FS_UFS1_MAGIC ? - (quad_t)dp1->di_gen : dp2->di_gen); + dp1->di_gen : dp2->di_gen); else if (sblock->fs_magic == FS_UFS1_MAGIC) dp1->di_gen = random(); else @@ -284,8 +286,8 @@ /* Write out modified inodes */ if (!printonly) { if (lseek(devfd, (off_t)dblk * bsize, SEEK_SET) < 0) { - warn("can't seek to %qd", - (off_t)dblk * bsize); + warn("can't seek to %jd", + (intmax_t)dblk * bsize); return (1); } else if ((n = write(devfd, inodebuf, ibufsize)) != ibufsize) { --- fsirand.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: