Module Name: src
Committed By: christos
Date: Fri Sep 17 21:06:35 UTC 2021
Modified Files:
src/usr.sbin/fstyp: exfat.c hfsplus.c
Log Message:
remove lint hacks now that lint supports _Static_assert
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/fstyp/exfat.c
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/fstyp/hfsplus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/fstyp/exfat.c
diff -u src/usr.sbin/fstyp/exfat.c:1.5 src/usr.sbin/fstyp/exfat.c:1.6
--- src/usr.sbin/fstyp/exfat.c:1.5 Fri Sep 17 10:49:03 2021
+++ src/usr.sbin/fstyp/exfat.c Fri Sep 17 17:06:35 2021
@@ -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 <[email protected]>
@@ -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 @@ struct exfat_dirent {
#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 @@ struct exfat_de_label {
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
Index: src/usr.sbin/fstyp/hfsplus.c
diff -u src/usr.sbin/fstyp/hfsplus.c:1.2 src/usr.sbin/fstyp/hfsplus.c:1.3
--- src/usr.sbin/fstyp/hfsplus.c:1.2 Fri Sep 17 10:49:03 2021
+++ src/usr.sbin/fstyp/hfsplus.c Fri Sep 17 17:06:35 2021
@@ -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 <[email protected]>. 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 @@ struct hfsp_vol_hdr {
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)
