Style: tab follows #define

SVN-Revision: 2226

diff --git a/tar/bsdtar.c b/tar/bsdtar.c
index 2631cbcd161de5cb25416106b53ebb7a9ba568ed..99bb361f2c9ae43382f02520f575977318676dcf 100644 (file)
--- a/tar/bsdtar.c
+++ b/tar/bsdtar.c
@@ -85,7 +85,7 @@ __FBSDID("$FreeBSD: src/usr.bin/tar/bsdtar.c,v 1.93 2008/11/08 04:43:24 kientzle
 #endif
 #if defined(__APPLE__)
 #undef _PATH_DEFTAPE
-#define _PATH_DEFTAPE "-"  /* Mac OS has no tape support, default to stdio. */
+#define        _PATH_DEFTAPE "-"  /* Mac OS has no tape support, default to stdio. */
 #endif
 
 #ifndef _PATH_DEFTAPE

diff --git a/tar/bsdtar_windows.h b/tar/bsdtar_windows.h
index 092ea6959d837242dd798790ddee0e583b52b9dd..f0611d79abdcd50ee7668624072a343a90c44ed1 100644 (file)
--- a/tar/bsdtar_windows.h
+++ b/tar/bsdtar_windows.h
@@ -26,35 +26,35 @@
  */
 
 #ifndef BSDTAR_WINDOWS_H
-#define BSDTAR_WINDOWS_H 1
+#define        BSDTAR_WINDOWS_H 1
 #include <direct.h>
 #include <windows.h>
 
 #ifndef PRId64
-#define PRId64 "I64"
+#define        PRId64 "I64"
 #endif
-#define geteuid()      0
+#define        geteuid()       0
 
 #ifndef S_IFIFO
-#define S_IFIFO        0010000 /* pipe */
+#define        S_IFIFO 0010000 /* pipe */
 #endif
 
 #include <string.h>  /* Must include before redefining 'strdup' */
 #if !defined(__BORLANDC__)
-#define strdup _strdup
+#define        strdup _strdup
 #endif
 #if !defined(__BORLANDC__)
-#define getcwd _getcwd
+#define        getcwd _getcwd
 #endif
 
-#define chdir __tar_chdir
+#define        chdir __tar_chdir
 int __tar_chdir(const char *);
 
 #ifndef S_ISREG
-#define S_ISREG(a)     (a & _S_IFREG)
+#define        S_ISREG(a)      (a & _S_IFREG)
 #endif
 #ifndef S_ISBLK
-#define S_ISBLK(a)     (0)
+#define        S_ISBLK(a)      (0)
 #endif
 
 #endif /* BSDTAR_WINDOWS_H */

diff --git a/tar/getdate.c b/tar/getdate.c
index ffaa679ba1a33e25602f3014e87f9bd11f12a56f..0e15d9c8a5bed3f8e616e3214455f9c26df78653 100644 (file)
--- a/tar/getdate.c
+++ b/tar/getdate.c
@@ -864,7 +864,7 @@ nexttoken(char **in, time_t *value)
        }
 }
 
-#define TM_YEAR_ORIGIN 1900
+#define        TM_YEAR_ORIGIN 1900
 
 /* Yield A - B, measured in seconds.  */
 static long

diff --git a/tar/read.c b/tar/read.c
index 3d8b347d37e97ff980b5754c0275a04120f785ac..b6b4a7e9f9859d012f29a95faf4d22bf8b2bb8ef 100644 (file)
--- a/tar/read.c
+++ b/tar/read.c
@@ -414,11 +414,11 @@ list_item_verbose(struct bsdtar *bsdtar, FILE *out, struct archive_entry *entry)
 
        /* Format the time using 'ls -l' conventions. */
        tim = archive_entry_mtime(entry);
-#define HALF_YEAR (time_t)365 * 86400 / 2
+#define        HALF_YEAR (time_t)365 * 86400 / 2
 #if defined(_WIN32) && !defined(__CYGWIN__)
-#define DAY_FMT  "%d"  /* Windows' strftime function does not support %e format. */
+#define        DAY_FMT  "%d"  /* Windows' strftime function does not support %e format. */
 #else
-#define DAY_FMT  "%e"  /* Day number without leading zeros */
+#define        DAY_FMT  "%e"  /* Day number without leading zeros */
 #endif
        if (tim < now - HALF_YEAR || tim > now + HALF_YEAR)
                fmt = bsdtar->day_first ? DAY_FMT " %b  %Y" : "%b " DAY_FMT "  %Y";

diff --git a/tar/tree.c b/tar/tree.c
index da8962bc3111be2586d8706352e55ca145f65c2d..422108727d7930aacbd9c4275017974f090e8f84 100644 (file)
--- a/tar/tree.c
+++ b/tar/tree.c
@@ -104,9 +104,9 @@ struct tree_entry {
 /* Definitions for tree_entry.flags bitmap. */
 #define        isDir 1 /* This entry is a regular directory. */
 #define        isDirLink 2 /* This entry is a symbolic link to a directory. */
-#define needsFirstVisit 4 /* This is an initial entry. */
+#define        needsFirstVisit 4 /* This is an initial entry. */
 #define        needsDescent 8 /* This entry needs to be previsited. */
-#define needsOpen 16 /* This is a directory that needs to be opened. */
+#define        needsOpen 16 /* This is a directory that needs to be opened. */
 #define        needsAscent 32 /* This entry needs to be postvisited. */
 
 /*
@@ -125,12 +125,12 @@ struct tree {
 #if defined(HAVE_WINDOWS_H) && !defined(__CYGWIN__)
        HANDLE d;
        BY_HANDLE_FILE_INFORMATION fileInfo;
-#define INVALID_DIR_HANDLE INVALID_HANDLE_VALUE
+#define        INVALID_DIR_HANDLE INVALID_HANDLE_VALUE
        WIN32_FIND_DATA _findData;
        WIN32_FIND_DATA *findData;
 #else
        DIR     *d;
-#define INVALID_DIR_HANDLE NULL
+#define        INVALID_DIR_HANDLE NULL
        struct dirent *de;
 #endif
        int      flags;
@@ -154,8 +154,8 @@ struct tree {
 };
 
 /* Definitions for tree.flags bitmap. */
-#define hasStat 16  /* The st entry is valid. */
-#define hasLstat 32 /* The lst entry is valid. */
+#define        hasStat 16  /* The st entry is valid. */
+#define        hasLstat 32 /* The lst entry is valid. */
 #define        hasFileInfo 64 /* The Windows fileInfo entry is valid. */
 
 #if defined(_WIN32) && !defined(__CYGWIN__)
@@ -168,9 +168,9 @@ tree_dir_next_posix(struct tree *t);
 
 #ifdef HAVE_DIRENT_D_NAMLEN
 /* BSD extension; avoids need for a strlen() call. */
-#define D_NAMELEN(dp)  (dp)->d_namlen
+#define        D_NAMELEN(dp)   (dp)->d_namlen
 #else
-#define D_NAMELEN(dp)  (strlen((dp)->d_name))
+#define        D_NAMELEN(dp)   (strlen((dp)->d_name))
 #endif
 
 #include <stdio.h>
@@ -740,7 +740,7 @@ tree_current_is_physical_link(struct tree *t)
 #if defined(_WIN32) && !defined(__CYGWIN__)
 #ifndef IO_REPARSE_TAG_SYMLINK
 /* Old SDKs do not provide IO_REPARSE_TAG_SYMLINK */
-#define IO_REPARSE_TAG_SYMLINK 0xA000000CL
+#define        IO_REPARSE_TAG_SYMLINK 0xA000000CL
 #endif
        if (t->findData)
                return ((t->findData->dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)

diff --git a/tar/util.c b/tar/util.c
index f7232744ec0b7ef31b55a6588c1adb58858fabee..d5202fee9076934b1469be8dc4c533c5b2d295ca 100644 (file)
--- a/tar/util.c
+++ b/tar/util.c
@@ -56,7 +56,7 @@ __FBSDID("$FreeBSD: src/usr.bin/tar/util.c,v 1.23 2008/12/15 06:00:25 kientzle E
 #include <wctype.h>
 #else
 /* If we don't have wctype, we need to hack up some version of iswprint(). */
-#define iswprint isprint
+#define        iswprint isprint
 #endif
 
 #include "bsdtar.h"
@@ -66,14 +66,14 @@ static size_t       bsdtar_expand_char(char *, size_t, char);
 static const char *strip_components(const char *path, int elements);
 
 #if defined(_WIN32) && !defined(__CYGWIN__)
-#define read _read
+#define        read _read
 #endif
 
 /* TODO:  Hack up a version of mbtowc for platforms with no wide
  * character support at all.  I think the following might suffice,
  * but it needs careful testing.
  * #if !HAVE_MBTOWC
- * #define mbtowc(wcp, p, n) ((*wcp = *p), 1)
+ * #define     mbtowc(wcp, p, n) ((*wcp = *p), 1)
  * #endif
  */
 

diff --git a/tar/write.c b/tar/write.c
index 93f20353296bfb44ebc7d9fcad744b4dcd932f62..ab370385cd5703d8d8b2f89d5519828f014ce2f1 100644 (file)
--- a/tar/write.c
+++ b/tar/write.c
@@ -99,13 +99,13 @@ __FBSDID("$FreeBSD: src/usr.bin/tar/write.c,v 1.79 2008/11/27 05:49:52 kientzle
 #include "tree.h"
 
 /* Size of buffer for holding file data prior to writing. */
-#define FILEDATABUFLEN 65536
+#define        FILEDATABUFLEN  65536
 
 /* Fixed size of uname/gname caches. */
 #define        name_cache_size 101
 
 #ifndef O_BINARY
-#define O_BINARY 0
+#define        O_BINARY 0
 #endif
 
 static const char * const NO_NAME = "(noname)";
@@ -167,10 +167,10 @@ seek_file(int fd, int64_t offset, int whence)
        return (SetFilePointerEx((HANDLE)_get_osfhandle(fd),
                distance, NULL, FILE_BEGIN) ? 1 : -1);
 }
-#define open _open
-#define close _close
-#define read _read
-#define lseek seek_file
+#define        open _open
+#define        close _close
+#define        read _read
+#define        lseek seek_file
 #endif
 
 void