Fix #endif comments for header guards (#2567)

diff --git a/cpio/cpio_windows.h b/cpio/cpio_windows.h
index 173a1e5e2a6cf84b03a1cebe397004f638c3f427..a72b4fb611829c72e0f3ab27787d278c1a74462d 100644 (file)
--- 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 2c9b5053430e4c00d60ddcf99304101251ed8519..54e4439692ed8370b2cc0e8c10ce39753001145c 100644 (file)
--- 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 1b90c57eabf2e3f9c4271e6202bf84f69476ec8d..e31a0f2ff1fa89c23ee36af82c360f8d29716023 100644 (file)
--- 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 0c1c9fa4bb7c6abb9cb6fb1f8ca005b1799df956..0eba648d27f38af848aafff97cf1f0dcc4ea7939 100644 (file)
--- 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 1b24ddd1bc94adb5e3418852449f8a2c956f9c2f..36b8e3320e38af7f8301d8911002d2f936e4ec70 100644 (file)
--- 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 eaf23e3883ef4db480860e73a3a6b74a577ec6c3..953af21da3ee785c5d935077f91bdab14ddb8d5f 100644 (file)
--- 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 48556f87feedd2c0babc200f2dc6ecdad51051e0..a3599a4913337346974c723fab7c0bf174b5c16b 100644 (file)
--- 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 2ae222f61ef8e93553f9bca7dc2aaedd957f4449..f427d93b55e63a714fcd2cd6ff28f57352b78f9e 100644 (file)
--- 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 08b91b3b7a31f2db3b0d1a25f400cfe043df072b..de23964979effdd60405c327504b4ce0a6756853 100644 (file)
--- 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 8851f1081867da25dde9dab14782193eb9667e28..2fffe796ae340da065a717b246c1da04ec61a6ed 100644 (file)
--- 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 e917036f11676101a676dbd1367b0fc66d919cc9..7f5b77a1d8a5ea2a0422b0f728c08d69f1471b1c 100644 (file)
--- 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 14909da1628804c1500638ef89ec71b791bb0cc3..4dc8c2b3ad438d6c87d3fd0481ce26b1e646cbda 100644 (file)
--- 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 915b22ef99fb17c684ecb66c371d7665a99c1c54..d18239782ff4a34db2aca4acb5cc9313aa6cbdc1 100644 (file)
--- 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 9a20224a2065f8b16bc0fa3f15b3c4671d5d1bc7..064f0a6ec241771db803cb85cdb94659f45f5efc 100644 (file)
--- 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 a398141c6f87c18ce2047d9699373e909bc6c71c..4b245d5db243339044cf8ad3a4820e6575f54412 100644 (file)
--- 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 */