The branch main has been updated by emaste:
URL:
https://cgit.FreeBSD.org/src/commit/?id=d33cdf16df52050102931ee3b37ce173e449c9c1
commit d33cdf16df52050102931ee3b37ce173e449c9c1
Author: Ed Maste <ema...@freebsd.org>
AuthorDate: 2023-03-30 16:49:40 +0000
Commit: Ed Maste <ema...@freebsd.org>
CommitDate: 2023-03-30 23:20:54 +0000
fs/cd9660: add header include guards
Diff reduction against NetBSD files in sys/fs/cd9660/ and OpenBSD files
in usr.sbin/makefs/cd9660/.
Sponsored by: The FreeBSD Foundation
---
sys/fs/cd9660/cd9660_rrip.h | 5 +++++
sys/fs/cd9660/iso.h | 5 +++++
sys/fs/cd9660/iso_rrip.h | 5 +++++
3 files changed, 15 insertions(+)
diff --git a/sys/fs/cd9660/cd9660_rrip.h b/sys/fs/cd9660/cd9660_rrip.h
index 67ec3c233a0c..0c37f204c530 100644
--- a/sys/fs/cd9660/cd9660_rrip.h
+++ b/sys/fs/cd9660/cd9660_rrip.h
@@ -37,6 +37,9 @@
* $FreeBSD$
*/
+#ifndef _ISOFS_CD9660_CD9660_RRIP_H_
+#define _ISOFS_CD9660_CD9660_RRIP_H_
+
typedef struct {
char type [ISODCL ( 0, 1)];
u_char length [ISODCL ( 2, 2)]; /* 711 */
@@ -137,3 +140,5 @@ typedef struct {
u_char offset [ISODCL ( 12, 19)];
u_char length [ISODCL ( 20, 27)];
} ISO_RRIP_CONT;
+
+#endif /* _ISOFS_CD9660_CD9660_RRIP_H_ */
diff --git a/sys/fs/cd9660/iso.h b/sys/fs/cd9660/iso.h
index 591bcc4ff755..325bb97a9551 100644
--- a/sys/fs/cd9660/iso.h
+++ b/sys/fs/cd9660/iso.h
@@ -37,6 +37,9 @@
* $FreeBSD$
*/
+#ifndef _ISOFS_CD9660_ISO_H_
+#define _ISOFS_CD9660_ISO_H_
+
#define ISODCL(from, to) (to - from + 1)
struct iso_volume_descriptor {
@@ -365,3 +368,5 @@ isonum_733(const unsigned char *p)
* Associated files have a leading '='.
*/
#define ASSOCCHAR '='
+
+#endif /* _ISOFS_CD9660_ISO_H_ */
diff --git a/sys/fs/cd9660/iso_rrip.h b/sys/fs/cd9660/iso_rrip.h
index 5ab9103022d1..99c34f971efe 100644
--- a/sys/fs/cd9660/iso_rrip.h
+++ b/sys/fs/cd9660/iso_rrip.h
@@ -37,6 +37,9 @@
* $FreeBSD$
*/
+#ifndef _ISOFS_CD9660_ISO_RRIP_H_
+#define _ISOFS_CD9660_ISO_RRIP_H_
+
/*
* Analyze function flag (similar to RR field bits)
*/
@@ -83,3 +86,5 @@ int cd9660_rrip_getsymname(struct iso_directory_record
*isodir,
int cd9660_rrip_offset(struct iso_directory_record *isodir,
struct iso_mnt *imp);
#endif /* _KERNEL */
+
+#endif /* _ISOFS_CD9660_ISO_RRIP_H_ */
