Consistify: #define gets 1 tab character afterwards

Pointed out by: Simon Nielsen

8 files changed, 60 insertions, 60 deletions

diff --git a/lib/libarchive/archive.h b/lib/libarchive/archive.h
index 791831026778..f0489eb01c72 100644
--- a/lib/libarchive/archive.h
+++ b/lib/libarchive/archive.h
@@ -58,11 +58,11 @@ struct archive_entry;
  * platform-dependent error code.
  */
 /* Unrecognized or invalid file format. */
-/* #define ARCHIVE_ERRNO_FILE_FORMAT */
+/* #define	ARCHIVE_ERRNO_FILE_FORMAT */
 /* Illegal usage of the library. */
-/* #define ARCHIVE_ERRNO_PROGRAMMER_ERROR */
+/* #define	ARCHIVE_ERRNO_PROGRAMMER_ERROR */
 /* Unknown or unclassified error. */
-/* #define ARCHIVE_ERRNO_MISC */
+/* #define	ARCHIVE_ERRNO_MISC */
 
 /*
  * Callbacks are invoked to automatically read/write/open/close the archive.
@@ -96,9 +96,9 @@ typedef int	archive_close_callback(struct archive *, void *_client_data);
 #define	ARCHIVE_FORMAT_BASE_MASK		0xff0000U
 #define	ARCHIVE_FORMAT_CPIO			0x10000
 #define	ARCHIVE_FORMAT_CPIO_POSIX		(ARCHIVE_FORMAT_CPIO | 1)
-#define ARCHIVE_FORMAT_SHAR			0x20000
-#define ARCHIVE_FORMAT_SHAR_BASE		(ARCHIVE_FORMAT_SHAR | 1)
-#define ARCHIVE_FORMAT_SHAR_DUMP		(ARCHIVE_FORMAT_SHAR | 2)
+#define	ARCHIVE_FORMAT_SHAR			0x20000
+#define	ARCHIVE_FORMAT_SHAR_BASE		(ARCHIVE_FORMAT_SHAR | 1)
+#define	ARCHIVE_FORMAT_SHAR_DUMP		(ARCHIVE_FORMAT_SHAR | 2)
 #define	ARCHIVE_FORMAT_TAR			0x30000
 #define	ARCHIVE_FORMAT_TAR_USTAR		(ARCHIVE_FORMAT_TAR | 1)
 #define	ARCHIVE_FORMAT_TAR_PAX_INTERCHANGE	(ARCHIVE_FORMAT_TAR | 2)
diff --git a/lib/libarchive/archive.h.in b/lib/libarchive/archive.h.in
index 791831026778..f0489eb01c72 100644
--- a/lib/libarchive/archive.h.in
+++ b/lib/libarchive/archive.h.in
@@ -58,11 +58,11 @@ struct archive_entry;
  * platform-dependent error code.
  */
 /* Unrecognized or invalid file format. */
-/* #define ARCHIVE_ERRNO_FILE_FORMAT */
+/* #define	ARCHIVE_ERRNO_FILE_FORMAT */
 /* Illegal usage of the library. */
-/* #define ARCHIVE_ERRNO_PROGRAMMER_ERROR */
+/* #define	ARCHIVE_ERRNO_PROGRAMMER_ERROR */
 /* Unknown or unclassified error. */
-/* #define ARCHIVE_ERRNO_MISC */
+/* #define	ARCHIVE_ERRNO_MISC */
 
 /*
  * Callbacks are invoked to automatically read/write/open/close the archive.
@@ -96,9 +96,9 @@ typedef int	archive_close_callback(struct archive *, void *_client_data);
 #define	ARCHIVE_FORMAT_BASE_MASK		0xff0000U
 #define	ARCHIVE_FORMAT_CPIO			0x10000
 #define	ARCHIVE_FORMAT_CPIO_POSIX		(ARCHIVE_FORMAT_CPIO | 1)
-#define ARCHIVE_FORMAT_SHAR			0x20000
-#define ARCHIVE_FORMAT_SHAR_BASE		(ARCHIVE_FORMAT_SHAR | 1)
-#define ARCHIVE_FORMAT_SHAR_DUMP		(ARCHIVE_FORMAT_SHAR | 2)
+#define	ARCHIVE_FORMAT_SHAR			0x20000
+#define	ARCHIVE_FORMAT_SHAR_BASE		(ARCHIVE_FORMAT_SHAR | 1)
+#define	ARCHIVE_FORMAT_SHAR_DUMP		(ARCHIVE_FORMAT_SHAR | 2)
 #define	ARCHIVE_FORMAT_TAR			0x30000
 #define	ARCHIVE_FORMAT_TAR_USTAR		(ARCHIVE_FORMAT_TAR | 1)
 #define	ARCHIVE_FORMAT_TAR_PAX_INTERCHANGE	(ARCHIVE_FORMAT_TAR | 2)
diff --git a/lib/libarchive/archive_entry.c b/lib/libarchive/archive_entry.c
index 71a74f0c0632..89136f7723b3 100644
--- a/lib/libarchive/archive_entry.c
+++ b/lib/libarchive/archive_entry.c
@@ -1341,8 +1341,8 @@ static struct flag {
 #endif
 	{ NULL,		NULL,			0,		0 }
 };
-#define longestflaglen	12
-#define nmappings	(sizeof(mapping) / sizeof(mapping[0]))
+#define	longestflaglen	12
+#define	nmappings	(sizeof(mapping) / sizeof(mapping[0]))
 
 /*
  * fflagstostr --
diff --git a/lib/libarchive/archive_entry.h b/lib/libarchive/archive_entry.h
index 42c1fcae9df1..79054fbbc0db 100644
--- a/lib/libarchive/archive_entry.h
+++ b/lib/libarchive/archive_entry.h
@@ -130,9 +130,9 @@ void	archive_entry_copy_uname_w(struct archive_entry *, const wchar_t *);
  * "permset"/"perm" abstract type nonsense.  A permset is just a simple
  * bitmap, following long-standing Unix tradition.
  */
-#define ARCHIVE_ENTRY_ACL_EXECUTE	1
-#define ARCHIVE_ENTRY_ACL_WRITE		2
-#define ARCHIVE_ENTRY_ACL_READ		4
+#define	ARCHIVE_ENTRY_ACL_EXECUTE	1
+#define	ARCHIVE_ENTRY_ACL_WRITE		2
+#define	ARCHIVE_ENTRY_ACL_READ		4
 
 /* We need to be able to specify either or both of these. */
 #define	ARCHIVE_ENTRY_ACL_TYPE_ACCESS	256
diff --git a/lib/libarchive/archive_platform.h b/lib/libarchive/archive_platform.h
index e2642dc890df..789d19dd72ab 100644
--- a/lib/libarchive/archive_platform.h
+++ b/lib/libarchive/archive_platform.h
@@ -48,24 +48,24 @@
 #include <inttypes.h>  /* For int64_t, etc. */
 
 #if __FreeBSD__ > 4
-#define HAVE_POSIX_ACL 1
+#define	HAVE_POSIX_ACL 1
 #endif
 
-#define HAVE_CHFLAGS 1
-#define HAVE_LUTIMES 1
-#define HAVE_LCHMOD 1
-#define HAVE_STRERROR_R 1
-#define ARCHIVE_ERRNO_FILE_FORMAT EFTYPE
-#define ARCHIVE_ERRNO_PROGRAMMER EINVAL
-#define ARCHIVE_ERRNO_MISC (-1)
+#define	HAVE_CHFLAGS 1
+#define	HAVE_LUTIMES 1
+#define	HAVE_LCHMOD 1
+#define	HAVE_STRERROR_R 1
+#define	ARCHIVE_ERRNO_FILE_FORMAT EFTYPE
+#define	ARCHIVE_ERRNO_PROGRAMMER EINVAL
+#define	ARCHIVE_ERRNO_MISC (-1)
 
 /* Fetch/set high-resolution time data through a struct stat pointer. */
-#define ARCHIVE_STAT_ATIME_NANOS(st)	(st)->st_atimespec.tv_nsec
-#define ARCHIVE_STAT_CTIME_NANOS(st)	(st)->st_ctimespec.tv_nsec
-#define ARCHIVE_STAT_MTIME_NANOS(st)	(st)->st_mtimespec.tv_nsec
-#define ARCHIVE_STAT_SET_ATIME_NANOS(st, n) (st)->st_atimespec.tv_nsec = (n)
-#define ARCHIVE_STAT_SET_CTIME_NANOS(st, n) (st)->st_ctimespec.tv_nsec = (n)
-#define ARCHIVE_STAT_SET_MTIME_NANOS(st, n) (st)->st_mtimespec.tv_nsec = (n)
+#define	ARCHIVE_STAT_ATIME_NANOS(st)	(st)->st_atimespec.tv_nsec
+#define	ARCHIVE_STAT_CTIME_NANOS(st)	(st)->st_ctimespec.tv_nsec
+#define	ARCHIVE_STAT_MTIME_NANOS(st)	(st)->st_mtimespec.tv_nsec
+#define	ARCHIVE_STAT_SET_ATIME_NANOS(st, n) (st)->st_atimespec.tv_nsec = (n)
+#define	ARCHIVE_STAT_SET_CTIME_NANOS(st, n) (st)->st_ctimespec.tv_nsec = (n)
+#define	ARCHIVE_STAT_SET_MTIME_NANOS(st, n) (st)->st_mtimespec.tv_nsec = (n)
 
 /*
  * Older versions of inttypes.h don't have INT64_MAX, etc.  Since
@@ -76,11 +76,11 @@
 #ifndef INT64_MAX
 /* XXX Is this really necessary? XXX */
 #ifdef __i386__
-#define INT64_MAX 0x7fffffffffffffffLL
-#define UINT64_MAX 0xffffffffffffffffULL
+#define	INT64_MAX 0x7fffffffffffffffLL
+#define	UINT64_MAX 0xffffffffffffffffULL
 #else /* __alpha__ */
-#define INT64_MAX 0x7fffffffffffffffL
-#define UINT64_MAX 0xffffffffffffffffUL
+#define	INT64_MAX 0x7fffffffffffffffL
+#define	UINT64_MAX 0xffffffffffffffffUL
 #endif
 #endif /* ! INT64_MAX */
 
@@ -88,35 +88,35 @@
 
 /* No non-FreeBSD platform will have __FBSDID, so just define it here. */
 #ifndef __FreeBSD__
-#define __FBSDID(a)     /* null */
+#define	__FBSDID(a)     /* null */
 #endif
 
 /* Linux */
 #ifdef LINUX
-#define _FILE_OFFSET_BITS	64  /* Needed for 64-bit file size handling. */
+#define	_FILE_OFFSET_BITS	64  /* Needed for 64-bit file size handling. */
 #include <inttypes.h>
-#define ARCHIVE_ERRNO_FILE_FORMAT EILSEQ
-#define ARCHIVE_ERRNO_PROGRAMMER EINVAL
-#define ARCHIVE_ERRNO_MISC (-1)
-#define HAVE_STRERROR_R 1
-#define STRERROR_R_CHAR_P 1
+#define	ARCHIVE_ERRNO_FILE_FORMAT EILSEQ
+#define	ARCHIVE_ERRNO_PROGRAMMER EINVAL
+#define	ARCHIVE_ERRNO_MISC (-1)
+#define	HAVE_STRERROR_R 1
+#define	STRERROR_R_CHAR_P 1
 
 #ifdef HAVE_STRUCT_STAT_TIMESPEC
 /* Fetch the nanosecond portion of the timestamp from a struct stat pointer. */
-#define ARCHIVE_STAT_ATIME_NANOS(pstat)	(pstat)->st_atim.tv_nsec
-#define ARCHIVE_STAT_CTIME_NANOS(pstat)	(pstat)->st_ctim.tv_nsec
-#define ARCHIVE_STAT_MTIME_NANOS(pstat)	(pstat)->st_mtim.tv_nsec
-#define ARCHIVE_STAT_SET_ATIME_NANOS(st, n) (st)->st_atim.tv_nsec = (n)
-#define ARCHIVE_STAT_SET_CTIME_NANOS(st, n) (st)->st_ctim.tv_nsec = (n)
-#define ARCHIVE_STAT_SET_MTIME_NANOS(st, n) (st)->st_mtim.tv_nsec = (n)
+#define	ARCHIVE_STAT_ATIME_NANOS(pstat)	(pstat)->st_atim.tv_nsec
+#define	ARCHIVE_STAT_CTIME_NANOS(pstat)	(pstat)->st_ctim.tv_nsec
+#define	ARCHIVE_STAT_MTIME_NANOS(pstat)	(pstat)->st_mtim.tv_nsec
+#define	ARCHIVE_STAT_SET_ATIME_NANOS(st, n) (st)->st_atim.tv_nsec = (n)
+#define	ARCHIVE_STAT_SET_CTIME_NANOS(st, n) (st)->st_ctim.tv_nsec = (n)
+#define	ARCHIVE_STAT_SET_MTIME_NANOS(st, n) (st)->st_mtim.tv_nsec = (n)
 #else
 /* High-res timestamps aren't available, so just use stubs here. */
-#define ARCHIVE_STAT_ATIME_NANOS(pstat)	0
-#define ARCHIVE_STAT_CTIME_NANOS(pstat)	0
-#define ARCHIVE_STAT_MTIME_NANOS(pstat)	0
-#define ARCHIVE_STAT_SET_ATIME_NANOS(st, n)
-#define ARCHIVE_STAT_SET_CTIME_NANOS(st, n)
-#define ARCHIVE_STAT_SET_MTIME_NANOS(st, n)
+#define	ARCHIVE_STAT_ATIME_NANOS(pstat)	0
+#define	ARCHIVE_STAT_CTIME_NANOS(pstat)	0
+#define	ARCHIVE_STAT_MTIME_NANOS(pstat)	0
+#define	ARCHIVE_STAT_SET_ATIME_NANOS(st, n)
+#define	ARCHIVE_STAT_SET_CTIME_NANOS(st, n)
+#define	ARCHIVE_STAT_SET_MTIME_NANOS(st, n)
 #endif
 
 #endif
diff --git a/lib/libarchive/archive_private.h b/lib/libarchive/archive_private.h
index ab224b7b82ff..f7f4158df7f2 100644
--- a/lib/libarchive/archive_private.h
+++ b/lib/libarchive/archive_private.h
@@ -209,7 +209,7 @@ __archive_write_format_header_ustar(struct archive *, char buff[512],
 #define	ARCHIVE_STATE_NEW	1U
 #define	ARCHIVE_STATE_HEADER	2U
 #define	ARCHIVE_STATE_DATA	4U
-#define ARCHIVE_STATE_EOF	8U
+#define	ARCHIVE_STATE_EOF	8U
 #define	ARCHIVE_STATE_CLOSED	0x10U
 #define	ARCHIVE_STATE_FATAL	0x8000U
 
@@ -231,6 +231,6 @@ int	__archive_read_register_compression(struct archive *a,
 	    int (*bid)(const void *, size_t),
 	    int (*init)(struct archive *, const void *,	size_t));
 
-#define err_combine(a,b)	((a) < (b) ? (a) : (b))
+#define	err_combine(a,b)	((a) < (b) ? (a) : (b))
 
 #endif
diff --git a/lib/libarchive/archive_read_support_format_cpio.c b/lib/libarchive/archive_read_support_format_cpio.c
index bf43ba060e22..830eafb5a4b2 100644
--- a/lib/libarchive/archive_read_support_format_cpio.c
+++ b/lib/libarchive/archive_read_support_format_cpio.c
@@ -94,7 +94,7 @@ struct links_entry {
         char                    *name;
 };
 
-#define CPIO_MAGIC   0x13141516
+#define	CPIO_MAGIC   0x13141516
 struct cpio {
 	int			  magic;
 	int			(*read_header)(struct archive *, struct stat *,
diff --git a/lib/libarchive/archive_string.h b/lib/libarchive/archive_string.h
index 6cbe72229301..1c6e8b17f955 100644
--- a/lib/libarchive/archive_string.h
+++ b/lib/libarchive/archive_string.h
@@ -51,7 +51,7 @@ struct archive_string {
 };
 
 /* Initialize an archive_string object on the stack or elsewhere. */
-#define archive_string_init(a)	\
+#define	archive_string_init(a)	\
 	do { (a)->s = NULL; (a)->length = 0; (a)->buffer_length = 0; } while(0)
 
 /* Append a C char to an archive_string, resizing as necessary. */
@@ -102,11 +102,11 @@ void	__archive_string_free(struct archive_string *);
 /* Like 'vsprintf', but resizes the underlying string as necessary. */
 void	__archive_string_vsprintf(struct archive_string *, const char *,
 	    va_list);
-#define archive_string_vsprintf	__archive_string_vsprintf
+#define	archive_string_vsprintf	__archive_string_vsprintf
 
 /* Like 'sprintf', but resizes the underlying string as necessary. */
 void	__archive_string_sprintf(struct archive_string *, const char *, ...);
-#define archive_string_sprintf	__archive_string_sprintf
+#define	archive_string_sprintf	__archive_string_sprintf
 
 
 #endif