Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit c41b6b1

Browse files
bmomjianbmomjian
committed
Fix small problem Tom Lane found with pgindent run.
1 parent d650a6f commit c41b6b1

File tree

9 files changed

+76
-80
lines changed

9 files changed

+76
-80
lines changed

‎contrib/pgcrypto/crypt-des.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -160,13 +160,13 @@ static uint8 pbox[32] = {
160160
static uint32 _crypt_bits32[32] =
161161
{
162162
0x80000000, 0x40000000, 0x20000000, 0x10000000,
163-
0x08000000, 0x04000000, 0x02000000, 0x01000000,
164-
0x00800000, 0x00400000, 0x00200000, 0x00100000,
165-
0x00080000, 0x00040000, 0x00020000, 0x00010000,
166-
0x00008000, 0x00004000, 0x00002000, 0x00001000,
167-
0x00000800, 0x00000400, 0x00000200, 0x00000100,
168-
0x00000080, 0x00000040, 0x00000020, 0x00000010,
169-
0x00000008, 0x00000004, 0x00000002, 0x00000001
163+
0x08000000, 0x04000000, 0x02000000, 0x01000000,
164+
0x00800000, 0x00400000, 0x00200000, 0x00100000,
165+
0x00080000, 0x00040000, 0x00020000, 0x00010000,
166+
0x00008000, 0x00004000, 0x00002000, 0x00001000,
167+
0x00000800, 0x00000400, 0x00000200, 0x00000100,
168+
0x00000080, 0x00000040, 0x00000020, 0x00000010,
169+
0x00000008, 0x00000004, 0x00000002, 0x00000001
170170
};
171171

172172
static uint8 _crypt_bits8[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01};

‎src/backend/optimizer/path/_deadcode/predmig.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/predmig.c,v 1.12 2001/10/28 06:25:44 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/_deadcode/Attic/predmig.c,v 1.13 2001/10/30 05:38:55 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -484,7 +484,7 @@ xfunc_form_groups(Query *queryInfo, Stream root, Stream bottom)
484484
}
485485

486486

487-
/* ------------------- UTILITY FUNCTIONS ------------------------- */
487+
/* ------------------- UTILITY FUNCTIONS ------------------------- */
488488

489489
/*
490490
** xfunc_free_stream

‎src/backend/storage/ipc/ipc.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.73 2001/10/28 06:25:49 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.74 2001/10/30 05:38:55 momjian Exp $
1212
*
1313
* NOTES
1414
*
@@ -94,9 +94,7 @@ static struct ONEXIT
9494
{
9595
void (*function) ();
9696
Datum arg;
97-
} on_proc_exit_list[MAX_ON_EXITS],
98-
99-
on_shmem_exit_list[MAX_ON_EXITS];
97+
} on_proc_exit_list[MAX_ON_EXITS], on_shmem_exit_list[MAX_ON_EXITS];
10098

10199
static int on_proc_exit_index,
102100
on_shmem_exit_index;

‎src/backend/storage/lmgr/lock.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.102 2001/10/28 06:25:50 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.103 2001/10/30 05:38:55 momjian Exp $
1212
*
1313
* NOTES
1414
* Outside modules can create a lock table and acquire/release
@@ -55,14 +55,14 @@ static void LockCountMyLocks(SHMEM_OFFSET lockOffset, PROC *proc,
5555
static char *lock_mode_names[] =
5656
{
5757
"INVALID",
58-
"AccessShareLock",
59-
"RowShareLock",
60-
"RowExclusiveLock",
61-
"ShareUpdateExclusiveLock",
62-
"ShareLock",
63-
"ShareRowExclusiveLock",
64-
"ExclusiveLock",
65-
"AccessExclusiveLock"
58+
"AccessShareLock",
59+
"RowShareLock",
60+
"RowExclusiveLock",
61+
"ShareUpdateExclusiveLock",
62+
"ShareLock",
63+
"ShareRowExclusiveLock",
64+
"ExclusiveLock",
65+
"AccessExclusiveLock"
6666
};
6767

6868

‎src/backend/tioga/tgRecipe.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
1313
* Portions Copyright (c) 1994, Regents of the University of California
1414
*
15-
* $Id: tgRecipe.h,v 1.19 2001/10/28 06:25:51 momjian Exp $
15+
* $Id: tgRecipe.h,v 1.20 2001/10/30 05:38:55 momjian Exp $
1616
*
1717
*-------------------------------------------------------------------------
1818
*/
@@ -29,6 +29,7 @@ typedef struct
2929
y;
3030
} Point; /* this should match whatever is in
3131
32+
*
3233
* geo-decls.h */
3334
#endif /* TIOGA_FRONTEND */
3435

‎src/backend/utils/misc/guc.c

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Support for grand unified configuration scheme, including SET
55
* command, configuration file, and command line options.
66
*
7-
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.57 2001/10/28 06:25:56 momjian Exp $
7+
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.58 2001/10/30 05:38:56 momjian Exp $
88
*
99
* Copyright 2000 by PostgreSQL Global Development Group
1010
* Written by Peter Eisentraut <peter_e@gmx.net>.
@@ -353,34 +353,34 @@ static struct config_int
353353
{
354354
{
355355
"geqo_threshold", PGC_USERSET, &geqo_rels,
356-
DEFAULT_GEQO_RELS, 2, INT_MAX, NULL, NULL
356+
DEFAULT_GEQO_RELS, 2, INT_MAX, NULL, NULL
357357
},
358358
{
359359
"geqo_pool_size", PGC_USERSET, &Geqo_pool_size,
360-
DEFAULT_GEQO_POOL_SIZE, 0, MAX_GEQO_POOL_SIZE, NULL, NULL
360+
DEFAULT_GEQO_POOL_SIZE, 0, MAX_GEQO_POOL_SIZE, NULL, NULL
361361
},
362362
{
363363
"geqo_effort", PGC_USERSET, &Geqo_effort,
364-
1, 1, INT_MAX, NULL, NULL
364+
1, 1, INT_MAX, NULL, NULL
365365
},
366366
{
367367
"geqo_generations", PGC_USERSET, &Geqo_generations,
368-
0, 0, INT_MAX, NULL, NULL
368+
0, 0, INT_MAX, NULL, NULL
369369
},
370370
{
371371
"geqo_random_seed", PGC_USERSET, &Geqo_random_seed,
372-
-1, INT_MIN, INT_MAX, NULL, NULL
372+
-1, INT_MIN, INT_MAX, NULL, NULL
373373
},
374374

375375
{
376376
"deadlock_timeout", PGC_POSTMASTER, &DeadlockTimeout,
377-
1000, 0, INT_MAX, NULL, NULL
377+
1000, 0, INT_MAX, NULL, NULL
378378
},
379379

380380
#ifdef ENABLE_SYSLOG
381381
{
382382
"syslog", PGC_SIGHUP, &Use_syslog,
383-
0, 0, 2, NULL, NULL
383+
0, 0, 2, NULL, NULL
384384
},
385385
#endif
386386

@@ -391,116 +391,116 @@ static struct config_int
391391
*/
392392
{
393393
"max_connections", PGC_POSTMASTER, &MaxBackends,
394-
DEF_MAXBACKENDS, 1, INT_MAX, NULL, NULL
394+
DEF_MAXBACKENDS, 1, INT_MAX, NULL, NULL
395395
},
396396

397397
{
398398
"shared_buffers", PGC_POSTMASTER, &NBuffers,
399-
DEF_NBUFFERS, 16, INT_MAX, NULL, NULL
399+
DEF_NBUFFERS, 16, INT_MAX, NULL, NULL
400400
},
401401

402402
{
403403
"port", PGC_POSTMASTER, &PostPortNumber,
404-
DEF_PGPORT, 1, 65535, NULL, NULL
404+
DEF_PGPORT, 1, 65535, NULL, NULL
405405
},
406406

407407
{
408408
"unix_socket_permissions", PGC_POSTMASTER, &Unix_socket_permissions,
409-
0777, 0000, 0777, NULL, NULL
409+
0777, 0000, 0777, NULL, NULL
410410
},
411411

412412
{
413413
"sort_mem", PGC_USERSET, &SortMem,
414-
512, 4 * BLCKSZ / 1024, INT_MAX, NULL, NULL
414+
512, 4 * BLCKSZ / 1024, INT_MAX, NULL, NULL
415415
},
416416

417417
{
418418
"vacuum_mem", PGC_USERSET, &VacuumMem,
419-
8192, 1024, INT_MAX, NULL, NULL
419+
8192, 1024, INT_MAX, NULL, NULL
420420
},
421421

422422
{
423423
"max_files_per_process", PGC_BACKEND, &max_files_per_process,
424-
1000, 25, INT_MAX, NULL, NULL
424+
1000, 25, INT_MAX, NULL, NULL
425425
},
426426

427427
{
428428
"debug_level", PGC_USERSET, &DebugLvl,
429-
0, 0, 16, NULL, NULL
429+
0, 0, 16, NULL, NULL
430430
},
431431

432432
#ifdef LOCK_DEBUG
433433
{
434434
"trace_lock_oidmin", PGC_SUSET, &Trace_lock_oidmin,
435-
BootstrapObjectIdData, 1, INT_MAX, NULL, NULL
435+
BootstrapObjectIdData, 1, INT_MAX, NULL, NULL
436436
},
437437
{
438438
"trace_lock_table", PGC_SUSET, &Trace_lock_table,
439-
0, 0, INT_MAX, NULL, NULL
439+
0, 0, INT_MAX, NULL, NULL
440440
},
441441
#endif
442442
{
443443
"max_expr_depth", PGC_USERSET, &max_expr_depth,
444-
DEFAULT_MAX_EXPR_DEPTH, 10, INT_MAX, NULL, NULL
444+
DEFAULT_MAX_EXPR_DEPTH, 10, INT_MAX, NULL, NULL
445445
},
446446

447447
{
448448
"max_fsm_relations", PGC_POSTMASTER, &MaxFSMRelations,
449-
100, 10, INT_MAX, NULL, NULL
449+
100, 10, INT_MAX, NULL, NULL
450450
},
451451
{
452452
"max_fsm_pages", PGC_POSTMASTER, &MaxFSMPages,
453-
10000, 1000, INT_MAX, NULL, NULL
453+
10000, 1000, INT_MAX, NULL, NULL
454454
},
455455

456456
{
457457
"max_locks_per_transaction", PGC_POSTMASTER, &max_locks_per_xact,
458-
64, 10, INT_MAX, NULL, NULL
458+
64, 10, INT_MAX, NULL, NULL
459459
},
460460

461461
{
462462
"authentication_timeout", PGC_SIGHUP, &AuthenticationTimeout,
463-
60, 1, 600, NULL, NULL
463+
60, 1, 600, NULL, NULL
464464
},
465465

466466
{
467467
"pre_auth_delay", PGC_SIGHUP, &PreAuthDelay,
468-
0, 0, 60, NULL, NULL
468+
0, 0, 60, NULL, NULL
469469
},
470470

471471
{
472472
"checkpoint_segments", PGC_SIGHUP, &CheckPointSegments,
473-
3, 1, INT_MAX, NULL, NULL
473+
3, 1, INT_MAX, NULL, NULL
474474
},
475475

476476
{
477477
"checkpoint_timeout", PGC_SIGHUP, &CheckPointTimeout,
478-
300, 30, 3600, NULL, NULL
478+
300, 30, 3600, NULL, NULL
479479
},
480480

481481
{
482482
"wal_buffers", PGC_POSTMASTER, &XLOGbuffers,
483-
8, 4, INT_MAX, NULL, NULL
483+
8, 4, INT_MAX, NULL, NULL
484484
},
485485

486486
{
487487
"wal_files", PGC_SIGHUP, &XLOGfiles,
488-
0, 0, 64, NULL, NULL
488+
0, 0, 64, NULL, NULL
489489
},
490490

491491
{
492492
"wal_debug", PGC_SUSET, &XLOG_DEBUG,
493-
0, 0, 16, NULL, NULL
493+
0, 0, 16, NULL, NULL
494494
},
495495

496496
{
497497
"commit_delay", PGC_USERSET, &CommitDelay,
498-
0, 0, 100000, NULL, NULL
498+
0, 0, 100000, NULL, NULL
499499
},
500500

501501
{
502502
"commit_siblings", PGC_USERSET, &CommitSiblings,
503-
5, 1, 1000, NULL, NULL
503+
5, 1, 1000, NULL, NULL
504504
},
505505

506506
{
@@ -514,29 +514,29 @@ static struct config_real
514514
{
515515
{
516516
"effective_cache_size", PGC_USERSET, &effective_cache_size,
517-
DEFAULT_EFFECTIVE_CACHE_SIZE, 0, DBL_MAX, NULL, NULL
517+
DEFAULT_EFFECTIVE_CACHE_SIZE, 0, DBL_MAX, NULL, NULL
518518
},
519519
{
520520
"random_page_cost", PGC_USERSET, &random_page_cost,
521-
DEFAULT_RANDOM_PAGE_COST, 0, DBL_MAX, NULL, NULL
521+
DEFAULT_RANDOM_PAGE_COST, 0, DBL_MAX, NULL, NULL
522522
},
523523
{
524524
"cpu_tuple_cost", PGC_USERSET, &cpu_tuple_cost,
525-
DEFAULT_CPU_TUPLE_COST, 0, DBL_MAX, NULL, NULL
525+
DEFAULT_CPU_TUPLE_COST, 0, DBL_MAX, NULL, NULL
526526
},
527527
{
528528
"cpu_index_tuple_cost", PGC_USERSET, &cpu_index_tuple_cost,
529-
DEFAULT_CPU_INDEX_TUPLE_COST, 0, DBL_MAX, NULL, NULL
529+
DEFAULT_CPU_INDEX_TUPLE_COST, 0, DBL_MAX, NULL, NULL
530530
},
531531
{
532532
"cpu_operator_cost", PGC_USERSET, &cpu_operator_cost,
533-
DEFAULT_CPU_OPERATOR_COST, 0, DBL_MAX, NULL, NULL
533+
DEFAULT_CPU_OPERATOR_COST, 0, DBL_MAX, NULL, NULL
534534
},
535535

536536
{
537537
"geqo_selection_bias", PGC_USERSET, &Geqo_selection_bias,
538-
DEFAULT_GEQO_SELECTION_BIAS, MIN_GEQO_SELECTION_BIAS,
539-
MAX_GEQO_SELECTION_BIAS, NULL, NULL
538+
DEFAULT_GEQO_SELECTION_BIAS, MIN_GEQO_SELECTION_BIAS,
539+
MAX_GEQO_SELECTION_BIAS, NULL, NULL
540540
},
541541

542542
{
@@ -550,49 +550,49 @@ static struct config_string
550550
{
551551
{
552552
"default_transaction_isolation", PGC_USERSET, &default_iso_level_string,
553-
"read committed", check_defaultxactisolevel, assign_defaultxactisolevel
553+
"read committed", check_defaultxactisolevel, assign_defaultxactisolevel
554554
},
555555

556556
{
557557
"dynamic_library_path", PGC_SUSET, &Dynamic_library_path,
558-
"$libdir", NULL, NULL
558+
"$libdir", NULL, NULL
559559
},
560560

561561
{
562562
"krb_server_keyfile", PGC_POSTMASTER, &pg_krb_server_keyfile,
563-
PG_KRB_SRVTAB, NULL, NULL
563+
PG_KRB_SRVTAB, NULL, NULL
564564
},
565565

566566
#ifdef ENABLE_SYSLOG
567567
{
568568
"syslog_facility", PGC_POSTMASTER, &Syslog_facility,
569-
"LOCAL0", check_facility, NULL
569+
"LOCAL0", check_facility, NULL
570570
},
571571
{
572572
"syslog_ident", PGC_POSTMASTER, &Syslog_ident,
573-
"postgres", NULL, NULL
573+
"postgres", NULL, NULL
574574
},
575575
#endif
576576

577577
{
578578
"unix_socket_group", PGC_POSTMASTER, &Unix_socket_group,
579-
"", NULL, NULL
579+
"", NULL, NULL
580580
},
581581

582582
{
583583
"unix_socket_directory", PGC_POSTMASTER, &UnixSocketDir,
584-
"", NULL, NULL
584+
"", NULL, NULL
585585
},
586586

587587
{
588588
"virtual_host", PGC_POSTMASTER, &VirtualHost,
589-
"", NULL, NULL
589+
"", NULL, NULL
590590
},
591591

592592
{
593593
"wal_sync_method", PGC_SIGHUP, &XLOG_sync_method,
594-
XLOG_sync_method_default, check_xlog_sync_method,
595-
assign_xlog_sync_method
594+
XLOG_sync_method_default, check_xlog_sync_method,
595+
assign_xlog_sync_method
596596
},
597597

598598
{

0 commit comments

Comments
 (0)