git: 1fcaefce1e19 - stable/15 - tunefs: Don't lower WARNS
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 04 Apr 2026 08:59:27 UTC
The branch stable/15 has been updated by des:
URL: https://cgit.FreeBSD.org/src/commit/?id=1fcaefce1e19615f786f4fbfa0f5b751187f134e
commit 1fcaefce1e19615f786f4fbfa0f5b751187f134e
Author: Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2026-04-02 11:21:59 +0000
Commit: Dag-Erling Smørgrav <des@FreeBSD.org>
CommitDate: 2026-04-04 08:59:14 +0000
tunefs: Don't lower WARNS
Use casts to silence the alignment warnings instead of potentially
suppressing other legitimate warnings.
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D56033
(cherry picked from commit c5e79c7e93dda07c383be9b99a1a91894652f546)
tunefs: Fix alignment warning on arm64
MFC after: 1 week
Fixes: c5e79c7e93dd ("tunefs: Don't lower WARNS")
Reviewed by: bakul
Differential Revision: https://reviews.freebsd.org/D56229
(cherry picked from commit 616f47f176c308a29b1f4a6bba1b1a4dc01c3091)
---
sbin/tunefs/Makefile | 2 --
sbin/tunefs/tunefs.c | 8 ++++----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/sbin/tunefs/Makefile b/sbin/tunefs/Makefile
index 4ea2219c8e03..56238b5ef673 100644
--- a/sbin/tunefs/Makefile
+++ b/sbin/tunefs/Makefile
@@ -3,6 +3,4 @@ PROG= tunefs
LIBADD= ufs util
MAN= tunefs.8
-WARNS?= 3
-
.include <bsd.prog.mk>
diff --git a/sbin/tunefs/tunefs.c b/sbin/tunefs/tunefs.c
index d5ef366e8221..56f343a5a4db 100644
--- a/sbin/tunefs/tunefs.c
+++ b/sbin/tunefs/tunefs.c
@@ -640,7 +640,7 @@ dir_search(ufs2_daddr_t blk, int bytes)
return (-1);
}
for (off = 0; off < bytes; off += dp->d_reclen) {
- dp = (struct direct *)&block[off];
+ dp = (struct direct *)(uintptr_t)&block[off];
if (dp->d_reclen == 0)
break;
if (dp->d_ino == 0)
@@ -705,7 +705,7 @@ dir_clear_block(const char *block, off_t off)
struct direct *dp;
for (; off < sblock.fs_bsize; off += DIRBLKSIZ) {
- dp = (struct direct *)&block[off];
+ dp = (struct direct *)(uintptr_t)&block[off];
dp->d_ino = 0;
dp->d_reclen = DIRBLKSIZ;
dp->d_type = DT_UNKNOWN;
@@ -728,7 +728,7 @@ dir_insert(ufs2_daddr_t blk, off_t off, ino_t ino)
return (-1);
}
bzero(&block[off], sblock.fs_bsize - off);
- dp = (struct direct *)&block[off];
+ dp = (struct direct *)(uintptr_t)&block[off];
dp->d_ino = ino;
dp->d_reclen = DIRBLKSIZ;
dp->d_type = DT_REG;
@@ -855,7 +855,7 @@ indir_fill(ufs2_daddr_t blk, int level, int *resid)
int i;
bzero(indirbuf, sizeof(indirbuf));
- bap1 = (ufs1_daddr_t *)indirbuf;
+ bap1 = (ufs1_daddr_t *)(uintptr_t)indirbuf;
bap2 = (void *)bap1;
cnt = 0;
for (i = 0; i < NINDIR(&sblock) && *resid != 0; i++) {