Unify header style, header guard comes first

Found by LGTM.com code analysis

diff --git a/cat/bsdcat.h b/cat/bsdcat.h
index 2e055e7c187c8d3e9af4b8499250d8ec9613c7d9..6467d6e3d310d4dc0fd154a404e277e32277c396 100644 (file)
--- a/cat/bsdcat.h
+++ b/cat/bsdcat.h
@@ -23,6 +23,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef BSDCAT_H_INCLUDED
+#define BSDCAT_H_INCLUDED
+
 #if defined(PLATFORM_CONFIG_H)
 /* Use hand-built config.h in environments that need it. */
 #include PLATFORM_CONFIG_H
@@ -54,3 +57,5 @@ void usage(FILE *stream, int eval);
 void bsdcat_next(void);
 void bsdcat_print_error(void);
 void bsdcat_read_to_stdout(const char* filename);
+
+#endif

diff --git a/libarchive/archive_acl_private.h b/libarchive/archive_acl_private.h
index ef0b0234cc1ab6f141ca706821f0a9912a59c9e5..af108162c6649904708adaea4296af1d22f7600c 100644 (file)
--- a/libarchive/archive_acl_private.h
+++ b/libarchive/archive_acl_private.h
@@ -25,13 +25,13 @@
  * $FreeBSD$
  */
 
+#ifndef ARCHIVE_ACL_PRIVATE_H_INCLUDED
+#define ARCHIVE_ACL_PRIVATE_H_INCLUDED
+
 #ifndef __LIBARCHIVE_BUILD
 #error This header is only to be used internally to libarchive.
 #endif
 
-#ifndef ARCHIVE_ACL_PRIVATE_H_INCLUDED
-#define        ARCHIVE_ACL_PRIVATE_H_INCLUDED
-
 #include "archive_string.h"
 
 struct archive_acl_entry {

diff --git a/libarchive/archive_blake2.h b/libarchive/archive_blake2.h
index 337be194654e9a9f0b7d485006c0a40cab9670e2..dd6fe6fe5a986dda7ea8cf5c9ab6eac849bbd9e3 100644 (file)
--- a/libarchive/archive_blake2.h
+++ b/libarchive/archive_blake2.h
@@ -12,8 +12,9 @@
    More information about the BLAKE2 hash function can be found at
    https://blake2.net.
 */
-#ifndef BLAKE2_H
-#define BLAKE2_H
+
+#ifndef ARCHIVE_BLAKE2_H
+#define ARCHIVE_BLAKE2_H
 
 #include <stddef.h>
 #include <stdint.h>

diff --git a/libarchive/archive_blake2_impl.h b/libarchive/archive_blake2_impl.h
index c1df82e0c95dc8e57ee98342f5328ca57407816d..0f05defea36ff96ab1943b09247f8c3f81f0befe 100644 (file)
--- a/libarchive/archive_blake2_impl.h
+++ b/libarchive/archive_blake2_impl.h
@@ -12,8 +12,9 @@
    More information about the BLAKE2 hash function can be found at
    https://blake2.net.
 */
-#ifndef BLAKE2_IMPL_H
-#define BLAKE2_IMPL_H
+
+#ifndef ARCHIVE_BLAKE2_IMPL_H
+#define ARCHIVE_BLAKE2_IMPL_H
 
 #include <stdint.h>
 #include <string.h>

diff --git a/libarchive/archive_cmdline_private.h b/libarchive/archive_cmdline_private.h
index 4e409e814817a189958552411429f1ba459a09f2..57a19494fd7afafca534e181a2d205d2658127a0 100644 (file)
--- a/libarchive/archive_cmdline_private.h
+++ b/libarchive/archive_cmdline_private.h
@@ -25,15 +25,15 @@
  * $FreeBSD$
  */
 
+#ifndef ARCHIVE_CMDLINE_PRIVATE_H
+#define ARCHIVE_CMDLINE_PRIVATE_H
+
 #ifndef __LIBARCHIVE_BUILD
 #ifndef __LIBARCHIVE_TEST
 #error This header is only to be used internally to libarchive.
 #endif
 #endif
 
-#ifndef ARCHIVE_CMDLINE_PRIVATE_H
-#define ARCHIVE_CMDLINE_PRIVATE_H
-
 struct archive_cmdline {
         char            *path;
         char            **argv;

diff --git a/libarchive/archive_crc32.h b/libarchive/archive_crc32.h
index cd633af89b4a5223d080a348985a28700925da15..4f1aed305930b9977370c07dba01b893ebc0a0df 100644 (file)
--- a/libarchive/archive_crc32.h
+++ b/libarchive/archive_crc32.h
@@ -25,6 +25,9 @@
  * $FreeBSD: head/lib/libarchive/archive_crc32.h 201102 2009-12-28 03:11:36Z kientzle $
  */
 
+#ifndef ARCHIVE_CRC32_H
+#define ARCHIVE_CRC32_H
+
 #ifndef __LIBARCHIVE_BUILD
 #error This header is only to be used internally to libarchive.
 #endif
@@ -76,3 +79,5 @@ crc32(unsigned long crc, const void *_p, size_t len)
                crc = crc_tbl[(crc ^ *p++) & 0xff] ^ (crc >> 8);
        return (crc ^ 0xffffffffUL);
 }
+
+#endif

diff --git a/libarchive/archive_cryptor_private.h b/libarchive/archive_cryptor_private.h
index 0063f3e0014953052ed495d48f8c49fbbe05216f..64a20556a3996317500d853c8993a7cafe9a58b6 100644 (file)
--- a/libarchive/archive_cryptor_private.h
+++ b/libarchive/archive_cryptor_private.h
@@ -23,13 +23,12 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#ifndef __LIBARCHIVE_BUILD
-#error This header is only to be used internally to libarchive.
-#endif
-
 #ifndef ARCHIVE_CRYPTOR_PRIVATE_H_INCLUDED
 #define ARCHIVE_CRYPTOR_PRIVATE_H_INCLUDED
 
+#ifndef __LIBARCHIVE_BUILD
+#error This header is only to be used internally to libarchive.
+#endif
 /*
  * On systems that do not support any recognized crypto libraries,
  * the archive_cryptor.c file will normally define no usable symbols.

diff --git a/libarchive/archive_digest_private.h b/libarchive/archive_digest_private.h
index 2685b4a017db586135b7194340b28fd48cbbb230..15312ee9a07a318beeeced967fb875ec5b8382d8 100644 (file)
--- a/libarchive/archive_digest_private.h
+++ b/libarchive/archive_digest_private.h
@@ -24,13 +24,12 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+#ifndef ARCHIVE_DIGEST_PRIVATE_H_INCLUDED
+#define ARCHIVE_DIGEST_PRIVATE_H_INCLUDED
+
 #ifndef __LIBARCHIVE_BUILD
 #error This header is only to be used internally to libarchive.
 #endif
-
-#ifndef ARCHIVE_CRYPTO_PRIVATE_H_INCLUDED
-#define ARCHIVE_CRYPTO_PRIVATE_H_INCLUDED
-
 /*
  * Crypto support in various Operating Systems:
  *

diff --git a/libarchive/archive_endian.h b/libarchive/archive_endian.h
index 1c48563b137d276db9e83859f40e3cf7d040ac1f..e6d3f2ce5e700de4c080a8480e53e7ad47e781d5 100644 (file)
--- a/libarchive/archive_endian.h
+++ b/libarchive/archive_endian.h
@@ -28,16 +28,15 @@
  * Borrowed from FreeBSD's <sys/endian.h>
  */
 
-#ifndef __LIBARCHIVE_BUILD
-#error This header is only to be used internally to libarchive.
-#endif
+#ifndef ARCHIVE_ENDIAN_H_INCLUDED
+#define ARCHIVE_ENDIAN_H_INCLUDED
 
 /* Note:  This is a purely internal header! */
 /* Do not use this outside of libarchive internal code! */
 
-#ifndef ARCHIVE_ENDIAN_H_INCLUDED
-#define ARCHIVE_ENDIAN_H_INCLUDED
-
+#ifndef __LIBARCHIVE_BUILD
+#error This header is only to be used internally to libarchive.
+#endif
 
 /*
  * Disabling inline keyword for compilers known to choke on it:

diff --git a/libarchive/archive_entry_locale.h b/libarchive/archive_entry_locale.h
index 44550c51ec6a0dfce992e1254f70645d30acbab3..803c0368bb6995693e89c3ad13f8bcc9c6d1223e 100644 (file)
--- a/libarchive/archive_entry_locale.h
+++ b/libarchive/archive_entry_locale.h
@@ -25,13 +25,13 @@
  * $FreeBSD$
  */
 
+#ifndef ARCHIVE_ENTRY_LOCALE_H_INCLUDED
+#define ARCHIVE_ENTRY_LOCALE_H_INCLUDED
+
 #ifndef __LIBARCHIVE_BUILD
 #error This header is only to be used internally to libarchive.
 #endif
 
-#ifndef ARCHIVE_ENTRY_LOCALE_H_INCLUDED
-#define        ARCHIVE_ENTRY_LOCALE_H_INCLUDED
-
 struct archive_entry;
 struct archive_string_conv;
 

diff --git a/libarchive/archive_entry_private.h b/libarchive/archive_entry_private.h
index 3d569bbfc6b5492497eea7326174205cb8966f46..2b9a084ca1549cb184d126b6e092e0e44ab53db4 100644 (file)
--- a/libarchive/archive_entry_private.h
+++ b/libarchive/archive_entry_private.h
@@ -25,13 +25,13 @@
  * $FreeBSD: head/lib/libarchive/archive_entry_private.h 201096 2009-12-28 02:41:27Z kientzle $
  */
 
+#ifndef ARCHIVE_ENTRY_PRIVATE_H_INCLUDED
+#define ARCHIVE_ENTRY_PRIVATE_H_INCLUDED
+
 #ifndef __LIBARCHIVE_BUILD
 #error This header is only to be used internally to libarchive.
 #endif
 
-#ifndef ARCHIVE_ENTRY_PRIVATE_H_INCLUDED
-#define        ARCHIVE_ENTRY_PRIVATE_H_INCLUDED
-
 #include "archive_acl_private.h"
 #include "archive_string.h"
 

diff --git a/libarchive/archive_getdate.h b/libarchive/archive_getdate.h
index 666ff5ff78b9ea28a22eab3a83156cc2e7af8ab6..900a8f692e98e73454f1616bf240005f8dd13a28 100644 (file)
--- a/libarchive/archive_getdate.h
+++ b/libarchive/archive_getdate.h
@@ -25,13 +25,13 @@
  * $FreeBSD$
  */
 
+#ifndef ARCHIVE_GETDATE_H_INCLUDED
+#define ARCHIVE_GETDATE_H_INCLUDED
+
 #ifndef __LIBARCHIVE_BUILD
 #error This header is only to be used internally to libarchive.
 #endif
 
-#ifndef ARCHIVE_GETDATE_H_INCLUDED
-#define        ARCHIVE_GETDATE_H_INCLUDED
-
 #include <time.h>
 
 time_t __archive_get_date(time_t now, const char *);

diff --git a/libarchive/archive_hmac_private.h b/libarchive/archive_hmac_private.h
index b7b365c7ad42658ad25883b22ade34600e230af1..13a67d4955a5bd23cf81900dffa28be23ae8ebf3 100644 (file)
--- a/libarchive/archive_hmac_private.h
+++ b/libarchive/archive_hmac_private.h
@@ -23,13 +23,12 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#ifndef __LIBARCHIVE_BUILD
-#error This header is only to be used internally to libarchive.
-#endif
-
 #ifndef ARCHIVE_HMAC_PRIVATE_H_INCLUDED
 #define ARCHIVE_HMAC_PRIVATE_H_INCLUDED
 
+#ifndef __LIBARCHIVE_BUILD
+#error This header is only to be used internally to libarchive.
+#endif
 /*
  * On systems that do not support any recognized crypto libraries,
  * the archive_hmac.c file is expected to define no usable symbols.

diff --git a/libarchive/archive_openssl_evp_private.h b/libarchive/archive_openssl_evp_private.h
index 43a3ccc52a1d7779b1dd78d6c638b91ec4690e3c..ebb06702d0c53d3f147725163288587fac8cc6df 100644 (file)
--- a/libarchive/archive_openssl_evp_private.h
+++ b/libarchive/archive_openssl_evp_private.h
@@ -22,9 +22,14 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 #ifndef ARCHIVE_OPENSSL_EVP_PRIVATE_H_INCLUDED
 #define ARCHIVE_OPENSSL_EVP_PRIVATE_H_INCLUDED
 
+#ifndef __LIBARCHIVE_BUILD
+#error This header is only to be used internally to libarchive.
+#endif
+
 #include <openssl/evp.h>
 #include <openssl/opensslv.h>
 

diff --git a/libarchive/archive_openssl_hmac_private.h b/libarchive/archive_openssl_hmac_private.h
index 921249bb9450f14d35b7dd800a456848de518754..25c8dda654fcb3db0997e409f531bf144c7d3dcc 100644 (file)
--- a/libarchive/archive_openssl_hmac_private.h
+++ b/libarchive/archive_openssl_hmac_private.h
@@ -22,9 +22,14 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 #ifndef ARCHIVE_OPENSSL_HMAC_PRIVATE_H_INCLUDED
 #define ARCHIVE_OPENSSL_HMAC_PRIVATE_H_INCLUDED
 
+#ifndef __LIBARCHIVE_BUILD
+#error This header is only to be used internally to libarchive.
+#endif
+
 #include <openssl/hmac.h>
 #include <openssl/opensslv.h>
 

diff --git a/libarchive/archive_options_private.h b/libarchive/archive_options_private.h
index 6ef0165aff687a16a9c8f7ee5acee8af8d1d36cd..9a7f8080d2f683dff8255ac2fbf2879e74c87984 100644 (file)
--- a/libarchive/archive_options_private.h
+++ b/libarchive/archive_options_private.h
@@ -23,6 +23,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef ARCHIVE_OPTIONS_PRIVATE_H_INCLUDED
+#define ARCHIVE_OPTIONS_PRIVATE_H_INCLUDED
+
 #include "archive_platform.h"
 __FBSDID("$FreeBSD$");
 
@@ -45,3 +48,4 @@ _archive_set_either_option(struct archive *a,
     const char *m, const char *o, const char *v,
     option_handler use_format_option, option_handler use_filter_option);
 
+#endif

diff --git a/libarchive/archive_pack_dev.h b/libarchive/archive_pack_dev.h
index 749fd3d2cb657e1b965801beea115c7c6032d929..eaf23e3883ef4db480860e73a3a6b74a577ec6c3 100644 (file)
--- a/libarchive/archive_pack_dev.h
+++ b/libarchive/archive_pack_dev.h
@@ -31,8 +31,8 @@
 
 /* Originally from NetBSD's mknod(8) source. */
 
-#ifndef        _PACK_DEV_H
-#define        _PACK_DEV_H
+#ifndef        ARCHIVE_PACK_DEV_H
+#define        ARCHIVE_PACK_DEV_H
 
 typedef        dev_t pack_t(int, unsigned long [], const char **);
 
@@ -46,4 +46,4 @@ pack_t         pack_native;
                                         (((y) << 12) & 0xfff00000) | \
                                         (((y) <<  0) & 0x000000ff)))
 
-#endif /* _PACK_DEV_H */
+#endif /* ARCHIVE_PACK_DEV_H */

diff --git a/libarchive/archive_pathmatch.h b/libarchive/archive_pathmatch.h
index e6901774dddbb66bbd310f0d818466f6853477c0..9995142921e5bd2dd28c498073e4d3fa42129ca0 100644 (file)
--- a/libarchive/archive_pathmatch.h
+++ b/libarchive/archive_pathmatch.h
@@ -26,15 +26,15 @@
  * $FreeBSD$
  */
 
+#ifndef ARCHIVE_PATHMATCH_H
+#define ARCHIVE_PATHMATCH_H
+
 #ifndef __LIBARCHIVE_BUILD
 #ifndef __LIBARCHIVE_TEST
 #error This header is only to be used internally to libarchive.
 #endif
 #endif
 
-#ifndef ARCHIVE_PATHMATCH_H
-#define ARCHIVE_PATHMATCH_H
-
 /* Don't anchor at beginning unless the pattern starts with "^" */
 #define PATHMATCH_NO_ANCHOR_START      1
 /* Don't anchor at end unless the pattern ends with "$" */

diff --git a/libarchive/archive_platform_acl.h b/libarchive/archive_platform_acl.h
index 3498f78b3c8577646c617d819aa568dda2ed004f..264e6de375a186e54a4e19033e5e3743bc79f576 100644 (file)
--- a/libarchive/archive_platform_acl.h
+++ b/libarchive/archive_platform_acl.h
@@ -30,6 +30,12 @@
 #ifndef ARCHIVE_PLATFORM_ACL_H_INCLUDED
 #define ARCHIVE_PLATFORM_ACL_H_INCLUDED
 
+#ifndef __LIBARCHIVE_BUILD
+#ifndef __LIBARCHIVE_TEST_COMMON
+#error This header is only to be used internally to libarchive.
+#endif
+#endif
+
 /*
  * Determine what ACL types are supported
  */

diff --git a/libarchive/archive_platform_xattr.h b/libarchive/archive_platform_xattr.h
index 4edfecfdbdf1864dbb487f05ae7038d27fa7d721..ad4b90ab7b2af9e11f5b505bc8f1952b17984a9c 100644 (file)
--- a/libarchive/archive_platform_xattr.h
+++ b/libarchive/archive_platform_xattr.h
@@ -30,6 +30,12 @@
 #ifndef ARCHIVE_PLATFORM_XATTR_H_INCLUDED
 #define ARCHIVE_PLATFORM_XATTR_H_INCLUDED
 
+#ifndef __LIBARCHIVE_BUILD
+#ifndef __LIBARCHIVE_TEST_COMMON
+#error This header is only to be used internally to libarchive.
+#endif
+#endif
+
 /*
  * Determine if we support extended attributes
  */

diff --git a/libarchive/archive_ppmd7_private.h b/libarchive/archive_ppmd7_private.h
index 577d6fb43d0bf4654c1e7feaa6ca6120504e8883..71b954458c65ae322dde87c2e54bff70c113f49e 100644 (file)
--- a/libarchive/archive_ppmd7_private.h
+++ b/libarchive/archive_ppmd7_private.h
@@ -6,13 +6,13 @@ This code is based on PPMd var.H (2001): Dmitry Shkarin : Public domain */
 of RangeCoder from 7z, instead of RangeCoder from original PPMd var.H.
 If you need the compatibility with original PPMd var.H, you can use external RangeDecoder */
 
+#ifndef ARCHIVE_PPMD7_PRIVATE_H_INCLUDED
+#define ARCHIVE_PPMD7_PRIVATE_H_INCLUDED
+
 #ifndef __LIBARCHIVE_BUILD
 #error This header is only to be used internally to libarchive.
 #endif
 
-#ifndef ARCHIVE_PPMD7_PRIVATE_H_INCLUDED
-#define ARCHIVE_PPMD7_PRIVATE_H_INCLUDED
-
 #include "archive_ppmd_private.h"
 
 #define PPMD7_MIN_ORDER 2

diff --git a/libarchive/archive_ppmd8_private.h b/libarchive/archive_ppmd8_private.h
index 534927860ebc2eafa076614a476e051085bc9528..454b75f41f2517578d1eda65f321ffe3a7eb9b6e 100644 (file)
--- a/libarchive/archive_ppmd8_private.h
+++ b/libarchive/archive_ppmd8_private.h
@@ -4,8 +4,8 @@ This code is based on:
   PPMd var.I (2002): Dmitry Shkarin : Public domain
   Carryless rangecoder (1999): Dmitry Subbotin : Public domain */
 
-#ifndef __PPMD8_H
-#define __PPMD8_H
+#ifndef ARCHIVE_PPMD8_PRIVATE_H_INCLUDED
+#define ARCHIVE_PPMD8_PRIVATE_H_INCLUDED
 
 #include "archive_ppmd_private.h"
 

diff --git a/libarchive/archive_ppmd_private.h b/libarchive/archive_ppmd_private.h
index a83b8514d8779d23dd1710271b489af29ae8ccb5..582803e5fd0f77064df9b0be577e12902d049fb5 100644 (file)
--- a/libarchive/archive_ppmd_private.h
+++ b/libarchive/archive_ppmd_private.h
@@ -2,13 +2,13 @@
 2010-03-12 : Igor Pavlov : Public domain
 This code is based on PPMd var.H (2001): Dmitry Shkarin : Public domain */
 
+#ifndef ARCHIVE_PPMD_PRIVATE_H_INCLUDED
+#define ARCHIVE_PPMD_PRIVATE_H_INCLUDED
+
 #ifndef __LIBARCHIVE_BUILD
 #error This header is only to be used internally to libarchive.
 #endif
 
-#ifndef ARCHIVE_PPMD_PRIVATE_H_INCLUDED
-#define ARCHIVE_PPMD_PRIVATE_H_INCLUDED
-
 #include <stddef.h>
 
 #include "archive_read_private.h"

diff --git a/libarchive/archive_private.h b/libarchive/archive_private.h
index 4b4be9796dfc55c2ffbe821c363b50493dcaf0fb..3a43036f675e13128b2770034f6060da9655e4fb 100644 (file)
--- a/libarchive/archive_private.h
+++ b/libarchive/archive_private.h
@@ -25,13 +25,13 @@
  * $FreeBSD: head/lib/libarchive/archive_private.h 201098 2009-12-28 02:58:14Z kientzle $
  */
 
+#ifndef ARCHIVE_PRIVATE_H_INCLUDED
+#define ARCHIVE_PRIVATE_H_INCLUDED
+
 #ifndef __LIBARCHIVE_BUILD
 #error This header is only to be used internally to libarchive.
 #endif
 
-#ifndef ARCHIVE_PRIVATE_H_INCLUDED
-#define        ARCHIVE_PRIVATE_H_INCLUDED
-
 #if HAVE_ICONV_H
 #include <iconv.h>
 #endif

diff --git a/libarchive/archive_random_private.h b/libarchive/archive_random_private.h
index c414779f8d4433de120606d917432e04f26dbcdf..08b91b3b7a31f2db3b0d1a25f400cfe043df072b 100644 (file)
--- a/libarchive/archive_random_private.h
+++ b/libarchive/archive_random_private.h
@@ -23,13 +23,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef ARCHIVE_RANDOM_PRIVATE_H_INCLUDED
+#define ARCHIVE_RANDOM_PRIVATE_H_INCLUDED
+
 #ifndef __LIBARCHIVE_BUILD
 #error This header is only to be used internally to libarchive.
 #endif
 
-#ifndef ARCHIVE_RANDOM_PRIVATE_H_INCLUDED
-#define ARCHIVE_RANDOM_PRIVATE_H_INCLUDED
-
 /* Random number generator. */
 int archive_random(void *buf, size_t nbytes);
 

diff --git a/libarchive/archive_rb.h b/libarchive/archive_rb.h
index 4562e9ebc41b1f49b868236b3584d1a216055001..c6d11468d628f14c46f518a79890c9400274fe3e 100644 (file)
--- a/libarchive/archive_rb.h
+++ b/libarchive/archive_rb.h
@@ -28,8 +28,9 @@
  *
  * Based on NetBSD: rb.h,v 1.13 2009/08/16 10:57:01 yamt Exp
  */
-#ifndef ARCHIVE_RB_H_
-#define        ARCHIVE_RB_H_
+
+#ifndef ARCHIVE_RB_H_INCLUDED
+#define        ARCHIVE_RB_H_INCLUDED
 
 struct archive_rb_node {
        struct archive_rb_node *rb_nodes[2];

diff --git a/libarchive/archive_read_disk_private.h b/libarchive/archive_read_disk_private.h
index f03a0a9cc30fd3010cba1071260524177fadf750..bc8abc15d15caa80cfb7ddbf73865dbde29146f1 100644 (file)
--- a/libarchive/archive_read_disk_private.h
+++ b/libarchive/archive_read_disk_private.h
@@ -26,13 +26,13 @@
  * $FreeBSD: head/lib/libarchive/archive_read_disk_private.h 201105 2009-12-28 03:20:54Z kientzle $
  */
 
+#ifndef ARCHIVE_READ_DISK_PRIVATE_H_INCLUDED
+#define ARCHIVE_READ_DISK_PRIVATE_H_INCLUDED
+
 #ifndef __LIBARCHIVE_BUILD
 #error This header is only to be used internally to libarchive.
 #endif
 
-#ifndef ARCHIVE_READ_DISK_PRIVATE_H_INCLUDED
-#define ARCHIVE_READ_DISK_PRIVATE_H_INCLUDED
-
 #include "archive_platform_acl.h"
 
 struct tree;

diff --git a/libarchive/archive_read_private.h b/libarchive/archive_read_private.h
index bf04f6410438499cc094420adeec2b529685328b..c842e6f09ad8c5e64b8cb3e0a70eb46d7f8b4005 100644 (file)
--- a/libarchive/archive_read_private.h
+++ b/libarchive/archive_read_private.h
@@ -25,15 +25,15 @@
  * $FreeBSD: head/lib/libarchive/archive_read_private.h 201088 2009-12-28 02:18:55Z kientzle $
  */
 
+#ifndef ARCHIVE_READ_PRIVATE_H_INCLUDED
+#define ARCHIVE_READ_PRIVATE_H_INCLUDED
+
 #ifndef __LIBARCHIVE_BUILD
 #ifndef __LIBARCHIVE_TEST
 #error This header is only to be used internally to libarchive.
 #endif
 #endif
 
-#ifndef ARCHIVE_READ_PRIVATE_H_INCLUDED
-#define        ARCHIVE_READ_PRIVATE_H_INCLUDED
-
 #include "archive.h"
 #include "archive_string.h"
 #include "archive_private.h"

diff --git a/libarchive/archive_string.h b/libarchive/archive_string.h
index 56dfbb28f28721cb172df5ef3d8f8285a24ee30a..27e1ad69c56ef40ce3698a2a3570a70d8cfba84a 100644 (file)
--- a/libarchive/archive_string.h
+++ b/libarchive/archive_string.h
@@ -26,15 +26,15 @@
  *
  */
 
+#ifndef ARCHIVE_STRING_H_INCLUDED
+#define ARCHIVE_STRING_H_INCLUDED
+
 #ifndef __LIBARCHIVE_BUILD
 #ifndef __LIBARCHIVE_TEST
 #error This header is only to be used internally to libarchive.
 #endif
 #endif
 
-#ifndef ARCHIVE_STRING_H_INCLUDED
-#define        ARCHIVE_STRING_H_INCLUDED
-
 #include <stdarg.h>
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>  /* required for wchar_t on some systems */

diff --git a/libarchive/archive_string_composition.h b/libarchive/archive_string_composition.h
index 8902ac1f7f30f015cecd1f26663f75ee85e688e4..d0ac340961a0a892fb9271ab0f48100515aeb6a9 100644 (file)
--- a/libarchive/archive_string_composition.h
+++ b/libarchive/archive_string_composition.h
@@ -34,13 +34,13 @@
  *  See also http://unicode.org/report/tr15/
  */
 
+#ifndef ARCHIVE_STRING_COMPOSITION_H_INCLUDED
+#define ARCHIVE_STRING_COMPOSITION_H_INCLUDED
+
 #ifndef __LIBARCHIVE_BUILD
 #error This header is only to be used internally to libarchive.
 #endif
 
-#ifndef ARCHIVE_STRING_COMPOSITION_H_INCLUDED
-#define ARCHIVE_STRING_COMPOSITION_H_INCLUDED
-
 struct unicode_composition_table {
        uint32_t cp1;
        uint32_t cp2;

diff --git a/libarchive/archive_windows.h b/libarchive/archive_windows.h
index 87d8c891bb0b2ed30bdb25c92b134e9e013753c0..47b7cb8e379f9ae4f6ac2a54a87b64c1f4698da7 100644 (file)
--- a/libarchive/archive_windows.h
+++ b/libarchive/archive_windows.h
@@ -27,10 +27,6 @@
  * $FreeBSD$
  */
 
-#ifndef __LIBARCHIVE_BUILD
-#error This header is only to be used internally to libarchive.
-#endif
-
 /*
  * TODO: A lot of stuff in here isn't actually used by libarchive and
  * can be trimmed out.  Note that this file is used by libarchive and
@@ -48,6 +44,10 @@
 #ifndef LIBARCHIVE_ARCHIVE_WINDOWS_H_INCLUDED
 #define        LIBARCHIVE_ARCHIVE_WINDOWS_H_INCLUDED
 
+#ifndef __LIBARCHIVE_BUILD
+#error This header is only to be used internally to libarchive.
+#endif
+
 /* Start of configuration for native Win32  */
 #ifndef MINGW_HAS_SECURE_API
 #define MINGW_HAS_SECURE_API 1

diff --git a/libarchive/archive_write_disk_private.h b/libarchive/archive_write_disk_private.h
index b655dea2b659b832426cc8e226fe784b9476b66e..557d7e2bf34fc02a3975fc12f363b30c24a63d5b 100644 (file)
--- a/libarchive/archive_write_disk_private.h
+++ b/libarchive/archive_write_disk_private.h
@@ -26,13 +26,13 @@
  * $FreeBSD: head/lib/libarchive/archive_write_disk_private.h 201086 2009-12-28 02:17:53Z kientzle $
  */
 
+#ifndef ARCHIVE_WRITE_DISK_PRIVATE_H_INCLUDED
+#define ARCHIVE_WRITE_DISK_PRIVATE_H_INCLUDED
+
 #ifndef __LIBARCHIVE_BUILD
 #error This header is only to be used internally to libarchive.
 #endif
 
-#ifndef ARCHIVE_WRITE_DISK_PRIVATE_H_INCLUDED
-#define ARCHIVE_WRITE_DISK_PRIVATE_H_INCLUDED
-
 #include "archive_platform_acl.h"
 #include "archive_acl_private.h"
 #include "archive_entry.h"

diff --git a/libarchive/archive_write_private.h b/libarchive/archive_write_private.h
index 1c182f13680179282f11f597efc5a37623ae9386..27cba0392ce1fa5746c8c95bebe211e5ca1ba317 100644 (file)
--- a/libarchive/archive_write_private.h
+++ b/libarchive/archive_write_private.h
@@ -25,15 +25,15 @@
  * $FreeBSD: head/lib/libarchive/archive_write_private.h 201155 2009-12-29 05:20:12Z kientzle $
  */
 
+#ifndef ARCHIVE_WRITE_PRIVATE_H_INCLUDED
+#define ARCHIVE_WRITE_PRIVATE_H_INCLUDED
+
 #ifndef __LIBARCHIVE_BUILD
 #ifndef __LIBARCHIVE_TEST
 #error This header is only to be used internally to libarchive.
 #endif
 #endif
 
-#ifndef ARCHIVE_WRITE_PRIVATE_H_INCLUDED
-#define        ARCHIVE_WRITE_PRIVATE_H_INCLUDED
-
 #include "archive.h"
 #include "archive_string.h"
 #include "archive_private.h"

diff --git a/libarchive/archive_xxhash.h b/libarchive/archive_xxhash.h
index 427241641a02b5a907602d8fd6ea4e4647d3c931..1c7131ca1e7d7eb1b26da2d6bec35f0c20fbd46a 100644 (file)
--- a/libarchive/archive_xxhash.h
+++ b/libarchive/archive_xxhash.h
@@ -24,12 +24,13 @@
  *
  */
 
+#ifndef ARCHIVE_XXHASH_H_INCLUDED
+#define ARCHIVE_XXHASH_H_INCLUDED
+
 #ifndef __LIBARCHIVE_BUILD
 #error This header is only to be used internally to libarchive.
 #endif
 
-#ifndef ARCHIVE_XXHASH_H
-#define ARCHIVE_XXHASH_H
 
 typedef enum { XXH_OK=0, XXH_ERROR } XXH_errorcode;
 

diff --git a/libarchive/filter_fork.h b/libarchive/filter_fork.h
index a28272bee33b62d9c8d1fafa8d427689fa21552a..908e7cdd4ddda83085fb59cb68f251697873d108 100644 (file)
--- a/libarchive/filter_fork.h
+++ b/libarchive/filter_fork.h
@@ -25,13 +25,13 @@
  * $FreeBSD: head/lib/libarchive/filter_fork.h 201087 2009-12-28 02:18:26Z kientzle $
  */
 
+#ifndef FILTER_FORK_H
+#define FILTER_FORK_H
+
 #ifndef __LIBARCHIVE_BUILD
 #error This header is only to be used internally to libarchive.
 #endif
 
-#ifndef FILTER_FORK_H
-#define FILTER_FORK_H
-
 pid_t
 __archive_create_child(const char *cmd, int *child_stdin, int *child_stdout);
 

diff --git a/tar/bsdtar.h b/tar/bsdtar.h
index c61d568fd7483488331eafd00c67d600c6a8d5d5..c9206dfd52082492af83b0f02b1249af5eba6800 100644 (file)
--- a/tar/bsdtar.h
+++ b/tar/bsdtar.h
@@ -25,6 +25,9 @@
  * $FreeBSD: src/usr.bin/tar/bsdtar.h,v 1.37 2008/12/06 07:37:14 kientzle Exp $
  */
 
+#ifndef BSDTAR_H_INCLUDED
+#define BSDTAR_H_INCLUDED
+
 #include "bsdtar_platform.h"
 #include <stdio.h>
 
@@ -224,3 +227,5 @@ const char * passphrase_callback(struct archive *, void *);
 void        passphrase_free(char *);
 void   list_item_verbose(struct bsdtar *, FILE *,
                    struct archive_entry *);
+
+#endif

diff --git a/test_utils/test_common.h b/test_utils/test_common.h
index 7538d8cb7b5a24d3b9c27cd2245a264d035d9b27..e12c152c0cb5dc6f73acc688e1d619eca3900576 100644 (file)
--- a/test_utils/test_common.h
+++ b/test_utils/test_common.h
@@ -132,6 +132,10 @@
 #define        O_BINARY 0
 #endif
 
+#ifndef __LIBARCHIVE_TEST_COMMON
+#define __LIBARCHIVE_TEST_COMMON
+#endif
+
 #include "archive_platform_acl.h"
 #define        ARCHIVE_TEST_ACL_TYPE_POSIX1E   1
 #define        ARCHIVE_TEST_ACL_TYPE_NFS4      2