diff options
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/access/commit_ts.h | 2 | ||||
-rw-r--r-- | src/include/access/gin_private.h | 4 | ||||
-rw-r--r-- | src/include/access/hash.h | 2 | ||||
-rw-r--r-- | src/include/access/nbtxlog.h | 2 | ||||
-rw-r--r-- | src/include/access/xloginsert.h | 2 | ||||
-rw-r--r-- | src/include/catalog/catversion.h | 4 | ||||
-rw-r--r-- | src/include/commands/extension.h | 2 | ||||
-rw-r--r-- | src/include/commands/tablecmds.h | 2 | ||||
-rw-r--r-- | src/include/executor/execExpr.h | 2 | ||||
-rw-r--r-- | src/include/mb/pg_wchar.h | 2 | ||||
-rw-r--r-- | src/include/parser/parse_func.h | 4 | ||||
-rw-r--r-- | src/include/port/atomics.h | 2 | ||||
-rw-r--r-- | src/include/storage/itemptr.h | 4 | ||||
-rw-r--r-- | src/include/storage/off.h | 1 | ||||
-rw-r--r-- | src/include/storage/proc.h | 2 | ||||
-rw-r--r-- | src/include/utils/jsonapi.h | 2 |
16 files changed, 19 insertions, 20 deletions
diff --git a/src/include/access/commit_ts.h b/src/include/access/commit_ts.h index e22bfbf3e62..1433aa3ff7a 100644 --- a/src/include/access/commit_ts.h +++ b/src/include/access/commit_ts.h @@ -35,7 +35,7 @@ extern Size CommitTsShmemSize(void); extern void CommitTsShmemInit(void); extern void BootStrapCommitTs(void); extern void StartupCommitTs(void); -extern void CommitTsParameterChange(bool xlrecvalue, bool pgcontrolvalue); +extern void CommitTsParameterChange(bool newvalue, bool oldvalue); extern void CompleteCommitTsInitialization(void); extern void ShutdownCommitTs(void); extern void CheckPointCommitTs(void); diff --git a/src/include/access/gin_private.h b/src/include/access/gin_private.h index afb3e157216..78fcd826f18 100644 --- a/src/include/access/gin_private.h +++ b/src/include/access/gin_private.h @@ -54,7 +54,7 @@ typedef struct GinState bool oneCol; /* true if single-column index */ /* - * origTupDesc is the nominal tuple descriptor of the index, ie, the i'th + * origTupdesc is the nominal tuple descriptor of the index, ie, the i'th * attribute shows the key type (not the input data type!) of the i'th * index column. In a single-column index this describes the actual leaf * index tuples. In a multi-column index, the actual leaf tuples contain @@ -443,7 +443,7 @@ extern void ginInsertCleanup(GinState *ginstate, bool full_clean, /* ginpostinglist.c */ -extern GinPostingList *ginCompressPostingList(const ItemPointer ptrs, int nptrs, +extern GinPostingList *ginCompressPostingList(const ItemPointer ipd, int nipd, int maxsize, int *nwritten); extern int ginPostingListDecodeAllSegmentsToTbm(GinPostingList *ptr, int totalsize, TIDBitmap *tbm); diff --git a/src/include/access/hash.h b/src/include/access/hash.h index 107c3d01ae4..0d49f4253c5 100644 --- a/src/include/access/hash.h +++ b/src/include/access/hash.h @@ -252,7 +252,7 @@ typedef struct HashMetaPageData 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; /* splitpoint from which ovflpgs being + uint32 hashm_ovflpoint; /* splitpoint from which ovflpage being * allocated */ uint32 hashm_firstfree; /* lowest-number free ovflpage (bit#) */ uint32 hashm_nmaps; /* number of bitmap pages */ diff --git a/src/include/access/nbtxlog.h b/src/include/access/nbtxlog.h index 9beccc86eaf..afa614da252 100644 --- a/src/include/access/nbtxlog.h +++ b/src/include/access/nbtxlog.h @@ -259,4 +259,4 @@ extern void btree_desc(StringInfo buf, XLogReaderState *record); extern const char *btree_identify(uint8 info); extern void btree_mask(char *pagedata, BlockNumber blkno); -#endif /* NBXLOG_H */ +#endif /* NBTXLOG_H */ diff --git a/src/include/access/xloginsert.h b/src/include/access/xloginsert.h index df24089ea45..eeb0412b662 100644 --- a/src/include/access/xloginsert.h +++ b/src/include/access/xloginsert.h @@ -42,7 +42,7 @@ extern void XLogBeginInsert(void); extern void XLogSetRecordFlags(uint8 flags); extern XLogRecPtr XLogInsert(RmgrId rmid, uint8 info); -extern void XLogEnsureRecordSpace(int nbuffers, int ndatas); +extern void XLogEnsureRecordSpace(int max_block_id, int ndatas); extern void XLogRegisterData(char *data, int len); extern void XLogRegisterBuffer(uint8 block_id, Buffer buffer, uint8 flags); extern void XLogRegisterBlock(uint8 block_id, RelFileNode *rnode, diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h index 507b082acb4..80def7d4014 100644 --- a/src/include/catalog/catversion.h +++ b/src/include/catalog/catversion.h @@ -25,8 +25,8 @@ * * The rule for developers is: if you commit a change that requires * an initdb, you should update the catalog version number (as well as - * notifying the pghackers mailing list, which has been the informal - * practice for a long time). + * notifying the pgsql-hackers mailing list, which has been the + * informal practice for a long time). * * The catalog version number is placed here since modifying files in * include/catalog is the most common kind of initdb-forcing change. diff --git a/src/include/commands/extension.h b/src/include/commands/extension.h index c724430aeca..02fc17d7c09 100644 --- a/src/include/commands/extension.h +++ b/src/include/commands/extension.h @@ -43,7 +43,7 @@ extern ObjectAddress InsertExtensionTuple(const char *extName, Oid extOwner, extern ObjectAddress ExecAlterExtensionStmt(ParseState *pstate, AlterExtensionStmt *stmt); extern ObjectAddress ExecAlterExtensionContentsStmt(AlterExtensionContentsStmt *stmt, - ObjectAddress *objAddress); + ObjectAddress *objAddr); extern Oid get_extension_oid(const char *extname, bool missing_ok); extern char *get_extension_name(Oid ext_oid); diff --git a/src/include/commands/tablecmds.h b/src/include/commands/tablecmds.h index ac2bfaff1e4..9c25a805f29 100644 --- a/src/include/commands/tablecmds.h +++ b/src/include/commands/tablecmds.h @@ -87,7 +87,7 @@ extern void RangeVarCallbackOwnsTable(const RangeVar *relation, Oid relId, Oid oldRelId, void *arg); extern void RangeVarCallbackOwnsRelation(const RangeVar *relation, - Oid relId, Oid oldRelId, void *noCatalogs); + Oid relId, Oid oldRelId, void *arg); extern bool PartConstraintImpliedByRelConstraint(Relation scanrel, List *partConstraint); diff --git a/src/include/executor/execExpr.h b/src/include/executor/execExpr.h index 8e7f7c3d137..d21dbead0a2 100644 --- a/src/include/executor/execExpr.h +++ b/src/include/executor/execExpr.h @@ -576,7 +576,7 @@ typedef struct ExprEvalStep /* for EEOP_WINDOW_FUNC */ struct { - /* out-of-line state, modified by nodeWindowFunc.c */ + /* out-of-line state, modified by nodeWindowAgg.c */ WindowFuncExprState *wfstate; } window_func; diff --git a/src/include/mb/pg_wchar.h b/src/include/mb/pg_wchar.h index 0339b98041d..3e3e6c470e9 100644 --- a/src/include/mb/pg_wchar.h +++ b/src/include/mb/pg_wchar.h @@ -289,7 +289,7 @@ typedef enum pg_enc #define PG_ENCODING_BE_LAST PG_KOI8U /* - * Please use these tests before access to pg_encconv_tbl[] + * Please use these tests before access to pg_enc2name_tbl[] * or to other places... */ #define PG_VALID_BE_ENCODING(_enc) \ diff --git a/src/include/parser/parse_func.h b/src/include/parser/parse_func.h index d1ec2d97f21..5a3b287eaf0 100644 --- a/src/include/parser/parse_func.h +++ b/src/include/parser/parse_func.h @@ -11,8 +11,8 @@ * *------------------------------------------------------------------------- */ -#ifndef PARSER_FUNC_H -#define PARSER_FUNC_H +#ifndef PARSE_FUNC_H +#define PARSE_FUNC_H #include "catalog/namespace.h" #include "parser/parse_node.h" diff --git a/src/include/port/atomics.h b/src/include/port/atomics.h index f93009eff57..fab66f8e987 100644 --- a/src/include/port/atomics.h +++ b/src/include/port/atomics.h @@ -178,7 +178,7 @@ pg_atomic_init_flag(volatile pg_atomic_flag *ptr) } /* - * pg_atomic_test_and_set_flag - TAS() + * pg_atomic_test_set_flag - TAS() * * Returns true if the flag has successfully been set, false otherwise. * diff --git a/src/include/storage/itemptr.h b/src/include/storage/itemptr.h index 7eb274adac9..d73eed585e6 100644 --- a/src/include/storage/itemptr.h +++ b/src/include/storage/itemptr.h @@ -22,8 +22,8 @@ * * This is a pointer to an item within a disk page of a known file * (for example, a cross-link from an index to its parent table). - * blkid tells us which block, posid tells us which entry in the linp - * (ItemIdData) array we want. + * ip_blkid tells us which block, ip_posid tells us which entry in + * the linp (ItemIdData) array we want. * * Note: because there is an item pointer in each tuple header and index * tuple header on disk, it's very important not to waste space with diff --git a/src/include/storage/off.h b/src/include/storage/off.h index 82655d1466a..02e663f6ed7 100644 --- a/src/include/storage/off.h +++ b/src/include/storage/off.h @@ -26,7 +26,6 @@ typedef uint16 OffsetNumber; #define InvalidOffsetNumber ((OffsetNumber) 0) #define FirstOffsetNumber ((OffsetNumber) 1) #define MaxOffsetNumber ((OffsetNumber) (BLCKSZ / sizeof(ItemIdData))) -#define OffsetNumberMask (0xffff) /* valid uint16 bits */ /* ---------------- * support macros diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index ac7ee72952e..281e1db7259 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -332,4 +332,4 @@ extern PGPROC *AuxiliaryPidGetProc(int pid); extern void BecomeLockGroupLeader(void); extern bool BecomeLockGroupMember(PGPROC *leader, int pid); -#endif /* PROC_H */ +#endif /* _PROC_H_ */ diff --git a/src/include/utils/jsonapi.h b/src/include/utils/jsonapi.h index 5f4d479a7b2..1c56acca55a 100644 --- a/src/include/utils/jsonapi.h +++ b/src/include/utils/jsonapi.h @@ -94,7 +94,7 @@ typedef struct JsonSemAction } JsonSemAction; /* - * parse_json will parse the string in the lex calling the + * pg_parse_json will parse the string in the lex calling the * action functions in sem at the appropriate points. It is * up to them to keep what state they need in semstate. If they * need access to the state of the lexer, then its pointer |