From nobody Sun Apr 16 13:30:41 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PzrfV182Fz45MKT; Sun, 16 Apr 2023 13:30:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PzrfT5CRyz3HW5; Sun, 16 Apr 2023 13:30:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681651841; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZyToIuaAWhi4L/vcvbDhP3sfhENcOl1zP4bZJj8oy9I=; b=ILF/RF146Yx2IbykT3bScZSaFNkl2oyKfzEKlrOcIj2OCN0W4IgdpX9asi3AVSleoJehqQ 0Ulj+UFjXkOmD80eSlQAVNBuhTdLIVSThn5YlWBbUu3iaKp5rAgtRfrye1cB+D3TzJC1kK q5MFFIEtwhJy9rtC6hCZSt+dlrIsMmbEaDiM+D5uV3xp9SbB7fG0G+nbqKGSBGdZH0vCmx x79JVkBjlRtdP2MfTJ4waL2FvRsTkw1UD5TQdLhRid9b8Q/CRWy3R2dxAfHscQe6mBe4j4 MpM5yT0ASbnVwInraigabmR5IuGjryVV3yB/0ZtySmbyPX4rU5aAyKMglMmv0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681651841; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZyToIuaAWhi4L/vcvbDhP3sfhENcOl1zP4bZJj8oy9I=; b=ND3ua6ImRnCGZvvA8Q8G1pkudB8B1jqAS54fx6cpCZ4eui/CBxO+3RiJWZWaYOfHk08aKp OOVeZkJ9SAYibr0ruvvnRKO84CWiLJ0pCbmXS/ObL6DgChPoDnZbebQBuRFDb8th/NcaJ/ L9aGzqZvG3/FCHMYPnpIvv1dfSWzctX1e+snkDJcTlAv9MGZFR9XWeAw5KHQIBo9R01cU1 0+F5W0E/OSZcYqYPRrevWctq7YGaljT7rkp+tdQRV5UBmTEipm6LxxzV4WvM0hn0M48eN+ SYpNpgLBqOQ9gxHb5N7UOAv9OzRJCb2JXOH3FQ/OYnBTWvsNrTMH8DivrqapZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681651841; a=rsa-sha256; cv=none; b=fNZSAbr8r5T2CRlqUvKIGVwbDwmKc8NmJ0jcwSzuNEuuMTU62qRIabEfWm9oAkpXH/gWy0 mE4zPYsklr9kZUoLKw8qd0eTrUUfTpkXBUKWRVoGSVvE933K4PyKL5ECQuA8qBISee87Mx qSVz5jRxPWxh+MaBYZuIQNlQn2KETKtLHYBEPQKjcB0QupFsZYMche8QVikZdIn6wDpJAD uU5UkD3Heyg3ZHFT77bODwcFZOoMgqJvokr5TPVg9oucSKSW0CIR3ot/NTcqnB3o92epiY XxZDM0E38Y510qJQzLqBnQn53U2zThL90LsoI7nCOcyo59J07tjOnbYL5d69fA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PzrfT4D5wzpZK; Sun, 16 Apr 2023 13:30:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33GDUfnC078857; Sun, 16 Apr 2023 13:30:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33GDUfQE078856; Sun, 16 Apr 2023 13:30:41 GMT (envelope-from git) Date: Sun, 16 Apr 2023 13:30:41 GMT Message-Id: <202304161330.33GDUfQE078856@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: e0a9723dee9c - stable/13 - fs/cd9660: add header include guards List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e0a9723dee9c1e900047b131c2c30466db4a9c46 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e0a9723dee9c1e900047b131c2c30466db4a9c46 commit e0a9723dee9c1e900047b131c2c30466db4a9c46 Author: Ed Maste AuthorDate: 2023-03-30 16:49:40 +0000 Commit: Ed Maste CommitDate: 2023-04-16 13:28: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 (cherry picked from commit d33cdf16df52050102931ee3b37ce173e449c9c1) --- 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_ */