Fix small problem Tom Lane found with pgindent run.

diff --git a/contrib/pgcrypto/crypt-des.c b/contrib/pgcrypto/crypt-des.c
index bc403b2ec3077813a5b5b9fded5c1ec93ac51636..ddfabe14b67f8f455a9839e640db2573ba74fc1f 100644 (file)
--- a/contrib/pgcrypto/crypt-des.c
+++ b/contrib/pgcrypto/crypt-des.c
@@ -160,13 +160,13 @@ static uint8 pbox[32] = {
 static uint32 _crypt_bits32[32] =
 {
        0x80000000, 0x40000000, 0x20000000, 0x10000000,
-               0x08000000, 0x04000000, 0x02000000, 0x01000000,
-               0x00800000, 0x00400000, 0x00200000, 0x00100000,
-               0x00080000, 0x00040000, 0x00020000, 0x00010000,
-               0x00008000, 0x00004000, 0x00002000, 0x00001000,
-               0x00000800, 0x00000400, 0x00000200, 0x00000100,
-               0x00000080, 0x00000040, 0x00000020, 0x00000010,
-               0x00000008, 0x00000004, 0x00000002, 0x00000001
+       0x08000000, 0x04000000, 0x02000000, 0x01000000,
+       0x00800000, 0x00400000, 0x00200000, 0x00100000,
+       0x00080000, 0x00040000, 0x00020000, 0x00010000,
+       0x00008000, 0x00004000, 0x00002000, 0x00001000,
+       0x00000800, 0x00000400, 0x00000200, 0x00000100,
+       0x00000080, 0x00000040, 0x00000020, 0x00000010,
+       0x00000008, 0x00000004, 0x00000002, 0x00000001
 };
 
 static uint8 _crypt_bits8[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01};

diff --git a/src/backend/optimizer/path/_deadcode/predmig.c b/src/backend/optimizer/path/_deadcode/predmig.c
index 00c353633d7260d77d8c0fba29bc2c61925c9ff8..667ac835f2114d8591e4c49cde6ac97e6069ebba 100644 (file)
--- a/src/backend/optimizer/path/_deadcode/predmig.c
+++ b/src/backend/optimizer/path/_deadcode/predmig.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/predmig.c,v 1.12 2001/10/28 06:25:44 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/predmig.c,v 1.13 2001/10/30 05:38:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -484,7 +484,7 @@ xfunc_form_groups(Query *queryInfo, Stream root, Stream bottom)
 }
 
 
-/* -------------------                                                                  UTILITY FUNCTIONS         ------------------------- */
+/* -------------------                                                                    UTILITY FUNCTIONS     ------------------------- */
 
 /*
  ** xfunc_free_stream

diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c
index 558645e8b9b33d09f103dc15b12bc6fee3d52978..1ecda0c76153719cfc048bd19c2591333732ab59 100644 (file)
--- a/src/backend/storage/ipc/ipc.c
+++ b/src/backend/storage/ipc/ipc.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.73 2001/10/28 06:25:49 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.74 2001/10/30 05:38:55 momjian Exp $
  *
  * NOTES
  *
@@ -94,9 +94,7 @@ static struct ONEXIT
 {
        void            (*function) ();
        Datum           arg;
-} on_proc_exit_list[MAX_ON_EXITS],
-
-on_shmem_exit_list[MAX_ON_EXITS];
+} on_proc_exit_list[MAX_ON_EXITS], on_shmem_exit_list[MAX_ON_EXITS];
 
 static int     on_proc_exit_index,
                        on_shmem_exit_index;

diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
index a7ddd92dda4b54c65299a72b1b785d89128e0961..778b543e57c96965c9611bcf658f5626e3a1d4a5 100644 (file)
--- a/src/backend/storage/lmgr/lock.c
+++ b/src/backend/storage/lmgr/lock.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.102 2001/10/28 06:25:50 momjian Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.103 2001/10/30 05:38:55 momjian Exp $
  *
  * NOTES
  *       Outside modules can create a lock table and acquire/release
@@ -55,14 +55,14 @@ static void LockCountMyLocks(SHMEM_OFFSET lockOffset, PROC *proc,
 static char *lock_mode_names[] =
 {
        "INVALID",
-               "AccessShareLock",
-               "RowShareLock",
-               "RowExclusiveLock",
-               "ShareUpdateExclusiveLock",
-               "ShareLock",
-               "ShareRowExclusiveLock",
-               "ExclusiveLock",
-               "AccessExclusiveLock"
+       "AccessShareLock",
+       "RowShareLock",
+       "RowExclusiveLock",
+       "ShareUpdateExclusiveLock",
+       "ShareLock",
+       "ShareRowExclusiveLock",
+       "ExclusiveLock",
+       "AccessExclusiveLock"
 };
 
 

diff --git a/src/backend/tioga/tgRecipe.h b/src/backend/tioga/tgRecipe.h
index 960daafd310df6252ae633ed08278ea03040896d..19d9d529c9e3544e2dc54c0cf5d88678d33d8899 100644 (file)
--- a/src/backend/tioga/tgRecipe.h
+++ b/src/backend/tioga/tgRecipe.h
@@ -12,7 +12,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tgRecipe.h,v 1.19 2001/10/28 06:25:51 momjian Exp $
+ * $Id: tgRecipe.h,v 1.20 2001/10/30 05:38:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -29,6 +29,7 @@ typedef struct
                                y;
 } Point;                                               /* this should match whatever is in
 
+                                                                *
                                                                 * geo-decls.h */
 #endif  /* TIOGA_FRONTEND */
 

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 52aa0e0387f80b63682c2a74f390546595a1e2b6..c2e697417481eaf2f37cb3a86f236ace230b90a1 100644 (file)
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -4,7 +4,7 @@
  * Support for grand unified configuration scheme, including SET
  * command, configuration file, and command line options.
  *
- * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.57 2001/10/28 06:25:56 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.58 2001/10/30 05:38:56 momjian Exp $
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  * Written by Peter Eisentraut <peter_e@gmx.net>.
@@ -353,34 +353,34 @@ static struct config_int
 {
        {
                "geqo_threshold", PGC_USERSET, &geqo_rels,
-                       DEFAULT_GEQO_RELS, 2, INT_MAX, NULL, NULL
+               DEFAULT_GEQO_RELS, 2, INT_MAX, NULL, NULL
        },
        {
                "geqo_pool_size", PGC_USERSET, &Geqo_pool_size,
-                       DEFAULT_GEQO_POOL_SIZE, 0, MAX_GEQO_POOL_SIZE, NULL, NULL
+               DEFAULT_GEQO_POOL_SIZE, 0, MAX_GEQO_POOL_SIZE, NULL, NULL
        },
        {
                "geqo_effort", PGC_USERSET, &Geqo_effort,
-                       1, 1, INT_MAX, NULL, NULL
+               1, 1, INT_MAX, NULL, NULL
        },
        {
                "geqo_generations", PGC_USERSET, &Geqo_generations,
-                       0, 0, INT_MAX, NULL, NULL
+               0, 0, INT_MAX, NULL, NULL
        },
        {
                "geqo_random_seed", PGC_USERSET, &Geqo_random_seed,
-                       -1, INT_MIN, INT_MAX, NULL, NULL
+               -1, INT_MIN, INT_MAX, NULL, NULL
        },
 
        {
                "deadlock_timeout", PGC_POSTMASTER, &DeadlockTimeout,
-                       1000, 0, INT_MAX, NULL, NULL
+               1000, 0, INT_MAX, NULL, NULL
        },
 
 #ifdef ENABLE_SYSLOG
        {
                "syslog", PGC_SIGHUP, &Use_syslog,
-                       0, 0, 2, NULL, NULL
+               0, 0, 2, NULL, NULL
        },
 #endif
 
@@ -391,116 +391,116 @@ static struct config_int
         */
        {
                "max_connections", PGC_POSTMASTER, &MaxBackends,
-                       DEF_MAXBACKENDS, 1, INT_MAX, NULL, NULL
+               DEF_MAXBACKENDS, 1, INT_MAX, NULL, NULL
        },
 
        {
                "shared_buffers", PGC_POSTMASTER, &NBuffers,
-                       DEF_NBUFFERS, 16, INT_MAX, NULL, NULL
+               DEF_NBUFFERS, 16, INT_MAX, NULL, NULL
        },
 
        {
                "port", PGC_POSTMASTER, &PostPortNumber,
-                       DEF_PGPORT, 1, 65535, NULL, NULL
+               DEF_PGPORT, 1, 65535, NULL, NULL
        },
 
        {
                "unix_socket_permissions", PGC_POSTMASTER, &Unix_socket_permissions,
-                       0777, 0000, 0777, NULL, NULL
+               0777, 0000, 0777, NULL, NULL
        },
 
        {
                "sort_mem", PGC_USERSET, &SortMem,
-                       512, 4 * BLCKSZ / 1024, INT_MAX, NULL, NULL
+               512, 4 * BLCKSZ / 1024, INT_MAX, NULL, NULL
        },
 
        {
                "vacuum_mem", PGC_USERSET, &VacuumMem,
-                       8192, 1024, INT_MAX, NULL, NULL
+               8192, 1024, INT_MAX, NULL, NULL
        },
 
        {
                "max_files_per_process", PGC_BACKEND, &max_files_per_process,
-                       1000, 25, INT_MAX, NULL, NULL
+               1000, 25, INT_MAX, NULL, NULL
        },
 
        {
                "debug_level", PGC_USERSET, &DebugLvl,
-                       0, 0, 16, NULL, NULL
+               0, 0, 16, NULL, NULL
        },
 
 #ifdef LOCK_DEBUG
        {
                "trace_lock_oidmin", PGC_SUSET, &Trace_lock_oidmin,
-                       BootstrapObjectIdData, 1, INT_MAX, NULL, NULL
+               BootstrapObjectIdData, 1, INT_MAX, NULL, NULL
        },
        {
                "trace_lock_table", PGC_SUSET, &Trace_lock_table,
-                       0, 0, INT_MAX, NULL, NULL
+               0, 0, INT_MAX, NULL, NULL
        },
 #endif
        {
                "max_expr_depth", PGC_USERSET, &max_expr_depth,
-                       DEFAULT_MAX_EXPR_DEPTH, 10, INT_MAX, NULL, NULL
+               DEFAULT_MAX_EXPR_DEPTH, 10, INT_MAX, NULL, NULL
        },
 
        {
                "max_fsm_relations", PGC_POSTMASTER, &MaxFSMRelations,
-                       100, 10, INT_MAX, NULL, NULL
+               100, 10, INT_MAX, NULL, NULL
        },
        {
                "max_fsm_pages", PGC_POSTMASTER, &MaxFSMPages,
-                       10000, 1000, INT_MAX, NULL, NULL
+               10000, 1000, INT_MAX, NULL, NULL
        },
 
        {
                "max_locks_per_transaction", PGC_POSTMASTER, &max_locks_per_xact,
-                       64, 10, INT_MAX, NULL, NULL
+               64, 10, INT_MAX, NULL, NULL
        },
 
        {
                "authentication_timeout", PGC_SIGHUP, &AuthenticationTimeout,
-                       60, 1, 600, NULL, NULL
+               60, 1, 600, NULL, NULL
        },
 
        {
                "pre_auth_delay", PGC_SIGHUP, &PreAuthDelay,
-                       0, 0, 60, NULL, NULL
+               0, 0, 60, NULL, NULL
        },
 
        {
                "checkpoint_segments", PGC_SIGHUP, &CheckPointSegments,
-                       3, 1, INT_MAX, NULL, NULL
+               3, 1, INT_MAX, NULL, NULL
        },
 
        {
                "checkpoint_timeout", PGC_SIGHUP, &CheckPointTimeout,
-                       300, 30, 3600, NULL, NULL
+               300, 30, 3600, NULL, NULL
        },
 
        {
                "wal_buffers", PGC_POSTMASTER, &XLOGbuffers,
-                       8, 4, INT_MAX, NULL, NULL
+               8, 4, INT_MAX, NULL, NULL
        },
 
        {
                "wal_files", PGC_SIGHUP, &XLOGfiles,
-                       0, 0, 64, NULL, NULL
+               0, 0, 64, NULL, NULL
        },
 
        {
                "wal_debug", PGC_SUSET, &XLOG_DEBUG,
-                       0, 0, 16, NULL, NULL
+               0, 0, 16, NULL, NULL
        },
 
        {
                "commit_delay", PGC_USERSET, &CommitDelay,
-                       0, 0, 100000, NULL, NULL
+               0, 0, 100000, NULL, NULL
        },
 
        {
                "commit_siblings", PGC_USERSET, &CommitSiblings,
-                       5, 1, 1000, NULL, NULL
+               5, 1, 1000, NULL, NULL
        },
 
        {
@@ -514,29 +514,29 @@ static struct config_real
 {
        {
                "effective_cache_size", PGC_USERSET, &effective_cache_size,
-                       DEFAULT_EFFECTIVE_CACHE_SIZE, 0, DBL_MAX, NULL, NULL
+               DEFAULT_EFFECTIVE_CACHE_SIZE, 0, DBL_MAX, NULL, NULL
        },
        {
                "random_page_cost", PGC_USERSET, &random_page_cost,
-                       DEFAULT_RANDOM_PAGE_COST, 0, DBL_MAX, NULL, NULL
+               DEFAULT_RANDOM_PAGE_COST, 0, DBL_MAX, NULL, NULL
        },
        {
                "cpu_tuple_cost", PGC_USERSET, &cpu_tuple_cost,
-                       DEFAULT_CPU_TUPLE_COST, 0, DBL_MAX, NULL, NULL
+               DEFAULT_CPU_TUPLE_COST, 0, DBL_MAX, NULL, NULL
        },
        {
                "cpu_index_tuple_cost", PGC_USERSET, &cpu_index_tuple_cost,
-                       DEFAULT_CPU_INDEX_TUPLE_COST, 0, DBL_MAX, NULL, NULL
+               DEFAULT_CPU_INDEX_TUPLE_COST, 0, DBL_MAX, NULL, NULL
        },
        {
                "cpu_operator_cost", PGC_USERSET, &cpu_operator_cost,
-                       DEFAULT_CPU_OPERATOR_COST, 0, DBL_MAX, NULL, NULL
+               DEFAULT_CPU_OPERATOR_COST, 0, DBL_MAX, NULL, NULL
        },
 
        {
                "geqo_selection_bias", PGC_USERSET, &Geqo_selection_bias,
-                       DEFAULT_GEQO_SELECTION_BIAS, MIN_GEQO_SELECTION_BIAS,
-                       MAX_GEQO_SELECTION_BIAS, NULL, NULL
+               DEFAULT_GEQO_SELECTION_BIAS, MIN_GEQO_SELECTION_BIAS,
+               MAX_GEQO_SELECTION_BIAS, NULL, NULL
        },
 
        {
@@ -550,49 +550,49 @@ static struct config_string
 {
        {
                "default_transaction_isolation", PGC_USERSET, &default_iso_level_string,
-                       "read committed", check_defaultxactisolevel, assign_defaultxactisolevel
+               "read committed", check_defaultxactisolevel, assign_defaultxactisolevel
        },
 
        {
                "dynamic_library_path", PGC_SUSET, &Dynamic_library_path,
-                       "$libdir", NULL, NULL
+               "$libdir", NULL, NULL
        },
 
        {
                "krb_server_keyfile", PGC_POSTMASTER, &pg_krb_server_keyfile,
-                       PG_KRB_SRVTAB, NULL, NULL
+               PG_KRB_SRVTAB, NULL, NULL
        },
 
 #ifdef ENABLE_SYSLOG
        {
                "syslog_facility", PGC_POSTMASTER, &Syslog_facility,
-                       "LOCAL0", check_facility, NULL
+               "LOCAL0", check_facility, NULL
        },
        {
                "syslog_ident", PGC_POSTMASTER, &Syslog_ident,
-                       "postgres", NULL, NULL
+               "postgres", NULL, NULL
        },
 #endif
 
        {
                "unix_socket_group", PGC_POSTMASTER, &Unix_socket_group,
-                       "", NULL, NULL
+               "", NULL, NULL
        },
 
        {
                "unix_socket_directory", PGC_POSTMASTER, &UnixSocketDir,
-                       "", NULL, NULL
+               "", NULL, NULL
        },
 
        {
                "virtual_host", PGC_POSTMASTER, &VirtualHost,
-                       "", NULL, NULL
+               "", NULL, NULL
        },
 
        {
                "wal_sync_method", PGC_SIGHUP, &XLOG_sync_method,
-                       XLOG_sync_method_default, check_xlog_sync_method,
-                       assign_xlog_sync_method
+               XLOG_sync_method_default, check_xlog_sync_method,
+               assign_xlog_sync_method
        },
 
        {

diff --git a/src/bin/psql/print.c b/src/bin/psql/print.c
index 010da3678e6b9675879561e9fc77dd41f0686f73..97da4d1816ae7ab73bfba3595f930aab8862b52f 100644 (file)
--- a/src/bin/psql/print.c
+++ b/src/bin/psql/print.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/print.c,v 1.24 2001/10/29 06:45:32 ishii Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/print.c,v 1.25 2001/10/30 05:38:56 momjian Exp $
  */
 #include "postgres_fe.h"
 #include "print.h"
@@ -261,9 +261,7 @@ print_aligned_text(const char *title, const char *const * headers,
                }
        }
        else
-       {
                cell_w = 0;
-       }
 #endif
 
 
@@ -479,9 +477,7 @@ print_aligned_vertical(const char *title, const char *const * headers,
                }
        }
        else
-       {
                cell_w = 0;
-       }
 
        /* find longest data cell */
        for (i = 0, ptr = cells; *ptr; ptr++, i++)

diff --git a/src/interfaces/ecpg/lib/misc.c b/src/interfaces/ecpg/lib/misc.c
index 47bb1824c25a62c2ab430ea435b6add50b5b22da..2d3daf7d4fdf06f206a15cceca3fc53a6175a113 100644 (file)
--- a/src/interfaces/ecpg/lib/misc.c
+++ b/src/interfaces/ecpg/lib/misc.c
@@ -1,4 +1,4 @@
-/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/misc.c,v 1.8 2001/10/28 06:26:11 momjian Exp $ */
+/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/misc.c,v 1.9 2001/10/30 05:38:56 momjian Exp $ */
 
 #include "postgres_fe.h"
 
@@ -14,8 +14,8 @@ static struct sqlca sqlca_init =
        {
                'S', 'Q', 'L', 'C', 'A', ' ', ' ', ' '
        },
-               sizeof(struct sqlca),
-               0,
+       sizeof(struct sqlca),
+       0,
        {
                0,
                {

diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent
index e675b1715f14c479698cf60bdf0b43606d233137..ed7a1279a42ac29e5efb406cc552746ace531162 100755 (executable)
--- a/src/tools/pgindent/pgindent
+++ b/src/tools/pgindent/pgindent
@@ -50,7 +50,8 @@ do
                            line2 ~ "^{[        ]*$" &&
                            line1 !~ "^struct" &&
                            line1 !~ "^enum" &&
-                           line1 !~ "^typedef")
+                           line1 !~ "^typedef" &&
+                           line1 !~ "=" )
                                print "int      pgindent_func_no_var_fix;";
                        line1 = line2;
                }