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

Another pgindent run. Fixes enum indenting, and improves #endif

spacing.  Also adds space for one-line comments.
This commit is contained in:
Bruce Momjian
2001-10-28 06:26:15 +00:00
parent c29797deeb
commit 6783b2372e
525 changed files with 2429 additions and 2049 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.13 2001/10/25 05:49:55 momjian Exp $
* $Id: attnum.h,v 1.14 2001/10/28 06:25:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -59,4 +59,5 @@ typedef int16 AttrNumber;
*/
#define AttrOffsetGetAttrNumber(attributeOffset) \
((AttrNumber) (1 + attributeOffset))
#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.3 2001/10/25 05:49:55 momjian Exp $
* $Id: clog.h,v 1.4 2001/10/28 06:25:59 momjian Exp $
*/
#ifndef CLOG_H
#define CLOG_H
@@ -46,4 +46,5 @@ extern void TruncateCLOG(TransactionId oldestXact);
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 */

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.28 2001/10/25 05:49:55 momjian Exp $
* $Id: genam.h,v 1.29 2001/10/28 06:25:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -63,4 +63,5 @@ extern struct FmgrInfo *index_getprocinfo(Relation irel, AttrNumber attnum,
extern IndexScanDesc RelationGetIndexScan(Relation relation, bool scanFromEnd,
uint16 numberOfKeys, ScanKey key);
extern void IndexScanEnd(IndexScanDesc scan);
#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.33 2001/10/25 05:49:55 momjian Exp $
* $Id: gist.h,v 1.34 2001/10/28 06:25:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -184,4 +184,5 @@ extern void gist_desc(char *buf, uint8 xl_info, char *rec);
/* gistget.c */
extern Datum gistgettuple(PG_FUNCTION_ARGS);
#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.17 2001/10/25 05:49:55 momjian Exp $
* $Id: gistscan.h,v 1.18 2001/10/28 06:25:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -23,4 +23,5 @@ extern Datum gistrestrpos(PG_FUNCTION_ARGS);
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 */

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.40 2001/10/25 05:49:55 momjian Exp $
* $Id: hash.h,v 1.41 2001/10/28 06:25:59 momjian Exp $
*
* NOTES
* modeled after Margo Seltzer's hash implementation for unix.
@@ -81,8 +81,8 @@ typedef struct HashPageOpaqueData
bits16 hasho_flag; /* is this page a bucket or ovfl */
Bucket hasho_bucket; /* bucket number this pg belongs to */
OverflowPageAddress hasho_oaddr; /* ovfl address of this ovfl pg */
BlockNumber hasho_nextblkno; /* next ovfl blkno */
BlockNumber hasho_prevblkno; /* previous ovfl (or bucket) blkno */
BlockNumber hasho_nextblkno; /* next ovfl blkno */
BlockNumber hasho_prevblkno; /* previous ovfl (or bucket) blkno */
} HashPageOpaqueData;
typedef HashPageOpaqueData *HashPageOpaque;
@@ -150,12 +150,12 @@ typedef struct HashMetaPageData
uint16 hashm_bshift; /* bucket shift */
uint16 hashm_bmsize; /* bitmap array size (bytes) - must be a
* power of 2 */
uint32 hashm_maxbucket; /* ID of maximum bucket in use */
uint32 hashm_maxbucket; /* ID of maximum bucket in use */
uint32 hashm_highmask; /* mask to modulo into entire table */
uint32 hashm_lowmask; /* mask to modulo into lower half of table */
uint32 hashm_ovflpoint;/* pageno. from which ovflpgs being
* allocated */
uint32 hashm_lastfreed; /* last ovflpage freed */
uint32 hashm_lastfreed; /* last ovflpage freed */
uint32 hashm_nmaps; /* Initial number of bitmaps */
uint32 hashm_spares[NCACHED]; /* spare pages available at
* splitpoints */
@@ -327,4 +327,5 @@ extern void _hash_checkpage(Page page, int flags);
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 */

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.69 2001/10/25 05:49:55 momjian Exp $
* $Id: heapam.h,v 1.70 2001/10/28 06:25:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -245,4 +245,5 @@ extern HeapTuple heap_addheader(int natts, Size structlen, void *structure);
/* in common/heap/stats.c */
extern void PrintHeapAccessStatistics(HeapAccessStatistics stats);
extern void initam(void);
#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.20 2001/10/25 05:49:55 momjian Exp $
* $Id: hio.h,v 1.21 2001/10/28 06:25:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -20,4 +20,5 @@ extern void RelationPutHeapTuple(Relation relation, Buffer buffer,
HeapTuple tuple);
extern Buffer RelationGetBufferForTuple(Relation relation, Size len,
Buffer otherBuffer);
#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.49 2001/10/25 05:49:55 momjian Exp $
* $Id: htup.h,v 1.50 2001/10/28 06:25:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -275,4 +275,5 @@ typedef HeapTupleData *HeapTuple;
#define HeapTupleHasExtended(tuple) \
((((HeapTuple)(tuple))->t_data->t_infomask & HEAP_HASEXTENDED) != 0)
#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.16 2001/10/25 05:49:55 momjian Exp $
* $Id: ibit.h,v 1.17 2001/10/28 06:25:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -28,4 +28,5 @@ typedef IndexAttributeBitMapData *IndexAttributeBitMap;
* True iff attribute bit map is valid.
*/
#define IndexAttributeBitMapIsValid(bits) PointerIsValid(bits)
#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.16 2001/10/25 05:49:55 momjian Exp $
* $Id: iqual.h,v 1.17 2001/10/28 06:25:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -27,4 +27,5 @@ extern int NIndexTupleProcessed;
extern bool index_keytest(IndexTuple tuple, TupleDesc tupdesc,
int scanKeySize, ScanKey key);
#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.21 2001/10/25 05:49:55 momjian Exp $
* $Id: istrat.h,v 1.22 2001/10/28 06:25:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -63,4 +63,5 @@ extern void IndexSupportInitialize(IndexStrategy indexStrategy,
StrategyNumber maxStrategyNumber,
StrategyNumber maxSupportNumber,
AttrNumber maxAttributeNumber);
#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: nbtree.h,v 1.57 2001/10/25 05:49:55 momjian Exp $
* $Id: nbtree.h,v 1.58 2001/10/28 06:25:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -44,11 +44,11 @@ typedef struct BTPageOpaqueData
typedef BTPageOpaqueData *BTPageOpaque;
/* Bits defined in btpo_flags */
#define BTP_LEAF (1 << 0)/* leaf page, if not internal page */
#define BTP_ROOT (1 << 1)/* root page (has no parent) */
#define BTP_FREE (1 << 2)/* page not in use */
#define BTP_META (1 << 3)/* meta-page */
#define BTP_REORDER (1 << 4)/* items need reordering */
#define BTP_LEAF (1 << 0) /* leaf page, if not internal page */
#define BTP_ROOT (1 << 1) /* root page (has no parent) */
#define BTP_FREE (1 << 2) /* page not in use */
#define BTP_META (1 << 3) /* meta-page */
#define BTP_REORDER (1 << 4) /* items need reordering */
/*
@@ -68,7 +68,7 @@ typedef struct BTMetaPageData
((BTMetaPageData *) &((PageHeader) p)->pd_linp[0])
#define BTREE_METAPAGE 0 /* first page is meta */
#define BTREE_MAGIC 0x053162/* magic number of btree pages */
#define BTREE_MAGIC 0x053162 /* magic number of btree pages */
#define BTreeInvalidParent(opaque) \
(opaque->btpo_parent == InvalidBlockNumber || \
@@ -223,14 +223,14 @@ typedef BTStackData *BTStack;
* XLOG allows to store some information in high 4 bits of log
* record xl_info field
*/
#define XLOG_BTREE_DELETE 0x00/* delete btitem */
#define XLOG_BTREE_INSERT 0x10/* add btitem without split */
#define XLOG_BTREE_SPLIT 0x20/* add btitem with split */
#define XLOG_BTREE_SPLEFT 0x30/* as above + flag that new btitem */
#define XLOG_BTREE_DELETE 0x00 /* delete btitem */
#define XLOG_BTREE_INSERT 0x10 /* add btitem without split */
#define XLOG_BTREE_SPLIT 0x20 /* add btitem with split */
#define XLOG_BTREE_SPLEFT 0x30 /* as above + flag that new btitem */
/* goes to the left sibling */
#define XLOG_BTREE_NEWROOT 0x40/* new root page */
#define XLOG_BTREE_NEWROOT 0x40 /* new root page */
#define XLOG_BTREE_LEAF 0x80/* leaf/internal page was changed */
#define XLOG_BTREE_LEAF 0x80 /* leaf/internal page was changed */
/*
* All what we need to find changed index tuple
@@ -398,4 +398,5 @@ extern BTSpool *_bt_spoolinit(Relation index, bool isunique);
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 */

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.16 2001/10/25 05:49:55 momjian Exp $
* $Id: printtup.h,v 1.17 2001/10/28 06:25:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -28,4 +28,5 @@ extern void spi_printtup(HeapTuple tuple, TupleDesc tupdesc,
extern bool getTypeOutputInfo(Oid type, Oid *typOutput, Oid *typElem,
bool *typIsVarlena);
#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.23 2001/10/25 05:49:55 momjian Exp $
* $Id: relscan.h,v 1.24 2001/10/28 06:25:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -75,4 +75,5 @@ typedef IndexScanDesc *IndexScanDescPtr;
* True iff the index scan is valid.
*/
#define IndexScanIsValid(scan) PointerIsValid(scan)
#endif /* RELSCAN_H */

View File

@@ -3,7 +3,7 @@
*
* Resource managers definition
*
* $Id: rmgr.h,v 1.7 2001/10/25 05:49:55 momjian Exp $
* $Id: rmgr.h,v 1.8 2001/10/28 06:25:59 momjian Exp $
*/
#ifndef RMGR_H
#define RMGR_H
@@ -24,4 +24,5 @@ typedef uint8 RmgrId;
#define RM_GIST_ID 14
#define RM_SEQ_ID 15
#define RM_MAX_ID RM_SEQ_ID
#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.25 2001/10/25 05:49:55 momjian Exp $
* $Id: rtree.h,v 1.26 2001/10/28 06:25:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -134,4 +134,5 @@ extern void AtEOXact_rtree(void);
/* rtstrat.c */
extern RegProcedure RTMapOperator(Relation r, AttrNumber attnum,
RegProcedure proc);
#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.11 2001/10/25 05:49:55 momjian Exp $
* $Id: rtscan.h,v 1.12 2001/10/28 06:25:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -19,4 +19,5 @@
#include "utils/rel.h"
void rtadjscans(Relation r, int op, BlockNumber blkno, OffsetNumber offnum);
#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.10 2001/10/25 05:49:55 momjian Exp $
* $Id: sdir.h,v 1.11 2001/10/28 06:25:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -21,9 +21,9 @@
*/
typedef enum ScanDirection
{
BackwardScanDirection = -1,
NoMovementScanDirection = 0,
ForwardScanDirection = 1
BackwardScanDirection = -1,
NoMovementScanDirection = 0,
ForwardScanDirection = 1
} ScanDirection;
/*
@@ -54,4 +54,5 @@ typedef enum ScanDirection
*/
#define ScanDirectionIsForward(direction) \
((bool) ((direction) == ForwardScanDirection))
#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.18 2001/10/25 05:49:55 momjian Exp $
* $Id: skey.h,v 1.19 2001/10/28 06:25:59 momjian Exp $
*
* Note:
* Needs more accessor/assignment routines.
@@ -47,4 +47,5 @@ extern void ScanKeyEntryInitialize(ScanKey entry, bits16 flags,
extern void ScanKeyEntryInitializeWithInfo(ScanKey entry, bits16 flags,
AttrNumber attributeNumber, FmgrInfo *finfo,
MemoryContext mcxt, Datum argument);
#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.23 2001/10/25 05:49:55 momjian Exp $
* $Id: strat.h,v 1.24 2001/10/28 06:25:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -86,4 +86,5 @@ typedef struct IndexStrategyData
} IndexStrategyData; /* VARIABLE LENGTH STRUCTURE */
typedef IndexStrategyData *IndexStrategy;
#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.42 2001/10/25 05:49:55 momjian Exp $
* $Id: transam.h,v 1.43 2001/10/28 06:25:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -121,4 +121,5 @@ extern bool AMI_OVERRIDE;
/* in varsup.c */
extern VariableCache ShmemVariableCache;
#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.31 2001/10/25 05:49:55 momjian Exp $
* $Id: tupdesc.h,v 1.32 2001/10/28 06:25:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -74,4 +74,5 @@ extern bool TupleDescInitEntry(TupleDesc desc,
bool attisset);
extern TupleDesc BuildDescForRelation(List *schema, char *relname);
#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.18 2001/10/25 05:49:55 momjian Exp $
* $Id: tupmacs.h,v 1.19 2001/10/28 06:25:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -179,4 +179,5 @@
} \
} while (0)
#endif /* SIZEOF_DATUM == 8 */
#endif

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.24 2001/10/25 05:49:55 momjian Exp $
* $Id: valid.h,v 1.25 2001/10/28 06:25:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -130,4 +130,5 @@ do \
(tuple)->t_data = NULL; \
} \
} while (0)
#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.39 2001/10/25 05:49:55 momjian Exp $
* $Id: xact.h,v 1.40 2001/10/28 06:25:59 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -134,4 +134,5 @@ extern Datum xidin(PG_FUNCTION_ARGS);
extern Datum xidout(PG_FUNCTION_ARGS);
extern Datum xideq(PG_FUNCTION_ARGS);
extern Datum xid_age(PG_FUNCTION_ARGS);
#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.26 2001/10/25 05:49:56 momjian Exp $
* $Id: xlog.h,v 1.27 2001/10/28 06:25:59 momjian Exp $
*/
#ifndef XLOG_H
#define XLOG_H
@@ -215,4 +215,5 @@ 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 */

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.5 2001/10/25 05:49:56 momjian Exp $
* $Id: xlogdefs.h,v 1.6 2001/10/28 06:25:59 momjian Exp $
*/
#ifndef XLOG_DEFS_H
#define XLOG_DEFS_H
@@ -55,4 +55,5 @@ typedef struct XLogRecPtr
* pg_clog after shutdown, in future.
*/
typedef uint32 StartUpID;
#endif /* XLOG_DEFS_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: xlogutils.h,v 1.9 2001/10/25 05:49:56 momjian Exp $
* $Id: xlogutils.h,v 1.10 2001/10/28 06:25:59 momjian Exp $
*/
#ifndef XLOG_UTILS_H
#define XLOG_UTILS_H
@@ -25,4 +25,5 @@ extern void XLogCloseRelationCache(void);
extern Relation XLogOpenRelation(bool redo, RmgrId rmid, RelFileNode rnode);
extern Buffer XLogReadBuffer(bool extend, Relation reln, BlockNumber blkno);
#endif