Module Name: src Committed By: christos Date: Thu Dec 1 18:06:09 UTC 2022
Modified Files: src/sys/lib/libsa: ufs.c Log Message: fix clang build To generate a diff of this commit: cvs rdiff -u -r1.87 -r1.88 src/sys/lib/libsa/ufs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/lib/libsa/ufs.c diff -u src/sys/lib/libsa/ufs.c:1.87 src/sys/lib/libsa/ufs.c:1.88 --- src/sys/lib/libsa/ufs.c:1.87 Thu Nov 17 01:40:40 2022 +++ src/sys/lib/libsa/ufs.c Thu Dec 1 13:06:09 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: ufs.c,v 1.87 2022/11/17 06:40:40 chs Exp $ */ +/* $NetBSD: ufs.c,v 1.88 2022/12/01 18:06:09 christos Exp $ */ /*- * Copyright (c) 1993 @@ -218,6 +218,7 @@ ffs_is_magic(FS *fs) return fs->fs_magic == FS_UFS1_MAGIC; } +#ifdef LIBSA_FFS_EI static __inline__ bool ffs_is_magic_swapped(FS *fs) { @@ -225,6 +226,8 @@ ffs_is_magic_swapped(FS *fs) } #endif +#endif + #ifdef LIBSA_FFSv2 static __inline__ bool ffs_is_magic(FS *fs) @@ -232,6 +235,7 @@ ffs_is_magic(FS *fs) return fs->fs_magic == FS_UFS2_MAGIC || fs->fs_magic == FS_UFS2EA_MAGIC; } +#ifdef LIBSA_FFS_EI static __inline__ bool ffs_is_magic_swapped(FS *fs) { @@ -240,6 +244,8 @@ ffs_is_magic_swapped(FS *fs) } #endif +#endif + #ifdef LIBSA_LFS static __inline__ bool ffs_is_magic(FS *fs) @@ -247,6 +253,7 @@ ffs_is_magic(FS *fs) return fs->fs_magic == LFS_MAGIC; } +#ifdef LIBSA_FFS_EI static __inline__ bool ffs_is_magic_swapped(FS *fs) { @@ -254,6 +261,8 @@ ffs_is_magic_swapped(FS *fs) } #endif +#endif + static __inline__ void ffs_fix_magic_swapped(struct file *fp, FS *fs) {