Re-pgindent src/bin/pg_dump/*

Cleanup for recent patches --- it's not much change, but I got annoyed
while re-indenting the view-rule fix I'm working on.

diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index b938d79ef6d1171b70d7c6f3b197db1fdccd58cf..1fc7f10b2d29def4c6e0fed7dbc747887d791630 100644 (file)
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -2108,7 +2108,9 @@ _discoverArchiveFormat(ArchiveHandle *AH)
    if (strncmp(sig, "PGDMP", 5) == 0)
    {
        int         byteread;
-       char        vmaj, vmin, vrev;
+       char        vmaj,
+                   vmin,
+                   vrev;
 
        /*
         * Finish reading (most of) a custom-format header.
@@ -3563,7 +3565,9 @@ ReadHead(ArchiveHandle *AH)
     */
    if (!AH->readHeader)
    {
-       char        vmaj, vmin, vrev;
+       char        vmaj,
+                   vmin,
+                   vrev;
 
        (*AH->ReadBufPtr) (AH, tmpMag, 5);
 

diff --git a/src/bin/pg_dump/pg_backup_archiver.h b/src/bin/pg_dump/pg_backup_archiver.h
index 50cf452411e5c6e0096cf3aa82827af3a10a2439..a44e16ee45a787e573dfc52baf68520ebae22d08 100644 (file)
--- a/src/bin/pg_dump/pg_backup_archiver.h
+++ b/src/bin/pg_dump/pg_backup_archiver.h
@@ -71,28 +71,33 @@ typedef z_stream *z_streamp;
 
 #define ARCHIVE_MAJOR(version) (((version) >> 16) & 255)
 #define ARCHIVE_MINOR(version) (((version) >>  8) & 255)
-#define ARCHIVE_REV(version)   (((version)      ) & 255)
+#define ARCHIVE_REV(version)   (((version)     ) & 255)
 
 /* Historical version numbers (checked in code) */
 #define K_VERS_1_0 MAKE_ARCHIVE_VERSION(1, 0, 0)
-#define K_VERS_1_2 MAKE_ARCHIVE_VERSION(1, 2, 0)   /* Allow No ZLIB */
-#define K_VERS_1_3 MAKE_ARCHIVE_VERSION(1, 3, 0)   /* BLOBs */
-#define K_VERS_1_4 MAKE_ARCHIVE_VERSION(1, 4, 0)   /* Date & name in header */
-#define K_VERS_1_5 MAKE_ARCHIVE_VERSION(1, 5, 0)   /* Handle dependencies */
-#define K_VERS_1_6 MAKE_ARCHIVE_VERSION(1, 6, 0)   /* Schema field in TOCs */
-#define K_VERS_1_7 MAKE_ARCHIVE_VERSION(1, 7, 0)   /* File Offset size in header */
-#define K_VERS_1_8 MAKE_ARCHIVE_VERSION(1, 8, 0)   /* change interpretation of ID
-                                                      numbers and dependencies */
-#define K_VERS_1_9 MAKE_ARCHIVE_VERSION(1, 9, 0)   /* add default_with_oids tracking */
-#define K_VERS_1_10    MAKE_ARCHIVE_VERSION(1, 10, 0)  /* add tablespace */
-#define K_VERS_1_11    MAKE_ARCHIVE_VERSION(1, 11, 0)  /* add toc section indicator */
-#define K_VERS_1_12    MAKE_ARCHIVE_VERSION(1, 12, 0)  /* add separate BLOB entries */
+#define K_VERS_1_2 MAKE_ARCHIVE_VERSION(1, 2, 0)       /* Allow No ZLIB */
+#define K_VERS_1_3 MAKE_ARCHIVE_VERSION(1, 3, 0)       /* BLOBs */
+#define K_VERS_1_4 MAKE_ARCHIVE_VERSION(1, 4, 0)       /* Date & name in header */
+#define K_VERS_1_5 MAKE_ARCHIVE_VERSION(1, 5, 0)       /* Handle dependencies */
+#define K_VERS_1_6 MAKE_ARCHIVE_VERSION(1, 6, 0)       /* Schema field in TOCs */
+#define K_VERS_1_7 MAKE_ARCHIVE_VERSION(1, 7, 0)       /* File Offset size in
+                                                        * header */
+#define K_VERS_1_8 MAKE_ARCHIVE_VERSION(1, 8, 0)       /* change interpretation
+                                                        * of ID numbers and
+                                                        * dependencies */
+#define K_VERS_1_9 MAKE_ARCHIVE_VERSION(1, 9, 0)       /* add default_with_oids
+                                                        * tracking */
+#define K_VERS_1_10 MAKE_ARCHIVE_VERSION(1, 10, 0)     /* add tablespace */
+#define K_VERS_1_11 MAKE_ARCHIVE_VERSION(1, 11, 0)     /* add toc section
+                                                        * indicator */
+#define K_VERS_1_12 MAKE_ARCHIVE_VERSION(1, 12, 0)     /* add separate BLOB
+                                                        * entries */
 
 /* Current archive version number (the format we can output) */
 #define K_VERS_MAJOR 1
 #define K_VERS_MINOR 12
 #define K_VERS_REV 0
-#define K_VERS_SELF    MAKE_ARCHIVE_VERSION(K_VERS_MAJOR, K_VERS_MINOR, K_VERS_REV);
+#define K_VERS_SELF MAKE_ARCHIVE_VERSION(K_VERS_MAJOR, K_VERS_MINOR, K_VERS_REV);
 
 /* Newest format we can read */
 #define K_VERS_MAX MAKE_ARCHIVE_VERSION(K_VERS_MAJOR, K_VERS_MINOR, 255)

diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index ee1f673457fb70673973ad180e82786a1bd5c721..bce26811739bda2b2d0743be521b145641276911 100644 (file)
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -546,9 +546,11 @@ main(int argc, char **argv)
    if (dopt.column_inserts)
        dopt.dump_inserts = 1;
 
-   /* Binary upgrade mode implies dumping sequence data even in schema-only
+   /*
+    * Binary upgrade mode implies dumping sequence data even in schema-only
     * mode.  This is not exposed as a separate option, but kept separate
-    * internally for clarity. */
+    * internally for clarity.
+    */
    if (dopt.binary_upgrade)
        dopt.sequence_data = 1;