Module Name: src
Committed By: christos
Date: Fri Sep 17 14:49:03 UTC 2021
Modified Files:
src/usr.sbin/fstyp: exfat.c hfsplus.c
Log Message:
XXX: Teach lint about _Static_assert...
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/fstyp/exfat.c
cvs rdiff -u -r1.1 -r1.2 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.4 src/usr.sbin/fstyp/exfat.c:1.5
--- src/usr.sbin/fstyp/exfat.c:1.4 Sun Jan 24 09:37:32 2021
+++ src/usr.sbin/fstyp/exfat.c Fri Sep 17 10:49:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: exfat.c,v 1.4 2021/01/24 14:37:32 tkusumi Exp $ */
+/* $NetBSD: exfat.c,v 1.5 2021/09/17 14:49:03 christos Exp $ */
/*
* Copyright (c) 2017 Conrad Meyer <c...@freebsd.org>
@@ -26,7 +26,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: exfat.c,v 1.4 2021/01/24 14:37:32 tkusumi Exp $");
+__RCSID("$NetBSD: exfat.c,v 1.5 2021/09/17 14:49:03 christos Exp $");
#include <sys/param.h>
#include <sys/endian.h>
@@ -116,7 +116,9 @@ 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 */
@@ -124,7 +126,9 @@ 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.1 src/usr.sbin/fstyp/hfsplus.c:1.2
--- src/usr.sbin/fstyp/hfsplus.c:1.1 Fri Dec 27 06:06:23 2019
+++ src/usr.sbin/fstyp/hfsplus.c Fri Sep 17 10:49:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: hfsplus.c,v 1.1 2019/12/27 11:06:23 tkusumi Exp $ */
+/* $NetBSD: hfsplus.c,v 1.2 2021/09/17 14:49:03 christos Exp $ */
/*
* Copyright (c) 2019 Conrad Meyer <c...@freebsd.org>. All rights reserved.
*
@@ -24,7 +24,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: hfsplus.c,v 1.1 2019/12/27 11:06:23 tkusumi Exp $");
+__RCSID("$NetBSD: hfsplus.c,v 1.2 2021/09/17 14:49:03 christos Exp $");
#include <assert.h>
#include <err.h>
@@ -96,7 +96,9 @@ 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)
