1
0
mirror of https://github.com/postgres/postgres.git synced 2025-10-24 01:29:19 +03:00

New pgindent run with fixes suggested by Tom. Patch manually reviewed,

initdb/regression tests pass.
This commit is contained in:
Bruce Momjian
2001-11-05 17:46:40 +00:00
parent 34153b2052
commit ea08e6cd55
503 changed files with 1648 additions and 1610 deletions

View File

@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: attnum.h,v 1.14 2001/10/28 06:25:59 momjian Exp $
* $Id: attnum.h,v 1.15 2001/11/05 17:46:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -60,4 +60,4 @@ typedef int16 AttrNumber;
#define AttrOffsetGetAttrNumber(attributeOffset) \
((AttrNumber) (1 + attributeOffset))
#endif /* ATTNUM_H */
#endif /* ATTNUM_H */

View File

@@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: clog.h,v 1.4 2001/10/28 06:25:59 momjian Exp $
* $Id: clog.h,v 1.5 2001/11/05 17:46:31 momjian Exp $
*/
#ifndef CLOG_H
#define CLOG_H
@@ -47,4 +47,4 @@ extern void clog_redo(XLogRecPtr lsn, XLogRecord *record);
extern void clog_undo(XLogRecPtr lsn, XLogRecord *record);
extern void clog_desc(char *buf, uint8 xl_info, char *rec);
#endif /* CLOG_H */
#endif /* CLOG_H */

View File

@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: genam.h,v 1.30 2001/11/02 16:30:29 tgl Exp $
* $Id: genam.h,v 1.31 2001/11/05 17:46:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -64,4 +64,4 @@ extern IndexScanDesc RelationGetIndexScan(Relation relation, bool scanFromEnd,
uint16 numberOfKeys, ScanKey key);
extern void IndexScanEnd(IndexScanDesc scan);
#endif /* GENAM_H */
#endif /* GENAM_H */

View File

@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: gist.h,v 1.34 2001/10/28 06:25:59 momjian Exp $
* $Id: gist.h,v 1.35 2001/11/05 17:46:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -185,4 +185,4 @@ extern void gist_desc(char *buf, uint8 xl_info, char *rec);
/* gistget.c */
extern Datum gistgettuple(PG_FUNCTION_ARGS);
#endif /* GIST_H */
#endif /* GIST_H */

View File

@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: gistscan.h,v 1.18 2001/10/28 06:25:59 momjian Exp $
* $Id: gistscan.h,v 1.19 2001/11/05 17:46:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -24,4 +24,4 @@ extern Datum gistendscan(PG_FUNCTION_ARGS);
extern void gistadjscans(Relation r, int op, BlockNumber blkno, OffsetNumber offnum);
extern void AtEOXact_gist(void);
#endif /* GISTSCAN_H */
#endif /* GISTSCAN_H */

View File

@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: hash.h,v 1.41 2001/10/28 06:25:59 momjian Exp $
* $Id: hash.h,v 1.42 2001/11/05 17:46:31 momjian Exp $
*
* NOTES
* modeled after Margo Seltzer's hash implementation for unix.
@@ -328,4 +328,4 @@ extern void hash_redo(XLogRecPtr lsn, XLogRecord *record);
extern void hash_undo(XLogRecPtr lsn, XLogRecord *record);
extern void hash_desc(char *buf, uint8 xl_info, char *rec);
#endif /* HASH_H */
#endif /* HASH_H */

View File

@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: heapam.h,v 1.71 2001/11/02 16:30:29 tgl Exp $
* $Id: heapam.h,v 1.72 2001/11/05 17:46:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -83,7 +83,7 @@ extern Datum nocachegetattr(HeapTuple tup, int attnum,
extern Datum fastgetattr(HeapTuple tup, int attnum, TupleDesc tupleDesc,
bool *isnull);
#endif /* defined(DISABLE_COMPLEX_MACRO) */
#endif /* defined(DISABLE_COMPLEX_MACRO) */
/* ----------------
@@ -139,6 +139,7 @@ extern void relation_close(Relation relation, LOCKMODE lockmode);
extern Relation heap_open(Oid relationId, LOCKMODE lockmode);
extern Relation heap_openr(const char *relationName, LOCKMODE lockmode);
#define heap_close(r,l) relation_close(r,l)
extern HeapScanDesc heap_beginscan(Relation relation, int atend,
@@ -186,4 +187,4 @@ extern HeapTuple heap_modifytuple(HeapTuple tuple,
extern void heap_freetuple(HeapTuple tuple);
extern HeapTuple heap_addheader(int natts, Size structlen, void *structure);
#endif /* HEAPAM_H */
#endif /* HEAPAM_H */

View File

@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: hio.h,v 1.21 2001/10/28 06:25:59 momjian Exp $
* $Id: hio.h,v 1.22 2001/11/05 17:46:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -21,4 +21,4 @@ extern void RelationPutHeapTuple(Relation relation, Buffer buffer,
extern Buffer RelationGetBufferForTuple(Relation relation, Size len,
Buffer otherBuffer);
#endif /* HIO_H */
#endif /* HIO_H */

View File

@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: htup.h,v 1.50 2001/10/28 06:25:59 momjian Exp $
* $Id: htup.h,v 1.51 2001/11/05 17:46:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -276,4 +276,4 @@ typedef HeapTupleData *HeapTuple;
#define HeapTupleHasExtended(tuple) \
((((HeapTuple)(tuple))->t_data->t_infomask & HEAP_HASEXTENDED) != 0)
#endif /* HTUP_H */
#endif /* HTUP_H */

View File

@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: ibit.h,v 1.17 2001/10/28 06:25:59 momjian Exp $
* $Id: ibit.h,v 1.18 2001/11/05 17:46:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -29,4 +29,4 @@ typedef IndexAttributeBitMapData *IndexAttributeBitMap;
*/
#define IndexAttributeBitMapIsValid(bits) PointerIsValid(bits)
#endif /* IBIT_H */
#endif /* IBIT_H */

View File

@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: iqual.h,v 1.17 2001/10/28 06:25:59 momjian Exp $
* $Id: iqual.h,v 1.18 2001/11/05 17:46:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -28,4 +28,4 @@ extern int NIndexTupleProcessed;
extern bool index_keytest(IndexTuple tuple, TupleDesc tupdesc,
int scanKeySize, ScanKey key);
#endif /* IQUAL_H */
#endif /* IQUAL_H */

View File

@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: istrat.h,v 1.22 2001/10/28 06:25:59 momjian Exp $
* $Id: istrat.h,v 1.23 2001/11/05 17:46:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -64,4 +64,4 @@ extern void IndexSupportInitialize(IndexStrategy indexStrategy,
StrategyNumber maxSupportNumber,
AttrNumber maxAttributeNumber);
#endif /* ISTRAT_H */
#endif /* ISTRAT_H */

View File

@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: itup.h,v 1.32 2001/10/25 05:49:55 momjian Exp $
* $Id: itup.h,v 1.33 2001/11/05 17:46:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -151,4 +151,4 @@ extern RetrieveIndexResult FormRetrieveIndexResult(ItemPointer indexItemPointer,
ItemPointer heapItemPointer);
extern void CopyIndexTuple(IndexTuple source, IndexTuple *target);
#endif /* ITUP_H */
#endif /* ITUP_H */

View File

@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: nbtree.h,v 1.58 2001/10/28 06:25:59 momjian Exp $
* $Id: nbtree.h,v 1.59 2001/11/05 17:46:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -399,4 +399,4 @@ extern void _bt_spooldestroy(BTSpool *btspool);
extern void _bt_spool(BTItem btitem, BTSpool *btspool);
extern void _bt_leafbuild(BTSpool *btspool, BTSpool *spool2);
#endif /* NBTREE_H */
#endif /* NBTREE_H */

View File

@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: printtup.h,v 1.17 2001/10/28 06:25:59 momjian Exp $
* $Id: printtup.h,v 1.18 2001/11/05 17:46:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -29,4 +29,4 @@ extern void spi_printtup(HeapTuple tuple, TupleDesc tupdesc,
extern bool getTypeOutputInfo(Oid type, Oid *typOutput, Oid *typElem,
bool *typIsVarlena);
#endif /* PRINTTUP_H */
#endif /* PRINTTUP_H */

View File

@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: relscan.h,v 1.24 2001/10/28 06:25:59 momjian Exp $
* $Id: relscan.h,v 1.25 2001/11/05 17:46:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -76,4 +76,4 @@ typedef IndexScanDesc *IndexScanDescPtr;
*/
#define IndexScanIsValid(scan) PointerIsValid(scan)
#endif /* RELSCAN_H */
#endif /* RELSCAN_H */

View File

@@ -3,7 +3,7 @@
*
* Resource managers definition
*
* $Id: rmgr.h,v 1.8 2001/10/28 06:25:59 momjian Exp $
* $Id: rmgr.h,v 1.9 2001/11/05 17:46:31 momjian Exp $
*/
#ifndef RMGR_H
#define RMGR_H
@@ -25,4 +25,4 @@ typedef uint8 RmgrId;
#define RM_SEQ_ID 15
#define RM_MAX_ID RM_SEQ_ID
#endif /* RMGR_H */
#endif /* RMGR_H */

View File

@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: rtree.h,v 1.26 2001/10/28 06:25:59 momjian Exp $
* $Id: rtree.h,v 1.27 2001/11/05 17:46:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -135,4 +135,4 @@ extern void AtEOXact_rtree(void);
extern RegProcedure RTMapOperator(Relation r, AttrNumber attnum,
RegProcedure proc);
#endif /* RTREE_H */
#endif /* RTREE_H */

View File

@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: rtscan.h,v 1.12 2001/10/28 06:25:59 momjian Exp $
* $Id: rtscan.h,v 1.13 2001/11/05 17:46:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -20,4 +20,4 @@
void rtadjscans(Relation r, int op, BlockNumber blkno, OffsetNumber offnum);
#endif /* RTSCAN_H */
#endif /* RTSCAN_H */

View File

@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: sdir.h,v 1.11 2001/10/28 06:25:59 momjian Exp $
* $Id: sdir.h,v 1.12 2001/11/05 17:46:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -55,4 +55,4 @@ typedef enum ScanDirection
#define ScanDirectionIsForward(direction) \
((bool) ((direction) == ForwardScanDirection))
#endif /* SDIR_H */
#endif /* SDIR_H */

View File

@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: skey.h,v 1.19 2001/10/28 06:25:59 momjian Exp $
* $Id: skey.h,v 1.20 2001/11/05 17:46:31 momjian Exp $
*
* Note:
* Needs more accessor/assignment routines.
@@ -48,4 +48,4 @@ extern void ScanKeyEntryInitializeWithInfo(ScanKey entry, bits16 flags,
AttrNumber attributeNumber, FmgrInfo *finfo,
MemoryContext mcxt, Datum argument);
#endif /* SKEY_H */
#endif /* SKEY_H */

View File

@@ -8,7 +8,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: strat.h,v 1.24 2001/10/28 06:25:59 momjian Exp $
* $Id: strat.h,v 1.25 2001/11/05 17:46:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -87,4 +87,4 @@ typedef struct IndexStrategyData
typedef IndexStrategyData *IndexStrategy;
#endif /* STRAT_H */
#endif /* STRAT_H */

View File

@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: transam.h,v 1.43 2001/10/28 06:25:59 momjian Exp $
* $Id: transam.h,v 1.44 2001/11/05 17:46:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -122,4 +122,4 @@ extern bool AMI_OVERRIDE;
/* in varsup.c */
extern VariableCache ShmemVariableCache;
#endif /* TRAMSAM_H */
#endif /* TRAMSAM_H */

View File

@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: tupdesc.h,v 1.32 2001/10/28 06:25:59 momjian Exp $
* $Id: tupdesc.h,v 1.33 2001/11/05 17:46:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -51,7 +51,7 @@ typedef struct tupleDesc
Form_pg_attribute *attrs;
/* attrs[N] is a pointer to the description of Attribute Number N+1. */
TupleConstr *constr;
} *TupleDesc;
} *TupleDesc;
extern TupleDesc CreateTemplateTupleDesc(int natts);
@@ -75,4 +75,4 @@ extern bool TupleDescInitEntry(TupleDesc desc,
extern TupleDesc BuildDescForRelation(List *schema, char *relname);
#endif /* TUPDESC_H */
#endif /* TUPDESC_H */

View File

@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: tupmacs.h,v 1.19 2001/10/28 06:25:59 momjian Exp $
* $Id: tupmacs.h,v 1.20 2001/11/05 17:46:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -90,7 +90,7 @@
: \
PointerGetDatum((char *) (T)) \
)
#endif /* SIZEOF_DATUM == 8 */
#endif /* SIZEOF_DATUM == 8 */
/*
* att_align aligns the given offset as needed for a datum of length attlen
@@ -178,6 +178,6 @@
break; \
} \
} while (0)
#endif /* SIZEOF_DATUM == 8 */
#endif /* SIZEOF_DATUM == 8 */
#endif

View File

@@ -6,7 +6,7 @@
*
* Copyright (c) 2000, PostgreSQL Development Team
*
* $Id: tuptoaster.h,v 1.12 2001/10/25 05:49:55 momjian Exp $
* $Id: tuptoaster.h,v 1.13 2001/11/05 17:46:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -115,4 +115,4 @@ extern Datum toast_compress_datum(Datum value);
*/
extern Size toast_raw_datum_size(Datum value);
#endif /* TUPTOASTER_H */
#endif /* TUPTOASTER_H */

View File

@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: valid.h,v 1.25 2001/10/28 06:25:59 momjian Exp $
* $Id: valid.h,v 1.26 2001/11/05 17:46:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -131,4 +131,4 @@ do \
} \
} while (0)
#endif /* VALID_H */
#endif /* VALID_H */

View File

@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: xact.h,v 1.40 2001/10/28 06:25:59 momjian Exp $
* $Id: xact.h,v 1.41 2001/11/05 17:46:31 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -135,4 +135,4 @@ extern Datum xidout(PG_FUNCTION_ARGS);
extern Datum xideq(PG_FUNCTION_ARGS);
extern Datum xid_age(PG_FUNCTION_ARGS);
#endif /* XACT_H */
#endif /* XACT_H */

View File

@@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: xlog.h,v 1.27 2001/10/28 06:25:59 momjian Exp $
* $Id: xlog.h,v 1.28 2001/11/05 17:46:31 momjian Exp $
*/
#ifndef XLOG_H
#define XLOG_H
@@ -216,4 +216,4 @@ extern XLogRecPtr GetUndoRecPtr(void);
extern bool check_xlog_sync_method(const char *method);
extern void assign_xlog_sync_method(const char *method);
#endif /* XLOG_H */
#endif /* XLOG_H */

View File

@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $Id: xlogdefs.h,v 1.6 2001/10/28 06:25:59 momjian Exp $
* $Id: xlogdefs.h,v 1.7 2001/11/05 17:46:31 momjian Exp $
*/
#ifndef XLOG_DEFS_H
#define XLOG_DEFS_H
@@ -56,4 +56,4 @@ typedef struct XLogRecPtr
*/
typedef uint32 StartUpID;
#endif /* XLOG_DEFS_H */
#endif /* XLOG_DEFS_H */