[src/trunk]: src/usr.sbin/fstyp remove lint hacks now that lint supports _Sta...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4eef36ce4287
branches:  trunk
changeset: 986286:4eef36ce4287
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Sep 17 21:06:35 2021 +0000

description:
remove lint hacks now that lint supports _Static_assert

diffstat:

 usr.sbin/fstyp/exfat.c   |  8 ++------
 usr.sbin/fstyp/hfsplus.c |  6 ++----
 2 files changed, 4 insertions(+), 10 deletions(-)

diffs (66 lines):

diff -r 893673e0b471 -r 4eef36ce4287 usr.sbin/fstyp/exfat.c
--- a/usr.sbin/fstyp/exfat.c    Fri Sep 17 21:06:04 2021 +0000
+++ b/usr.sbin/fstyp/exfat.c    Fri Sep 17 21:06:35 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: exfat.c,v 1.5 2021/09/17 14:49:03 christos Exp $       */
+/*     $NetBSD: exfat.c,v 1.6 2021/09/17 21:06:35 christos Exp $       */
 
 /*
  * Copyright (c) 2017 Conrad Meyer <cem%FreeBSD.org@localhost>
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: exfat.c,v 1.5 2021/09/17 14:49:03 christos Exp $");
+__RCSID("$NetBSD: exfat.c,v 1.6 2021/09/17 21:06:35 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/endian.h>
@@ -116,9 +116,7 @@
 #define        xde_set_chksum          u.xde_primary_.xde_set_chksum_
 #define        xde_prim_flags          u.xde_primary_.xde_prim_flags_
 #define        xde_sec_flags           u.xde_secondary_.xde_sec_flags_
-#ifndef __lint__
 _Static_assert(sizeof(struct exfat_dirent) == 32, "spec");
-#endif
 
 struct exfat_de_label {
        uint8_t         xdel_type;      /* XDE_TYPE_VOL_LABEL */
@@ -126,9 +124,7 @@
        uint16_t        xdel_vol_lbl[11];
        uint8_t         xdel_reserved[8];
 } __packed;
-#ifndef __lint__
 _Static_assert(sizeof(struct exfat_de_label) == 32, "spec");
-#endif
 
 #define        MAIN_BOOT_REGION_SECT   0
 #define        BACKUP_BOOT_REGION_SECT 12
diff -r 893673e0b471 -r 4eef36ce4287 usr.sbin/fstyp/hfsplus.c
--- a/usr.sbin/fstyp/hfsplus.c  Fri Sep 17 21:06:04 2021 +0000
+++ b/usr.sbin/fstyp/hfsplus.c  Fri Sep 17 21:06:35 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hfsplus.c,v 1.2 2021/09/17 14:49:03 christos Exp $     */
+/*     $NetBSD: hfsplus.c,v 1.3 2021/09/17 21:06:35 christos Exp $     */
 /*
  * Copyright (c) 2019 Conrad Meyer <cem%FreeBSD.org@localhost>.  All rights reserved.
  *
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: hfsplus.c,v 1.2 2021/09/17 14:49:03 christos Exp $");
+__RCSID("$NetBSD: hfsplus.c,v 1.3 2021/09/17 21:06:35 christos Exp $");
 
 #include <assert.h>
 #include <err.h>
@@ -96,9 +96,7 @@
        hfsp_fork_data  hp_attributesFile;
        hfsp_fork_data  hp_startupFile;
 };
-#ifndef __lint__
 _Static_assert(sizeof(struct hfsp_vol_hdr) == 512, "");
-#endif
 
 int
 fstyp_hfsp(FILE *fp, char *label, size_t size)