database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

Fix small problem Tom Lane found with pgindent run.

Browse Source
This commit is contained in:
Bruce Momjian
2001-10-30 05:38:56 +00:00
parent d650a6f580
commit c41b6b1b9c
9 changed files with 76 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/pgcrypto/crypt-des.c
View File

@ -160,13 +160,13 @@ static uint8 pbox[32] = {
static uint32 _crypt_bits32[32] = static uint32 _crypt_bits32[32] =
{ {
0x80000000, 0x40000000, 0x20000000, 0x10000000, 0x80000000, 0x40000000, 0x20000000, 0x10000000,
0x08000000, 0x04000000, 0x02000000, 0x01000000, 0x08000000, 0x04000000, 0x02000000, 0x01000000,
0x00800000, 0x00400000, 0x00200000, 0x00100000, 0x00800000, 0x00400000, 0x00200000, 0x00100000,
0x00080000, 0x00040000, 0x00020000, 0x00010000, 0x00080000, 0x00040000, 0x00020000, 0x00010000,
0x00008000, 0x00004000, 0x00002000, 0x00001000, 0x00008000, 0x00004000, 0x00002000, 0x00001000,
0x00000800, 0x00000400, 0x00000200, 0x00000100, 0x00000800, 0x00000400, 0x00000200, 0x00000100,
0x00000080, 0x00000040, 0x00000020, 0x00000010, 0x00000080, 0x00000040, 0x00000020, 0x00000010,
0x00000008, 0x00000004, 0x00000002, 0x00000001 0x00000008, 0x00000004, 0x00000002, 0x00000001
}; };
static uint8 _crypt_bits8[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; static uint8 _crypt_bits8[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01};

4
src/backend/optimizer/path/_deadcode/predmig.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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 ** xfunc_free_stream

6
src/backend/storage/ipc/ipc.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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 * NOTES
* *
@ -94,9 +94,7 @@ static struct ONEXIT
{ {
void (*function) (); void (*function) ();
Datum arg; Datum arg;
} on_proc_exit_list[MAX_ON_EXITS], } on_proc_exit_list[MAX_ON_EXITS], on_shmem_exit_list[MAX_ON_EXITS];
on_shmem_exit_list[MAX_ON_EXITS];
static int on_proc_exit_index, static int on_proc_exit_index,
on_shmem_exit_index; on_shmem_exit_index;

18
src/backend/storage/lmgr/lock.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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 * NOTES
* Outside modules can create a lock table and acquire/release * 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[] = static char *lock_mode_names[] =
{ {
"INVALID", "INVALID",
"AccessShareLock", "AccessShareLock",
"RowShareLock", "RowShareLock",
"RowExclusiveLock", "RowExclusiveLock",
"ShareUpdateExclusiveLock", "ShareUpdateExclusiveLock",
"ShareLock", "ShareLock",
"ShareRowExclusiveLock", "ShareRowExclusiveLock",
"ExclusiveLock", "ExclusiveLock",
"AccessExclusiveLock" "AccessExclusiveLock"
}; };

3
src/backend/tioga/tgRecipe.h
View File

@ -12,7 +12,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * 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; y;
} Point; /* this should match whatever is in } Point; /* this should match whatever is in
*
* geo-decls.h */ * geo-decls.h */
#endif /* TIOGA_FRONTEND */ #endif /* TIOGA_FRONTEND */

96
src/backend/utils/misc/guc.c
View File

@ -4,7 +4,7 @@
* Support for grand unified configuration scheme, including SET * Support for grand unified configuration scheme, including SET
* command, configuration file, and command line options. * 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 * Copyright 2000 by PostgreSQL Global Development Group
* Written by Peter Eisentraut <peter_e@gmx.net>. * Written by Peter Eisentraut <peter_e@gmx.net>.
@ -353,34 +353,34 @@ static struct config_int
{ {
{ {
"geqo_threshold", PGC_USERSET, &geqo_rels, "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, "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, "geqo_effort", PGC_USERSET, &Geqo_effort,
1, 1, INT_MAX, NULL, NULL 1, 1, INT_MAX, NULL, NULL
}, },
{ {
"geqo_generations", PGC_USERSET, &Geqo_generations, "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, "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, "deadlock_timeout", PGC_POSTMASTER, &DeadlockTimeout,
1000, 0, INT_MAX, NULL, NULL 1000, 0, INT_MAX, NULL, NULL
}, },
#ifdef ENABLE_SYSLOG #ifdef ENABLE_SYSLOG
{ {
"syslog", PGC_SIGHUP, &Use_syslog, "syslog", PGC_SIGHUP, &Use_syslog,
0, 0, 2, NULL, NULL 0, 0, 2, NULL, NULL
}, },
#endif #endif
@ -391,116 +391,116 @@ static struct config_int
*/ */
{ {
"max_connections", PGC_POSTMASTER, &MaxBackends, "max_connections", PGC_POSTMASTER, &MaxBackends,
DEF_MAXBACKENDS, 1, INT_MAX, NULL, NULL DEF_MAXBACKENDS, 1, INT_MAX, NULL, NULL
}, },
{ {
"shared_buffers", PGC_POSTMASTER, &NBuffers, "shared_buffers", PGC_POSTMASTER, &NBuffers,
DEF_NBUFFERS, 16, INT_MAX, NULL, NULL DEF_NBUFFERS, 16, INT_MAX, NULL, NULL
}, },
{ {
"port", PGC_POSTMASTER, &PostPortNumber, "port", PGC_POSTMASTER, &PostPortNumber,
DEF_PGPORT, 1, 65535, NULL, NULL DEF_PGPORT, 1, 65535, NULL, NULL
}, },
{ {
"unix_socket_permissions", PGC_POSTMASTER, &Unix_socket_permissions, "unix_socket_permissions", PGC_POSTMASTER, &Unix_socket_permissions,
0777, 0000, 0777, NULL, NULL 0777, 0000, 0777, NULL, NULL
}, },
{ {
"sort_mem", PGC_USERSET, &SortMem, "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, "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, "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, "debug_level", PGC_USERSET, &DebugLvl,
0, 0, 16, NULL, NULL 0, 0, 16, NULL, NULL
}, },
#ifdef LOCK_DEBUG #ifdef LOCK_DEBUG
{ {
"trace_lock_oidmin", PGC_SUSET, &Trace_lock_oidmin, "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, "trace_lock_table", PGC_SUSET, &Trace_lock_table,
0, 0, INT_MAX, NULL, NULL 0, 0, INT_MAX, NULL, NULL
}, },
#endif #endif
{ {
"max_expr_depth", PGC_USERSET, &max_expr_depth, "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, "max_fsm_relations", PGC_POSTMASTER, &MaxFSMRelations,
100, 10, INT_MAX, NULL, NULL 100, 10, INT_MAX, NULL, NULL
}, },
{ {
"max_fsm_pages", PGC_POSTMASTER, &MaxFSMPages, "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, "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, "authentication_timeout", PGC_SIGHUP, &AuthenticationTimeout,
60, 1, 600, NULL, NULL 60, 1, 600, NULL, NULL
}, },
{ {
"pre_auth_delay", PGC_SIGHUP, &PreAuthDelay, "pre_auth_delay", PGC_SIGHUP, &PreAuthDelay,
0, 0, 60, NULL, NULL 0, 0, 60, NULL, NULL
}, },
{ {
"checkpoint_segments", PGC_SIGHUP, &CheckPointSegments, "checkpoint_segments", PGC_SIGHUP, &CheckPointSegments,
3, 1, INT_MAX, NULL, NULL 3, 1, INT_MAX, NULL, NULL
}, },
{ {
"checkpoint_timeout", PGC_SIGHUP, &CheckPointTimeout, "checkpoint_timeout", PGC_SIGHUP, &CheckPointTimeout,
300, 30, 3600, NULL, NULL 300, 30, 3600, NULL, NULL
}, },
{ {
"wal_buffers", PGC_POSTMASTER, &XLOGbuffers, "wal_buffers", PGC_POSTMASTER, &XLOGbuffers,
8, 4, INT_MAX, NULL, NULL 8, 4, INT_MAX, NULL, NULL
}, },
{ {
"wal_files", PGC_SIGHUP, &XLOGfiles, "wal_files", PGC_SIGHUP, &XLOGfiles,
0, 0, 64, NULL, NULL 0, 0, 64, NULL, NULL
}, },
{ {
"wal_debug", PGC_SUSET, &XLOG_DEBUG, "wal_debug", PGC_SUSET, &XLOG_DEBUG,
0, 0, 16, NULL, NULL 0, 0, 16, NULL, NULL
}, },
{ {
"commit_delay", PGC_USERSET, &CommitDelay, "commit_delay", PGC_USERSET, &CommitDelay,
0, 0, 100000, NULL, NULL 0, 0, 100000, NULL, NULL
}, },
{ {
"commit_siblings", PGC_USERSET, &CommitSiblings, "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, "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, "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, "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, "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, "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, "geqo_selection_bias", PGC_USERSET, &Geqo_selection_bias,
DEFAULT_GEQO_SELECTION_BIAS, MIN_GEQO_SELECTION_BIAS, DEFAULT_GEQO_SELECTION_BIAS, MIN_GEQO_SELECTION_BIAS,
MAX_GEQO_SELECTION_BIAS, NULL, NULL MAX_GEQO_SELECTION_BIAS, NULL, NULL
}, },
{ {
@ -550,49 +550,49 @@ static struct config_string
{ {
{ {
"default_transaction_isolation", PGC_USERSET, &default_iso_level_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, "dynamic_library_path", PGC_SUSET, &Dynamic_library_path,
"$libdir", NULL, NULL "$libdir", NULL, NULL
}, },
{ {
"krb_server_keyfile", PGC_POSTMASTER, &pg_krb_server_keyfile, "krb_server_keyfile", PGC_POSTMASTER, &pg_krb_server_keyfile,
PG_KRB_SRVTAB, NULL, NULL PG_KRB_SRVTAB, NULL, NULL
}, },
#ifdef ENABLE_SYSLOG #ifdef ENABLE_SYSLOG
{ {
"syslog_facility", PGC_POSTMASTER, &Syslog_facility, "syslog_facility", PGC_POSTMASTER, &Syslog_facility,
"LOCAL0", check_facility, NULL "LOCAL0", check_facility, NULL
}, },
{ {
"syslog_ident", PGC_POSTMASTER, &Syslog_ident, "syslog_ident", PGC_POSTMASTER, &Syslog_ident,
"postgres", NULL, NULL "postgres", NULL, NULL
}, },
#endif #endif
{ {
"unix_socket_group", PGC_POSTMASTER, &Unix_socket_group, "unix_socket_group", PGC_POSTMASTER, &Unix_socket_group,
"", NULL, NULL "", NULL, NULL
}, },
{ {
"unix_socket_directory", PGC_POSTMASTER, &UnixSocketDir, "unix_socket_directory", PGC_POSTMASTER, &UnixSocketDir,
"", NULL, NULL "", NULL, NULL
}, },
{ {
"virtual_host", PGC_POSTMASTER, &VirtualHost, "virtual_host", PGC_POSTMASTER, &VirtualHost,
"", NULL, NULL "", NULL, NULL
}, },
{ {
"wal_sync_method", PGC_SIGHUP, &XLOG_sync_method, "wal_sync_method", PGC_SIGHUP, &XLOG_sync_method,
XLOG_sync_method_default, check_xlog_sync_method, XLOG_sync_method_default, check_xlog_sync_method,
assign_xlog_sync_method assign_xlog_sync_method
}, },
{ {

6
src/bin/psql/print.c
View File

@ -3,7 +3,7 @@
* *
* Copyright 2000 by PostgreSQL Global Development Group * 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 "postgres_fe.h"
#include "print.h" #include "print.h"
@ -261,9 +261,7 @@ print_aligned_text(const char *title, const char *const * headers,
} }
} }
else else
{
cell_w = 0; cell_w = 0;
}
#endif #endif
@ -479,9 +477,7 @@ print_aligned_vertical(const char *title, const char *const * headers,
} }
} }
else else
{
cell_w = 0; cell_w = 0;
}
/* find longest data cell */ /* find longest data cell */
for (i = 0, ptr = cells; *ptr; ptr++, i++) for (i = 0, ptr = cells; *ptr; ptr++, i++)

6
src/interfaces/ecpg/lib/misc.c
View File

@ -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" #include "postgres_fe.h"
@ -14,8 +14,8 @@ static struct sqlca sqlca_init =
{ {
'S', 'Q', 'L', 'C', 'A', ' ', ' ', ' ' 'S', 'Q', 'L', 'C', 'A', ' ', ' ', ' '
}, },
sizeof(struct sqlca), sizeof(struct sqlca),
0, 0,
{ {
0, 0,
{ {

3
src/tools/pgindent/pgindent
View File

@ -50,7 +50,8 @@ do
line2 ~ "^{[ ]*$" && line2 ~ "^{[ ]*$" &&
line1 !~ "^struct" && line1 !~ "^struct" &&
line1 !~ "^enum" && line1 !~ "^enum" &&
line1 !~ "^typedef") line1 !~ "^typedef" &&
line1 !~ "=" )
print "int pgindent_func_no_var_fix;"; print "int pgindent_func_no_var_fix;";
line1 = line2; line1 = line2;
} }