From nobody Tue May 24 13:51:47 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 52E611AEEF65; Tue, 24 May 2022 13:51:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L6wbm1Cwjz4Ykt; Tue, 24 May 2022 13:51:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653400308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OWtdgo9dsCojFiu19hjGAAWD77UhiVOdj8zYHbEzUvc=; b=gCfxio9yeb4dz5apOXulG/aAmOqFSprdllom/49o02X3rdEueu+m2JYbk7ufE4UIS8OdFx EzUOxp2bAOXKofmtNZtLQvBvWlmnue+GzW9gtlFXRyz24SQRl9vJOCfgQhE3DmAv2MCY2D dGjT58LyRpJvYEQ0/ZXbORTdP4YKyMgSlyfNuL5N+TV/K/3aYXwHihidqkFImMAH1VDPyt oIVs+sJnyXOSV+wljn3sTR0YWLJUvz9reVrWJ7GUQI/Cbjk1qmuvwGLI3R4Ear5JK1+qLa fkI++6+WwdXiFGid+8yoUNqo9P7VBzTlG86GpRXYNZC3rm7x+gdiVNtDPVss9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DDB1B25ABF; Tue, 24 May 2022 13:51:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24ODplbY064102; Tue, 24 May 2022 13:51:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24ODpl97064101; Tue, 24 May 2022 13:51:47 GMT (envelope-from git) Date: Tue, 24 May 2022 13:51:47 GMT Message-Id: <202205241351.24ODpl97064101@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: bee87a73813d - stable/13 - makefs: Fix warnings and reset WARNS to the default List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bee87a73813d8599bdb926bd3dfb0704a35665c4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653400308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OWtdgo9dsCojFiu19hjGAAWD77UhiVOdj8zYHbEzUvc=; b=YZ9k09nMzMAEWeq+vxrajBneKJq3Yz5KQvfNRBAlTE/8vB0uy2NfvgcifUWFj7ysaJ8W5/ cQbboRuSZunAjrvD+vu312jaYHIAu8OuYvAEkFC930HpgaUN1CNeeYCsILo9spdlr+MCCL LIIFOcJfBMY65FTHRUdkTWtvOGtdSxTQfFQ1A2iXWFyJeScBOGbf+y0JHCXX4yH/Lswqq5 lC3XImTY3O0gp/Y3/ULGV9R8rIdYqPg6msWMo9+jCsnyJ4tUTgn9Vz5TyoRmn0NHLZcEtc EqtjgAbMNqrAr9+tKG91c9tYq+CSfVNv5Cn9tKFPebbTaCmYo4MsNQDGMrsKRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653400308; a=rsa-sha256; cv=none; b=b+RDHioJnS1QCSBW+J1IOvquDysH0sQylbcHeDySFsfBjrQssphkWhzQ35YWARGqNKo1G+ /K4ai0kLZ9+hdEG7hcdh3taOB2Pks0H4sura/IP0zOpeyNP2y3Ssb5y72yn+hED/yWjMHV TwTpXE0vVP/qhUEjHwIWhI9c4mTy0cd/R98AjBSmQtoGjpr8zfqefbuOze5d3dmJzxRvJL TMIIgs4yTVjrgvWoOxAKzVM0EA6AqRTBE5LulFiIw9WXMY2UlxGRdQD0JaVXMf1v3o32Te koP8z4ecRHO252sGwer/epNkvDjb9H4fL9wgysJouZrAswXsZhfsqtKXvR1DnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=bee87a73813d8599bdb926bd3dfb0704a35665c4 commit bee87a73813d8599bdb926bd3dfb0704a35665c4 Author: Mark Johnston AuthorDate: 2022-04-29 13:18:02 +0000 Commit: Mark Johnston CommitDate: 2022-05-24 13:51:36 +0000 makefs: Fix warnings and reset WARNS to the default Leave -Wcast-align disabled, at least for now, since there are numerous instances of that warning in places where buffer pointers are cast to pointers to various filesystem structures. Fixing this properly would be too much work for too little gain. Sponsored by: The FreeBSD Foundation (cherry picked from commit cc1a53bc1aea0675d64e9547cdca241612906592) --- usr.sbin/makefs/Makefile | 2 +- usr.sbin/makefs/ffs.c | 2 +- usr.sbin/makefs/msdos/msdosfs_denode.c | 10 ++++------ usr.sbin/makefs/msdos/msdosfs_vnops.c | 3 ++- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/usr.sbin/makefs/Makefile b/usr.sbin/makefs/Makefile index cbe4f497d7d1..3fea648f9383 100644 --- a/usr.sbin/makefs/Makefile +++ b/usr.sbin/makefs/Makefile @@ -16,7 +16,7 @@ SRCS= cd9660.c \ walk.c MAN= makefs.8 -WARNS?= 2 +NO_WCAST_ALIGN= CSTD= c11 .include "${SRCDIR}/cd9660/Makefile.inc" diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c index 7916d6a59ead..6429c54e8a9f 100644 --- a/usr.sbin/makefs/ffs.c +++ b/usr.sbin/makefs/ffs.c @@ -578,7 +578,7 @@ ffs_create_image(const char *image, fsinfo_t *fsopts) (long long)fs->fs_cstotal.cs_ndir); } - if (fs->fs_cstotal.cs_nifree + UFS_ROOTINO < fsopts->inodes) { + if (fs->fs_cstotal.cs_nifree + (off_t)UFS_ROOTINO < fsopts->inodes) { warnx( "Image file `%s' has %lld free inodes; %lld are required.", image, diff --git a/usr.sbin/makefs/msdos/msdosfs_denode.c b/usr.sbin/makefs/msdos/msdosfs_denode.c index 7d37c7df3a3d..2c8a443caacf 100644 --- a/usr.sbin/makefs/msdos/msdosfs_denode.c +++ b/usr.sbin/makefs/msdos/msdosfs_denode.c @@ -213,7 +213,6 @@ int detrunc(struct denode *dep, u_long length, int flags, struct ucred *cred) { int error; - int allerror; u_long eofentry; u_long chaintofree; daddr_t bn; @@ -256,7 +255,7 @@ detrunc(struct denode *dep, u_long length, int flags, struct ucred *cred) if (length == 0) { chaintofree = dep->de_StartCluster; dep->de_StartCluster = 0; - eofentry = ~0; + eofentry = ~0ul; } else { error = pcbmap(dep, de_clcount(pmp, length) - 1, 0, &eofentry, 0); @@ -298,14 +297,13 @@ detrunc(struct denode *dep, u_long length, int flags, struct ucred *cred) dep->de_FileSize = length; if (!isadir) dep->de_flag |= DE_UPDATE|DE_MODIFIED; - MSDOSFS_DPRINTF(("detrunc(): allerror %d, eofentry %lu\n", - allerror, eofentry)); + MSDOSFS_DPRINTF(("detrunc(): eofentry %lu\n", eofentry)); /* * If we need to break the cluster chain for the file then do it * now. */ - if (eofentry != ~0) { + if (eofentry != ~0ul) { error = fatentry(FAT_GET_AND_SET, pmp, eofentry, &chaintofree, CLUST_EOFE); if (error) { @@ -324,7 +322,7 @@ detrunc(struct denode *dep, u_long length, int flags, struct ucred *cred) if (chaintofree != 0 && !MSDOSFSEOF(pmp, chaintofree)) freeclusterchain(pmp, chaintofree); - return (allerror); + return (0); } /* diff --git a/usr.sbin/makefs/msdos/msdosfs_vnops.c b/usr.sbin/makefs/msdos/msdosfs_vnops.c index 6f1275ee125d..ff470576ee79 100644 --- a/usr.sbin/makefs/msdos/msdosfs_vnops.c +++ b/usr.sbin/makefs/msdos/msdosfs_vnops.c @@ -538,7 +538,8 @@ static const struct { }; struct denode * -msdosfs_mkdire(const char *path, struct denode *pdep, fsnode *node) { +msdosfs_mkdire(const char *path __unused, struct denode *pdep, fsnode *node) +{ struct denode ndirent; struct denode *dep; struct componentname cn;