Module Name: src
Committed By: rillig
Date: Sun Apr 24 20:32:44 UTC 2022
Modified Files:
src/sys/ufs/lfs: lfs_accessors.h
Log Message:
lfs: fix lint warning about empty declaration
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/ufs/lfs/lfs_accessors.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/lfs/lfs_accessors.h
diff -u src/sys/ufs/lfs/lfs_accessors.h:1.50 src/sys/ufs/lfs/lfs_accessors.h:1.51
--- src/sys/ufs/lfs/lfs_accessors.h:1.50 Mon Sep 7 02:28:12 2020
+++ src/sys/ufs/lfs/lfs_accessors.h Sun Apr 24 20:32:44 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_accessors.h,v 1.50 2020/09/07 02:28:12 riastradh Exp $ */
+/* $NetBSD: lfs_accessors.h,v 1.51 2022/04/24 20:32:44 rillig Exp $ */
/* from NetBSD: lfs.h,v 1.165 2015/07/24 06:59:32 dholland Exp */
/* from NetBSD: dinode.h,v 1.25 2016/01/22 23:06:10 dholland Exp */
@@ -486,24 +486,24 @@ lfs_copy_dinode(STRUCT_LFS *fs,
} \
} \
-LFS_DEF_DINO_ACCESSOR(uint16_t, uint16_t, mode);
-LFS_DEF_DINO_ACCESSOR(int16_t, int16_t, nlink);
-LFS_DEF_DINO_ACCESSOR(uint64_t, uint32_t, inumber);
-LFS_DEF_DINO_ACCESSOR(uint64_t, uint64_t, size);
-LFS_DEF_DINO_ACCESSOR(int64_t, int32_t, atime);
-LFS_DEF_DINO_ACCESSOR(int32_t, int32_t, atimensec);
-LFS_DEF_DINO_ACCESSOR(int64_t, int32_t, mtime);
-LFS_DEF_DINO_ACCESSOR(int32_t, int32_t, mtimensec);
-LFS_DEF_DINO_ACCESSOR(int64_t, int32_t, ctime);
-LFS_DEF_DINO_ACCESSOR(int32_t, int32_t, ctimensec);
-LFS_DEF_DINO_ACCESSOR(uint32_t, uint32_t, flags);
-LFS_DEF_DINO_ACCESSOR(uint64_t, uint32_t, blocks);
-LFS_DEF_DINO_ACCESSOR(int32_t, int32_t, gen);
-LFS_DEF_DINO_ACCESSOR(uint32_t, uint32_t, uid);
-LFS_DEF_DINO_ACCESSOR(uint32_t, uint32_t, gid);
+LFS_DEF_DINO_ACCESSOR(uint16_t, uint16_t, mode)
+LFS_DEF_DINO_ACCESSOR(int16_t, int16_t, nlink)
+LFS_DEF_DINO_ACCESSOR(uint64_t, uint32_t, inumber)
+LFS_DEF_DINO_ACCESSOR(uint64_t, uint64_t, size)
+LFS_DEF_DINO_ACCESSOR(int64_t, int32_t, atime)
+LFS_DEF_DINO_ACCESSOR(int32_t, int32_t, atimensec)
+LFS_DEF_DINO_ACCESSOR(int64_t, int32_t, mtime)
+LFS_DEF_DINO_ACCESSOR(int32_t, int32_t, mtimensec)
+LFS_DEF_DINO_ACCESSOR(int64_t, int32_t, ctime)
+LFS_DEF_DINO_ACCESSOR(int32_t, int32_t, ctimensec)
+LFS_DEF_DINO_ACCESSOR(uint32_t, uint32_t, flags)
+LFS_DEF_DINO_ACCESSOR(uint64_t, uint32_t, blocks)
+LFS_DEF_DINO_ACCESSOR(int32_t, int32_t, gen)
+LFS_DEF_DINO_ACCESSOR(uint32_t, uint32_t, uid)
+LFS_DEF_DINO_ACCESSOR(uint32_t, uint32_t, gid)
/* XXX this should be done differently (it's a fake field) */
-LFS_DEF_DINO_ACCESSOR(int64_t, int32_t, rdev);
+LFS_DEF_DINO_ACCESSOR(int64_t, int32_t, rdev)
static __inline daddr_t
lfs_dino_getdb(STRUCT_LFS *fs, union lfs_dinode *dip, unsigned ix)
@@ -747,10 +747,10 @@ lfs_iblock_set(STRUCT_LFS *fs, void *blo
} \
} \
-LFS_DEF_FI_ACCESSOR(uint32_t, uint32_t, nblocks);
-LFS_DEF_FI_ACCESSOR(uint32_t, uint32_t, version);
-LFS_DEF_FI_ACCESSOR(uint64_t, uint32_t, ino);
-LFS_DEF_FI_ACCESSOR(uint32_t, uint32_t, lastlength);
+LFS_DEF_FI_ACCESSOR(uint32_t, uint32_t, nblocks)
+LFS_DEF_FI_ACCESSOR(uint32_t, uint32_t, version)
+LFS_DEF_FI_ACCESSOR(uint64_t, uint32_t, ino)
+LFS_DEF_FI_ACCESSOR(uint32_t, uint32_t, lastlength)
static __inline daddr_t
lfs_fi_getblock(STRUCT_LFS *fs, FINFO *fip, unsigned idx)
@@ -882,11 +882,11 @@ lfs_ii_setblock(STRUCT_LFS *fs, IINFO *i
} \
} \
-LFS_DEF_IF_ACCESSOR(uint32_t, uint32_t, version);
-LFS_DEF_IF_ACCESSOR(int64_t, int32_t, daddr);
-LFS_DEF_IF_ACCESSOR(uint64_t, uint32_t, nextfree);
-LFS_DEF_IF_ACCESSOR(uint64_t, uint32_t, atime_sec);
-LFS_DEF_IF_ACCESSOR(uint32_t, uint32_t, atime_nsec);
+LFS_DEF_IF_ACCESSOR(uint32_t, uint32_t, version)
+LFS_DEF_IF_ACCESSOR(int64_t, int32_t, daddr)
+LFS_DEF_IF_ACCESSOR(uint64_t, uint32_t, nextfree)
+LFS_DEF_IF_ACCESSOR(uint64_t, uint32_t, atime_sec)
+LFS_DEF_IF_ACCESSOR(uint32_t, uint32_t, atime_nsec)
/*
* Cleaner information structure. This resides in the ifile and is used
@@ -921,13 +921,13 @@ LFS_DEF_IF_ACCESSOR(uint32_t, uint32_t,
} \
} \
-LFS_DEF_CI_ACCESSOR(uint32_t, uint32_t, clean);
-LFS_DEF_CI_ACCESSOR(uint32_t, uint32_t, dirty);
-LFS_DEF_CI_ACCESSOR(int64_t, int32_t, bfree);
-LFS_DEF_CI_ACCESSOR(int64_t, int32_t, avail);
-LFS_DEF_CI_ACCESSOR(uint64_t, uint32_t, free_head);
-LFS_DEF_CI_ACCESSOR(uint64_t, uint32_t, free_tail);
-LFS_DEF_CI_ACCESSOR(uint32_t, uint32_t, flags);
+LFS_DEF_CI_ACCESSOR(uint32_t, uint32_t, clean)
+LFS_DEF_CI_ACCESSOR(uint32_t, uint32_t, dirty)
+LFS_DEF_CI_ACCESSOR(int64_t, int32_t, bfree)
+LFS_DEF_CI_ACCESSOR(int64_t, int32_t, avail)
+LFS_DEF_CI_ACCESSOR(uint64_t, uint32_t, free_head)
+LFS_DEF_CI_ACCESSOR(uint64_t, uint32_t, free_tail)
+LFS_DEF_CI_ACCESSOR(uint32_t, uint32_t, flags)
static __inline void
lfs_ci_shiftcleantodirty(STRUCT_LFS *fs, CLEANERINFO *cip, unsigned num)
@@ -1067,17 +1067,17 @@ segsum_finfobase(STRUCT_LFS *fs, SEGSUM
} \
} \
-LFS_DEF_SS_ACCESSOR(uint32_t, uint32_t, sumsum);
-LFS_DEF_SS_ACCESSOR(uint32_t, uint32_t, datasum);
-LFS_DEF_SS_ACCESSOR(uint32_t, uint32_t, magic);
-LFS_DEF_SS_ACCESSOR(uint32_t, uint32_t, ident);
-LFS_DEF_SS_ACCESSOR(int64_t, int32_t, next);
-LFS_DEF_SS_ACCESSOR(uint16_t, uint16_t, nfinfo);
-LFS_DEF_SS_ACCESSOR(uint16_t, uint16_t, ninos);
-LFS_DEF_SS_ACCESSOR(uint16_t, uint16_t, flags);
-LFS_DEF_SS_ACCESSOR(uint64_t, uint32_t, reclino);
-LFS_DEF_SS_ACCESSOR(uint64_t, uint64_t, serial);
-LFS_DEF_SS_ACCESSOR(uint64_t, uint64_t, create);
+LFS_DEF_SS_ACCESSOR(uint32_t, uint32_t, sumsum)
+LFS_DEF_SS_ACCESSOR(uint32_t, uint32_t, datasum)
+LFS_DEF_SS_ACCESSOR(uint32_t, uint32_t, magic)
+LFS_DEF_SS_ACCESSOR(uint32_t, uint32_t, ident)
+LFS_DEF_SS_ACCESSOR(int64_t, int32_t, next)
+LFS_DEF_SS_ACCESSOR(uint16_t, uint16_t, nfinfo)
+LFS_DEF_SS_ACCESSOR(uint16_t, uint16_t, ninos)
+LFS_DEF_SS_ACCESSOR(uint16_t, uint16_t, flags)
+LFS_DEF_SS_ACCESSOR(uint64_t, uint32_t, reclino)
+LFS_DEF_SS_ACCESSOR(uint64_t, uint64_t, serial)
+LFS_DEF_SS_ACCESSOR(uint64_t, uint64_t, create)
static __inline size_t
lfs_ss_getsumstart(STRUCT_LFS *fs)
@@ -1102,7 +1102,7 @@ lfs_ss_getocreate(STRUCT_LFS *fs, SEGSUM
KASSERT(fs->lfs_is64 == 0);
/* XXX need to resort this file before we can do this */
//KASSERT(lfs_sb_getversion(fs) == 1);
-
+
return ssp->u_v1.ss_create;
}
@@ -1112,7 +1112,7 @@ lfs_ss_setocreate(STRUCT_LFS *fs, SEGSUM
KASSERT(fs->lfs_is64 == 0);
/* XXX need to resort this file before we can do this */
//KASSERT(lfs_sb_getversion(fs) == 1);
-
+
ssp->u_v1.ss_create = val;
}
@@ -1180,63 +1180,63 @@ lfs_ss_setocreate(STRUCT_LFS *fs, SEGSUM
} \
}
-LFS_DEF_SB_ACCESSOR(uint32_t, version);
-LFS_DEF_SB_ACCESSOR_FULL(uint64_t, uint32_t, size);
-LFS_DEF_SB_ACCESSOR(uint32_t, ssize);
-LFS_DEF_SB_ACCESSOR_FULL(uint64_t, uint32_t, dsize);
-LFS_DEF_SB_ACCESSOR(uint32_t, bsize);
-LFS_DEF_SB_ACCESSOR(uint32_t, fsize);
-LFS_DEF_SB_ACCESSOR(uint32_t, frag);
-LFS_DEF_SB_ACCESSOR_FULL(uint64_t, uint32_t, freehd);
-LFS_DEF_SB_ACCESSOR_FULL(int64_t, int32_t, bfree);
-LFS_DEF_SB_ACCESSOR_FULL(uint64_t, uint32_t, nfiles);
-LFS_DEF_SB_ACCESSOR_FULL(int64_t, int32_t, avail);
-LFS_DEF_SB_ACCESSOR(int32_t, uinodes);
-LFS_DEF_SB_ACCESSOR_FULL(int64_t, int32_t, idaddr);
-LFS_DEF_SB_ACCESSOR_32ONLY(uint32_t, ifile, LFS_IFILE_INUM);
-LFS_DEF_SB_ACCESSOR_FULL(int64_t, int32_t, lastseg);
-LFS_DEF_SB_ACCESSOR_FULL(int64_t, int32_t, nextseg);
-LFS_DEF_SB_ACCESSOR_FULL(int64_t, int32_t, curseg);
-LFS_DEF_SB_ACCESSOR_FULL(int64_t, int32_t, offset);
-LFS_DEF_SB_ACCESSOR_FULL(int64_t, int32_t, lastpseg);
-LFS_DEF_SB_ACCESSOR(uint32_t, inopf);
-LFS_DEF_SB_ACCESSOR(uint32_t, minfree);
-LFS_DEF_SB_ACCESSOR(uint64_t, maxfilesize);
-LFS_DEF_SB_ACCESSOR(uint32_t, fsbpseg);
-LFS_DEF_SB_ACCESSOR(uint32_t, inopb);
-LFS_DEF_SB_ACCESSOR(uint32_t, ifpb);
-LFS_DEF_SB_ACCESSOR(uint32_t, sepb);
-LFS_DEF_SB_ACCESSOR(uint32_t, nindir);
-LFS_DEF_SB_ACCESSOR(uint32_t, nseg);
-LFS_DEF_SB_ACCESSOR(uint32_t, nspf);
-LFS_DEF_SB_ACCESSOR(uint32_t, cleansz);
-LFS_DEF_SB_ACCESSOR(uint32_t, segtabsz);
-LFS_DEF_SB_ACCESSOR_32ONLY(uint32_t, segmask, 0);
-LFS_DEF_SB_ACCESSOR_32ONLY(uint32_t, segshift, 0);
-LFS_DEF_SB_ACCESSOR(uint64_t, bmask);
-LFS_DEF_SB_ACCESSOR(uint32_t, bshift);
-LFS_DEF_SB_ACCESSOR(uint64_t, ffmask);
-LFS_DEF_SB_ACCESSOR(uint32_t, ffshift);
-LFS_DEF_SB_ACCESSOR(uint64_t, fbmask);
-LFS_DEF_SB_ACCESSOR(uint32_t, fbshift);
-LFS_DEF_SB_ACCESSOR(uint32_t, blktodb);
-LFS_DEF_SB_ACCESSOR(uint32_t, fsbtodb);
-LFS_DEF_SB_ACCESSOR(uint32_t, sushift);
-LFS_DEF_SB_ACCESSOR(int32_t, maxsymlinklen);
-LFS_DEF_SB_ACCESSOR(uint32_t, cksum);
-LFS_DEF_SB_ACCESSOR(uint16_t, pflags);
-LFS_DEF_SB_ACCESSOR(uint32_t, nclean);
-LFS_DEF_SB_ACCESSOR(int32_t, dmeta);
-LFS_DEF_SB_ACCESSOR(uint32_t, minfreeseg);
-LFS_DEF_SB_ACCESSOR(uint32_t, sumsize);
-LFS_DEF_SB_ACCESSOR(uint64_t, serial);
-LFS_DEF_SB_ACCESSOR(uint32_t, ibsize);
-LFS_DEF_SB_ACCESSOR_FULL(int64_t, int32_t, s0addr);
-LFS_DEF_SB_ACCESSOR(uint64_t, tstamp);
-LFS_DEF_SB_ACCESSOR(uint32_t, inodefmt);
-LFS_DEF_SB_ACCESSOR(uint32_t, interleave);
-LFS_DEF_SB_ACCESSOR(uint32_t, ident);
-LFS_DEF_SB_ACCESSOR(uint32_t, resvseg);
+LFS_DEF_SB_ACCESSOR(uint32_t, version)
+LFS_DEF_SB_ACCESSOR_FULL(uint64_t, uint32_t, size)
+LFS_DEF_SB_ACCESSOR(uint32_t, ssize)
+LFS_DEF_SB_ACCESSOR_FULL(uint64_t, uint32_t, dsize)
+LFS_DEF_SB_ACCESSOR(uint32_t, bsize)
+LFS_DEF_SB_ACCESSOR(uint32_t, fsize)
+LFS_DEF_SB_ACCESSOR(uint32_t, frag)
+LFS_DEF_SB_ACCESSOR_FULL(uint64_t, uint32_t, freehd)
+LFS_DEF_SB_ACCESSOR_FULL(int64_t, int32_t, bfree)
+LFS_DEF_SB_ACCESSOR_FULL(uint64_t, uint32_t, nfiles)
+LFS_DEF_SB_ACCESSOR_FULL(int64_t, int32_t, avail)
+LFS_DEF_SB_ACCESSOR(int32_t, uinodes)
+LFS_DEF_SB_ACCESSOR_FULL(int64_t, int32_t, idaddr)
+LFS_DEF_SB_ACCESSOR_32ONLY(uint32_t, ifile, LFS_IFILE_INUM)
+LFS_DEF_SB_ACCESSOR_FULL(int64_t, int32_t, lastseg)
+LFS_DEF_SB_ACCESSOR_FULL(int64_t, int32_t, nextseg)
+LFS_DEF_SB_ACCESSOR_FULL(int64_t, int32_t, curseg)
+LFS_DEF_SB_ACCESSOR_FULL(int64_t, int32_t, offset)
+LFS_DEF_SB_ACCESSOR_FULL(int64_t, int32_t, lastpseg)
+LFS_DEF_SB_ACCESSOR(uint32_t, inopf)
+LFS_DEF_SB_ACCESSOR(uint32_t, minfree)
+LFS_DEF_SB_ACCESSOR(uint64_t, maxfilesize)
+LFS_DEF_SB_ACCESSOR(uint32_t, fsbpseg)
+LFS_DEF_SB_ACCESSOR(uint32_t, inopb)
+LFS_DEF_SB_ACCESSOR(uint32_t, ifpb)
+LFS_DEF_SB_ACCESSOR(uint32_t, sepb)
+LFS_DEF_SB_ACCESSOR(uint32_t, nindir)
+LFS_DEF_SB_ACCESSOR(uint32_t, nseg)
+LFS_DEF_SB_ACCESSOR(uint32_t, nspf)
+LFS_DEF_SB_ACCESSOR(uint32_t, cleansz)
+LFS_DEF_SB_ACCESSOR(uint32_t, segtabsz)
+LFS_DEF_SB_ACCESSOR_32ONLY(uint32_t, segmask, 0)
+LFS_DEF_SB_ACCESSOR_32ONLY(uint32_t, segshift, 0)
+LFS_DEF_SB_ACCESSOR(uint64_t, bmask)
+LFS_DEF_SB_ACCESSOR(uint32_t, bshift)
+LFS_DEF_SB_ACCESSOR(uint64_t, ffmask)
+LFS_DEF_SB_ACCESSOR(uint32_t, ffshift)
+LFS_DEF_SB_ACCESSOR(uint64_t, fbmask)
+LFS_DEF_SB_ACCESSOR(uint32_t, fbshift)
+LFS_DEF_SB_ACCESSOR(uint32_t, blktodb)
+LFS_DEF_SB_ACCESSOR(uint32_t, fsbtodb)
+LFS_DEF_SB_ACCESSOR(uint32_t, sushift)
+LFS_DEF_SB_ACCESSOR(int32_t, maxsymlinklen)
+LFS_DEF_SB_ACCESSOR(uint32_t, cksum)
+LFS_DEF_SB_ACCESSOR(uint16_t, pflags)
+LFS_DEF_SB_ACCESSOR(uint32_t, nclean)
+LFS_DEF_SB_ACCESSOR(int32_t, dmeta)
+LFS_DEF_SB_ACCESSOR(uint32_t, minfreeseg)
+LFS_DEF_SB_ACCESSOR(uint32_t, sumsize)
+LFS_DEF_SB_ACCESSOR(uint64_t, serial)
+LFS_DEF_SB_ACCESSOR(uint32_t, ibsize)
+LFS_DEF_SB_ACCESSOR_FULL(int64_t, int32_t, s0addr)
+LFS_DEF_SB_ACCESSOR(uint64_t, tstamp)
+LFS_DEF_SB_ACCESSOR(uint32_t, inodefmt)
+LFS_DEF_SB_ACCESSOR(uint32_t, interleave)
+LFS_DEF_SB_ACCESSOR(uint32_t, ident)
+LFS_DEF_SB_ACCESSOR(uint32_t, resvseg)
/* special-case accessors */
