From b580147278c56f7a3fa89dbc29715c1aff5a48a9 Mon Sep 17 00:00:00 2001
From: Graham Percival <gperciva@tarsnap.com>
Date: Sun, 6 Apr 2025 14:16:24 -0700
Subject: [PATCH] Fix #endif comments for header guards (#2567)

---
 cpio/cpio_windows.h                     | 2 +-
 libarchive/archive_acl_private.h        | 2 +-
 libarchive/archive_entry_locale.h       | 2 +-
 libarchive/archive_entry_private.h      | 2 +-
 libarchive/archive_hmac_private.h       | 2 +-
 libarchive/archive_pack_dev.h           | 2 +-
 libarchive/archive_platform_acl.h       | 2 +-
 libarchive/archive_platform_xattr.h     | 2 +-
 libarchive/archive_random_private.h     | 2 +-
 libarchive/archive_rb.h                 | 2 +-
 libarchive/archive_string_composition.h | 3 +--
 libarchive/archive_windows.h            | 2 +-
 tar/bsdtar_windows.h                    | 2 +-
 test_utils/test_common.h                | 2 +-
 test_utils/test_utils.h                 | 2 +-
 15 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/cpio/cpio_windows.h b/cpio/cpio_windows.h
index 173a1e5e2..a72b4fb61 100644
--- a/cpio/cpio_windows.h
+++ b/cpio/cpio_windows.h
@@ -52,4 +52,4 @@ extern int utimes(const char *name, const struct __timeval *times);
 #define HAVE_UTIMES 1
 #endif
 
-#endif /* CPIO_WINDOWS_H */
+#endif /* !CPIO_WINDOWS_H */
diff --git a/libarchive/archive_acl_private.h b/libarchive/archive_acl_private.h
index 2c9b50534..54e443969 100644
--- a/libarchive/archive_acl_private.h
+++ b/libarchive/archive_acl_private.h
@@ -80,4 +80,4 @@ int archive_acl_from_text_l(struct archive_acl *, const char * /* text */,
 int archive_acl_from_text_nl(struct archive_acl *, const char * /* text */,
     size_t /* size of text */, int /* type */, struct archive_string_conv *);
 
-#endif /* ARCHIVE_ENTRY_PRIVATE_H_INCLUDED */
+#endif /* !ARCHIVE_ACL_PRIVATE_H_INCLUDED */
diff --git a/libarchive/archive_entry_locale.h b/libarchive/archive_entry_locale.h
index 1b90c57ea..e31a0f2ff 100644
--- a/libarchive/archive_entry_locale.h
+++ b/libarchive/archive_entry_locale.h
@@ -87,4 +87,4 @@ int _archive_entry_copy_symlink_l(struct archive_entry *,
 int _archive_entry_copy_uname_l(struct archive_entry *,
     const char *, size_t, struct archive_string_conv *);
 
-#endif /* ARCHIVE_ENTRY_LOCALE_H_INCLUDED */
+#endif /* !ARCHIVE_ENTRY_LOCALE_H_INCLUDED */
diff --git a/libarchive/archive_entry_private.h b/libarchive/archive_entry_private.h
index 0c1c9fa4b..0eba648d2 100644
--- a/libarchive/archive_entry_private.h
+++ b/libarchive/archive_entry_private.h
@@ -195,4 +195,4 @@ struct archive_entry {
 	int ae_symlink_type;
 };
 
-#endif /* ARCHIVE_ENTRY_PRIVATE_H_INCLUDED */
+#endif /* !ARCHIVE_ENTRY_PRIVATE_H_INCLUDED */
diff --git a/libarchive/archive_hmac_private.h b/libarchive/archive_hmac_private.h
index 1b24ddd1b..36b8e3320 100644
--- a/libarchive/archive_hmac_private.h
+++ b/libarchive/archive_hmac_private.h
@@ -116,4 +116,4 @@ struct archive_hmac {
 };
 
 extern const struct archive_hmac __archive_hmac;
-#endif /* ARCHIVE_HMAC_PRIVATE_H_INCLUDED */
+#endif /* !ARCHIVE_HMAC_PRIVATE_H_INCLUDED */
diff --git a/libarchive/archive_pack_dev.h b/libarchive/archive_pack_dev.h
index eaf23e388..953af21da 100644
--- a/libarchive/archive_pack_dev.h
+++ b/libarchive/archive_pack_dev.h
@@ -46,4 +46,4 @@ pack_t	 pack_native;
 					 (((y) << 12) & 0xfff00000) | \
 					 (((y) <<  0) & 0x000000ff)))
 
-#endif	/* ARCHIVE_PACK_DEV_H */
+#endif	/* !ARCHIVE_PACK_DEV_H */
diff --git a/libarchive/archive_platform_acl.h b/libarchive/archive_platform_acl.h
index 48556f87f..a3599a491 100644
--- a/libarchive/archive_platform_acl.h
+++ b/libarchive/archive_platform_acl.h
@@ -50,4 +50,4 @@
 #define ARCHIVE_ACL_SUPPORT     1
 #endif
 
-#endif	/* ARCHIVE_PLATFORM_ACL_H_INCLUDED */
+#endif	/* !ARCHIVE_PLATFORM_ACL_H_INCLUDED */
diff --git a/libarchive/archive_platform_xattr.h b/libarchive/archive_platform_xattr.h
index 2ae222f61..f427d93b5 100644
--- a/libarchive/archive_platform_xattr.h
+++ b/libarchive/archive_platform_xattr.h
@@ -42,4 +42,4 @@
 #define ARCHIVE_XATTR_SUPPORT     1
 #endif
 
-#endif	/* ARCHIVE_PLATFORM_XATTR_H_INCLUDED */
+#endif	/* !ARCHIVE_PLATFORM_XATTR_H_INCLUDED */
diff --git a/libarchive/archive_random_private.h b/libarchive/archive_random_private.h
index 08b91b3b7..de2396497 100644
--- a/libarchive/archive_random_private.h
+++ b/libarchive/archive_random_private.h
@@ -33,4 +33,4 @@
 /* Random number generator. */
 int archive_random(void *buf, size_t nbytes);
 
-#endif /* ARCHIVE_RANDOM_PRIVATE_H_INCLUDED */
+#endif /* !ARCHIVE_RANDOM_PRIVATE_H_INCLUDED */
diff --git a/libarchive/archive_rb.h b/libarchive/archive_rb.h
index 8851f1081..2fffe796a 100644
--- a/libarchive/archive_rb.h
+++ b/libarchive/archive_rb.h
@@ -110,4 +110,4 @@ struct archive_rb_node *
 	__archive_rb_tree_iterate(struct archive_rb_tree *,
 	struct archive_rb_node *, const unsigned int);
 
-#endif	/* ARCHIVE_RB_H_*/
+#endif	/* !ARCHIVE_RB_H_INCLUDED */
diff --git a/libarchive/archive_string_composition.h b/libarchive/archive_string_composition.h
index e917036f1..7f5b77a1d 100644
--- a/libarchive/archive_string_composition.h
+++ b/libarchive/archive_string_composition.h
@@ -2286,5 +2286,4 @@ static const struct unicode_decomposition_table u_decomposition_table[] = {
 	{ 0x110AB , 0x110A5 , 0x110BA },
 };
 
-#endif /* ARCHIVE_STRING_COMPOSITION_H_INCLUDED */
-
+#endif /* !ARCHIVE_STRING_COMPOSITION_H_INCLUDED */
diff --git a/libarchive/archive_windows.h b/libarchive/archive_windows.h
index 14909da16..4dc8c2b3a 100644
--- a/libarchive/archive_windows.h
+++ b/libarchive/archive_windows.h
@@ -315,4 +315,4 @@ typedef struct _FILE_ALLOCATED_RANGE_BUFFER {
 # endif
 #endif
 
-#endif /* LIBARCHIVE_ARCHIVE_WINDOWS_H_INCLUDED */
+#endif /* !LIBARCHIVE_ARCHIVE_WINDOWS_H_INCLUDED */
diff --git a/tar/bsdtar_windows.h b/tar/bsdtar_windows.h
index 915b22ef9..d18239782 100644
--- a/tar/bsdtar_windows.h
+++ b/tar/bsdtar_windows.h
@@ -43,4 +43,4 @@ int __tar_chdir(const char *);
 
 #endif
 
-#endif /* BSDTAR_WINDOWS_H */
+#endif /* !BSDTAR_WINDOWS_H */
diff --git a/test_utils/test_common.h b/test_utils/test_common.h
index 9a20224a2..064f0a6ec 100644
--- a/test_utils/test_common.h
+++ b/test_utils/test_common.h
@@ -467,4 +467,4 @@ void assertVersion(const char *prog, const char *base);
 
 #include "test_utils.h"
 
-#endif	/* TEST_COMMON_H */
+#endif	/* !TEST_COMMON_H */
diff --git a/test_utils/test_utils.h b/test_utils/test_utils.h
index a398141c6..4b245d5db 100644
--- a/test_utils/test_utils.h
+++ b/test_utils/test_utils.h
@@ -38,4 +38,4 @@ unsigned long bitcrc32(unsigned long, const void*, size_t);
 unsigned short i2le(const void*);
 unsigned int i4le(const void*);
 unsigned long long i8le(const void*);
-#endif /* TEST_UTILS_H */
+#endif /* !TEST_UTILS_H */
-- 
2.47.3