diff options
Diffstat (limited to 'src')
348 files changed, 1655 insertions, 1637 deletions
diff --git a/src/backend/access/common/reloptions.c b/src/backend/access/common/reloptions.c index 6d1f22f049..a6adf6e637 100644 --- a/src/backend/access/common/reloptions.c +++ b/src/backend/access/common/reloptions.c @@ -1321,33 +1321,33 @@ default_reloptions(Datum reloptions, bool validate, relopt_kind kind) static const relopt_parse_elt tab[] = { {"fillfactor", RELOPT_TYPE_INT, offsetof(StdRdOptions, fillfactor)}, {"autovacuum_enabled", RELOPT_TYPE_BOOL, - offsetof(StdRdOptions, autovacuum) +offsetof(AutoVacOpts, enabled)}, + offsetof(StdRdOptions, autovacuum) + offsetof(AutoVacOpts, enabled)}, {"autovacuum_vacuum_threshold", RELOPT_TYPE_INT, - offsetof(StdRdOptions, autovacuum) +offsetof(AutoVacOpts, vacuum_threshold)}, + offsetof(StdRdOptions, autovacuum) + offsetof(AutoVacOpts, vacuum_threshold)}, {"autovacuum_analyze_threshold", RELOPT_TYPE_INT, - offsetof(StdRdOptions, autovacuum) +offsetof(AutoVacOpts, analyze_threshold)}, + offsetof(StdRdOptions, autovacuum) + offsetof(AutoVacOpts, analyze_threshold)}, {"autovacuum_vacuum_cost_delay", RELOPT_TYPE_INT, - offsetof(StdRdOptions, autovacuum) +offsetof(AutoVacOpts, vacuum_cost_delay)}, + offsetof(StdRdOptions, autovacuum) + offsetof(AutoVacOpts, vacuum_cost_delay)}, {"autovacuum_vacuum_cost_limit", RELOPT_TYPE_INT, - offsetof(StdRdOptions, autovacuum) +offsetof(AutoVacOpts, vacuum_cost_limit)}, + offsetof(StdRdOptions, autovacuum) + offsetof(AutoVacOpts, vacuum_cost_limit)}, {"autovacuum_freeze_min_age", RELOPT_TYPE_INT, - offsetof(StdRdOptions, autovacuum) +offsetof(AutoVacOpts, freeze_min_age)}, + offsetof(StdRdOptions, autovacuum) + offsetof(AutoVacOpts, freeze_min_age)}, {"autovacuum_freeze_max_age", RELOPT_TYPE_INT, - offsetof(StdRdOptions, autovacuum) +offsetof(AutoVacOpts, freeze_max_age)}, + offsetof(StdRdOptions, autovacuum) + offsetof(AutoVacOpts, freeze_max_age)}, {"autovacuum_freeze_table_age", RELOPT_TYPE_INT, - offsetof(StdRdOptions, autovacuum) +offsetof(AutoVacOpts, freeze_table_age)}, + offsetof(StdRdOptions, autovacuum) + offsetof(AutoVacOpts, freeze_table_age)}, {"autovacuum_multixact_freeze_min_age", RELOPT_TYPE_INT, - offsetof(StdRdOptions, autovacuum) +offsetof(AutoVacOpts, multixact_freeze_min_age)}, + offsetof(StdRdOptions, autovacuum) + offsetof(AutoVacOpts, multixact_freeze_min_age)}, {"autovacuum_multixact_freeze_max_age", RELOPT_TYPE_INT, - offsetof(StdRdOptions, autovacuum) +offsetof(AutoVacOpts, multixact_freeze_max_age)}, + offsetof(StdRdOptions, autovacuum) + offsetof(AutoVacOpts, multixact_freeze_max_age)}, {"autovacuum_multixact_freeze_table_age", RELOPT_TYPE_INT, - offsetof(StdRdOptions, autovacuum) +offsetof(AutoVacOpts, multixact_freeze_table_age)}, + offsetof(StdRdOptions, autovacuum) + offsetof(AutoVacOpts, multixact_freeze_table_age)}, {"log_autovacuum_min_duration", RELOPT_TYPE_INT, - offsetof(StdRdOptions, autovacuum) +offsetof(AutoVacOpts, log_min_duration)}, + offsetof(StdRdOptions, autovacuum) + offsetof(AutoVacOpts, log_min_duration)}, {"autovacuum_vacuum_scale_factor", RELOPT_TYPE_REAL, - offsetof(StdRdOptions, autovacuum) +offsetof(AutoVacOpts, vacuum_scale_factor)}, + offsetof(StdRdOptions, autovacuum) + offsetof(AutoVacOpts, vacuum_scale_factor)}, {"autovacuum_analyze_scale_factor", RELOPT_TYPE_REAL, - offsetof(StdRdOptions, autovacuum) +offsetof(AutoVacOpts, analyze_scale_factor)}, + offsetof(StdRdOptions, autovacuum) + offsetof(AutoVacOpts, analyze_scale_factor)}, {"user_catalog_table", RELOPT_TYPE_BOOL, offsetof(StdRdOptions, user_catalog_table)}, {"parallel_workers", RELOPT_TYPE_INT, diff --git a/src/backend/access/gin/ginarrayproc.c b/src/backend/access/gin/ginarrayproc.c index cc7435e030..a5238c3af5 100644 --- a/src/backend/access/gin/ginarrayproc.c +++ b/src/backend/access/gin/ginarrayproc.c @@ -113,7 +113,7 @@ ginqueryarrayextract(PG_FUNCTION_ARGS) case GinContainsStrategy: if (nelems > 0) *searchMode = GIN_SEARCH_MODE_DEFAULT; - else /* everything contains the empty set */ + else /* everything contains the empty set */ *searchMode = GIN_SEARCH_MODE_ALL; break; case GinContainedStrategy: diff --git a/src/backend/access/gin/gindatapage.c b/src/backend/access/gin/gindatapage.c index ad62d4e0e9..93ed3272ea 100644 --- a/src/backend/access/gin/gindatapage.c +++ b/src/backend/access/gin/gindatapage.c @@ -391,7 +391,7 @@ GinDataPageAddPostingItem(Page page, PostingItem *data, OffsetNumber offset) if (offset != maxoff + 1) memmove(ptr + sizeof(PostingItem), ptr, - (maxoff - offset + 1) *sizeof(PostingItem)); + (maxoff - offset + 1) * sizeof(PostingItem)); } memcpy(ptr, data, sizeof(PostingItem)); diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c index 8a3297924f..d89c192862 100644 --- a/src/backend/access/hash/hash.c +++ b/src/backend/access/hash/hash.c @@ -779,7 +779,7 @@ hashbucketcleanup(Relation rel, Bucket cur_bucket, Buffer bucket_buf, { BlockNumber blkno; Buffer buf; - Bucket new_bucket PG_USED_FOR_ASSERTS_ONLY = InvalidBucket; + Bucket new_bucket PG_USED_FOR_ASSERTS_ONLY = InvalidBucket; bool bucket_dirty = false; blkno = bucket_blkno; diff --git a/src/backend/access/hash/hash_xlog.c b/src/backend/access/hash/hash_xlog.c index 0ea11b2e74..429af11f4d 100644 --- a/src/backend/access/hash/hash_xlog.c +++ b/src/backend/access/hash/hash_xlog.c @@ -161,7 +161,7 @@ hash_xlog_add_ovfl_page(XLogReaderState *record) HashPageOpaque ovflopaque; uint32 *num_bucket; char *data; - Size datalen PG_USED_FOR_ASSERTS_ONLY; + Size datalen PG_USED_FOR_ASSERTS_ONLY; bool new_bmpage = false; XLogRecGetBlockTag(record, 0, NULL, NULL, &rightblk); @@ -293,7 +293,7 @@ hash_xlog_split_allocate_page(XLogReaderState *record) Buffer oldbuf; Buffer newbuf; Buffer metabuf; - Size datalen PG_USED_FOR_ASSERTS_ONLY; + Size datalen PG_USED_FOR_ASSERTS_ONLY; char *data; XLogRedoAction action; diff --git a/src/backend/access/hash/hashovfl.c b/src/backend/access/hash/hashovfl.c index b5133e3945..8468efee02 100644 --- a/src/backend/access/hash/hashovfl.c +++ b/src/backend/access/hash/hashovfl.c @@ -505,7 +505,7 @@ _hash_freeovflpage(Relation rel, Buffer bucketbuf, Buffer ovflbuf, uint32 ovflbitno; int32 bitmappage, bitmapbit; - Bucket bucket PG_USED_FOR_ASSERTS_ONLY; + Bucket bucket PG_USED_FOR_ASSERTS_ONLY; Buffer prevbuf = InvalidBuffer; Buffer nextbuf = InvalidBuffer; bool update_metap = false; diff --git a/src/backend/access/heap/rewriteheap.c b/src/backend/access/heap/rewriteheap.c index 60dcb67a20..e702af901e 100644 --- a/src/backend/access/heap/rewriteheap.c +++ b/src/backend/access/heap/rewriteheap.c @@ -149,12 +149,12 @@ typedef struct RewriteStateData bool rs_logical_rewrite; /* do we need to do logical rewriting */ TransactionId rs_oldest_xmin; /* oldest xmin used by caller to * determine tuple visibility */ - TransactionId rs_freeze_xid;/* Xid that will be used as freeze cutoff - * point */ + TransactionId rs_freeze_xid; /* Xid that will be used as freeze cutoff + * point */ TransactionId rs_logical_xmin; /* Xid that will be used as cutoff * point for logical rewrites */ - MultiXactId rs_cutoff_multi;/* MultiXactId that will be used as cutoff - * point for multixacts */ + MultiXactId rs_cutoff_multi; /* MultiXactId that will be used as cutoff + * point for multixacts */ MemoryContext rs_cxt; /* for hash tables and entries and tuples in * them */ XLogRecPtr rs_begin_lsn; /* XLogInsertLsn when starting the rewrite */ @@ -162,7 +162,7 @@ typedef struct RewriteStateData HTAB *rs_old_new_tid_map; /* unmatched B tuples */ HTAB *rs_logical_mappings; /* logical remapping files */ uint32 rs_num_rewrite_mappings; /* # in memory mappings */ -} RewriteStateData; +} RewriteStateData; /* * The lookup keys for the hash tables are tuple TID and xmin (we must check diff --git a/src/backend/access/heap/tuptoaster.c b/src/backend/access/heap/tuptoaster.c index aa5a45ded4..a2b3700750 100644 --- a/src/backend/access/heap/tuptoaster.c +++ b/src/backend/access/heap/tuptoaster.c @@ -69,13 +69,13 @@ typedef struct toast_compress_header static void toast_delete_datum(Relation rel, Datum value, bool is_speculative); static Datum toast_save_datum(Relation rel, Datum value, - struct varlena * oldexternal, int options); + struct varlena *oldexternal, int options); static bool toastrel_valueid_exists(Relation toastrel, Oid valueid); static bool toastid_valueid_exists(Oid toastrelid, Oid valueid); -static struct varlena *toast_fetch_datum(struct varlena * attr); -static struct varlena *toast_fetch_datum_slice(struct varlena * attr, +static struct varlena *toast_fetch_datum(struct varlena *attr); +static struct varlena *toast_fetch_datum_slice(struct varlena *attr, int32 sliceoffset, int32 length); -static struct varlena *toast_decompress_datum(struct varlena * attr); +static struct varlena *toast_decompress_datum(struct varlena *attr); static int toast_open_indexes(Relation toastrel, LOCKMODE lock, Relation **toastidxs, @@ -98,7 +98,7 @@ static void init_toast_snapshot(Snapshot toast_snapshot); * ---------- */ struct varlena * -heap_tuple_fetch_attr(struct varlena * attr) +heap_tuple_fetch_attr(struct varlena *attr) { struct varlena *result; @@ -169,7 +169,7 @@ heap_tuple_fetch_attr(struct varlena * attr) * ---------- */ struct varlena * -heap_tuple_untoast_attr(struct varlena * attr) +heap_tuple_untoast_attr(struct varlena *attr) { if (VARATT_IS_EXTERNAL_ONDISK(attr)) { @@ -255,7 +255,7 @@ heap_tuple_untoast_attr(struct varlena * attr) * ---------- */ struct varlena * -heap_tuple_untoast_attr_slice(struct varlena * attr, +heap_tuple_untoast_attr_slice(struct varlena *attr, int32 sliceoffset, int32 slicelength) { struct varlena *preslice; @@ -1468,7 +1468,7 @@ toast_get_valid_index(Oid toastoid, LOCKMODE lock) */ static Datum toast_save_datum(Relation rel, Datum value, - struct varlena * oldexternal, int options) + struct varlena *oldexternal, int options) { Relation toastrel; Relation *toastidxs; @@ -1873,7 +1873,7 @@ toastid_valueid_exists(Oid toastrelid, Oid valueid) * ---------- */ static struct varlena * -toast_fetch_datum(struct varlena * attr) +toast_fetch_datum(struct varlena *attr) { Relation toastrel; Relation *toastidxs; @@ -2044,7 +2044,7 @@ toast_fetch_datum(struct varlena * attr) * ---------- */ static struct varlena * -toast_fetch_datum_slice(struct varlena * attr, int32 sliceoffset, int32 length) +toast_fetch_datum_slice(struct varlena *attr, int32 sliceoffset, int32 length) { Relation toastrel; Relation *toastidxs; @@ -2276,7 +2276,7 @@ toast_fetch_datum_slice(struct varlena * attr, int32 sliceoffset, int32 length) * Decompress a compressed version of a varlena datum */ static struct varlena * -toast_decompress_datum(struct varlena * attr) +toast_decompress_datum(struct varlena *attr) { struct varlena *result; diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c index 116f5f32f6..5d7504040d 100644 --- a/src/backend/access/nbtree/nbtree.c +++ b/src/backend/access/nbtree/nbtree.c @@ -92,15 +92,15 @@ typedef enum typedef struct BTParallelScanDescData { BlockNumber btps_scanPage; /* latest or next page to be scanned */ - BTPS_State btps_pageStatus;/* indicates whether next page is available - * for scan. see above for possible states of - * parallel scan. */ + BTPS_State btps_pageStatus; /* indicates whether next page is + * available for scan. see above for + * possible states of parallel scan. */ int btps_arrayKeyCount; /* count indicating number of array * scan keys processed by parallel * scan */ slock_t btps_mutex; /* protects above variables */ ConditionVariable btps_cv; /* used to synchronize parallel scan */ -} BTParallelScanDescData; +} BTParallelScanDescData; typedef struct BTParallelScanDescData *BTParallelScanDesc; diff --git a/src/backend/access/spgist/spgdoinsert.c b/src/backend/access/spgist/spgdoinsert.c index 90c6534139..57d2612c47 100644 --- a/src/backend/access/spgist/spgdoinsert.c +++ b/src/backend/access/spgist/spgdoinsert.c @@ -765,7 +765,7 @@ doPickSplit(Relation index, SpGistState *state, /* we will delete the tuple altogether, so count full space */ spaceToDelete += it->size + sizeof(ItemIdData); } - else /* tuples on root should be live */ + else /* tuples on root should be live */ elog(ERROR, "unexpected SPGiST tuple state: %d", it->tupstate); } } @@ -2064,7 +2064,7 @@ spgdoinsert(Relation index, SpGistState *state, goto process_inner_tuple; } } - else /* non-leaf page */ + else /* non-leaf page */ { /* * Apply the opclass choose function to figure out how to insert diff --git a/src/backend/access/spgist/spgscan.c b/src/backend/access/spgist/spgscan.c index 2d96c0094e..9281050646 100644 --- a/src/backend/access/spgist/spgscan.c +++ b/src/backend/access/spgist/spgscan.c @@ -25,7 +25,7 @@ typedef void (*storeRes_func) (SpGistScanOpaque so, ItemPointer heapPtr, - Datum leafValue, bool isnull, bool recheck); + Datum leafValue, bool isnull, bool recheck); typedef struct ScanStackEntry { @@ -430,7 +430,7 @@ redirect: } } } - else /* page is inner */ + else /* page is inner */ { SpGistInnerTuple innerTuple; spgInnerConsistentIn in; diff --git a/src/backend/access/transam/parallel.c b/src/backend/access/transam/parallel.c index 16a0bee610..98793bda66 100644 --- a/src/backend/access/transam/parallel.c +++ b/src/backend/access/transam/parallel.c @@ -113,7 +113,7 @@ static const struct { const char *fn_name; parallel_worker_main_type fn_addr; -} InternalParallelWorkers[] = +} InternalParallelWorkers[] = { { diff --git a/src/backend/access/transam/slru.c b/src/backend/access/transam/slru.c index 7ae783102a..92966d3b10 100644 --- a/src/backend/access/transam/slru.c +++ b/src/backend/access/transam/slru.c @@ -340,7 +340,7 @@ SimpleLruWaitIO(SlruCtl ctl, int slotno) /* indeed, the I/O must have failed */ if (shared->page_status[slotno] == SLRU_PAGE_READ_IN_PROGRESS) shared->page_status[slotno] = SLRU_PAGE_EMPTY; - else /* write_in_progress */ + else /* write_in_progress */ { shared->page_status[slotno] = SLRU_PAGE_VALID; shared->page_dirty[slotno] = true; diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c index e9751aa2f6..957457c979 100644 --- a/src/backend/access/transam/twophase.c +++ b/src/backend/access/transam/twophase.c @@ -174,7 +174,7 @@ typedef struct GlobalTransactionData bool ondisk; /* TRUE if prepare state file is on disk */ bool inredo; /* TRUE if entry was added via xlog_redo */ char gid[GIDSIZE]; /* The GID assigned to the prepared xact */ -} GlobalTransactionData; +} GlobalTransactionData; /* * Two Phase Commit shared state. Access to this struct is protected @@ -948,7 +948,7 @@ static struct xllist uint32 num_chunks; uint32 bytes_free; /* free bytes left in tail block */ uint32 total_len; /* total data bytes in chain */ -} records; +} records; /* diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 70d2570dc2..e386df7315 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -4893,7 +4893,7 @@ XLOGShmemInit(void) /* WAL insertion locks. Ensure they're aligned to the full padded size */ allocptr += sizeof(WALInsertLockPadded) - - ((uintptr_t) allocptr) %sizeof(WALInsertLockPadded); + ((uintptr_t) allocptr) % sizeof(WALInsertLockPadded); WALInsertLocks = XLogCtl->Insert.WALInsertLocks = (WALInsertLockPadded *) allocptr; allocptr += sizeof(WALInsertLockPadded) * NUM_XLOGINSERT_LOCKS; @@ -8426,14 +8426,14 @@ LogCheckpointEnd(bool restartpoint) */ longest_secs = (long) (CheckpointStats.ckpt_longest_sync / 1000000); longest_usecs = CheckpointStats.ckpt_longest_sync - - (uint64) longest_secs *1000000; + (uint64) longest_secs * 1000000; average_sync_time = 0; if (CheckpointStats.ckpt_sync_rels > 0) average_sync_time = CheckpointStats.ckpt_agg_sync_time / CheckpointStats.ckpt_sync_rels; average_secs = (long) (average_sync_time / 1000000); - average_usecs = average_sync_time - (uint64) average_secs *1000000; + average_usecs = average_sync_time - (uint64) average_secs * 1000000; elog(LOG, "%s complete: wrote %d buffers (%.1f%%); " "%d WAL file(s) added, %d removed, %d recycled; " @@ -11448,7 +11448,7 @@ XLogPageRead(XLogReaderState *xlogreader, XLogRecPtr targetPagePtr, int reqLen, (XLogPageReadPrivate *) xlogreader->private_data; int emode = private->emode; uint32 targetPageOff; - XLogSegNo targetSegNo PG_USED_FOR_ASSERTS_ONLY; + XLogSegNo targetSegNo PG_USED_FOR_ASSERTS_ONLY; XLByteToSeg(targetPagePtr, targetSegNo); targetPageOff = targetPagePtr % XLogSegSize; diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c index 7a6da1e3c9..8a77444000 100644 --- a/src/backend/catalog/index.c +++ b/src/backend/catalog/index.c @@ -1937,7 +1937,7 @@ index_update_stats(Relation rel, if (rd_rel->relkind != RELKIND_INDEX) visibilitymap_count(rel, &relallvisible, NULL); - else /* don't bother for indexes */ + else /* don't bother for indexes */ relallvisible = 0; if (rd_rel->relpages != (int32) relpages) diff --git a/src/backend/catalog/partition.c b/src/backend/catalog/partition.c index 68fc12b50e..b9cca29ea3 100644 --- a/src/backend/catalog/partition.c +++ b/src/backend/catalog/partition.c @@ -80,9 +80,9 @@ typedef struct PartitionBoundInfoData int ndatums; /* Length of the datums following array */ Datum **datums; /* Array of datum-tuples with key->partnatts * datums each */ - RangeDatumContent **content;/* what's contained in each range bound datum? - * (see the above enum); NULL for list - * partitioned tables */ + RangeDatumContent **content; /* what's contained in each range bound + * datum? (see the above enum); NULL for + * list partitioned tables */ int *indexes; /* Partition indexes; one entry per member of * the datums array (plus one if range * partitioned table) */ diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index ae79a2ffbc..ff32d04189 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -2626,7 +2626,7 @@ CopyFrom(CopyState cstate) if (slot == NULL) /* "do nothing" */ skip_tuple = true; - else /* trigger might have changed tuple */ + else /* trigger might have changed tuple */ tuple = ExecMaterializeSlot(slot); } diff --git a/src/backend/commands/extension.c b/src/backend/commands/extension.c index e8126a38a9..91f9cac786 100644 --- a/src/backend/commands/extension.c +++ b/src/backend/commands/extension.c @@ -75,7 +75,8 @@ typedef struct ExtensionControlFile char *name; /* name of the extension */ char *directory; /* directory for script files */ char *default_version; /* default install target version, if any */ - char *module_pathname; /* string to substitute for MODULE_PATHNAME */ + char *module_pathname; /* string to substitute for + * MODULE_PATHNAME */ char *comment; /* comment, if any */ char *schema; /* target schema (allowed if !relocatable) */ bool relocatable; /* is ALTER EXTENSION SET SCHEMA supported? */ diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c index 02c740c13a..2e26090bf9 100644 --- a/src/backend/commands/functioncmds.c +++ b/src/backend/commands/functioncmds.c @@ -588,7 +588,7 @@ update_proconfig_value(ArrayType *a, List *set_items) if (valuestr) a = GUCArrayAdd(a, sstmt->name, valuestr); - else /* RESET */ + else /* RESET */ a = GUCArrayDelete(a, sstmt->name); } } diff --git a/src/backend/commands/publicationcmds.c b/src/backend/commands/publicationcmds.c index 8f06c23df9..9cfac4a6f9 100644 --- a/src/backend/commands/publicationcmds.c +++ b/src/backend/commands/publicationcmds.c @@ -330,7 +330,7 @@ AlterPublicationTables(AlterPublicationStmt *stmt, Relation rel, PublicationAddTables(pubid, rels, false, stmt); else if (stmt->tableAction == DEFELEM_DROP) PublicationDropTables(pubid, rels, false); - else /* DEFELEM_SET */ + else /* DEFELEM_SET */ { List *oldrelids = GetPublicationRelations(pubid); List *delrels = NIL; diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index b4425bc6af..758c876ef3 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -3187,7 +3187,7 @@ AlterTableGetLockLevel(List *cmds) * might miss data added to the new toast table by concurrent * insert transactions. */ - case AT_SetStorage:/* may add toast tables, see + case AT_SetStorage: /* may add toast tables, see * ATRewriteCatalogs() */ cmd_lockmode = AccessExclusiveLock; break; @@ -3197,27 +3197,27 @@ AlterTableGetLockLevel(List *cmds) * optimised assuming the constraint holds true. */ case AT_DropConstraint: /* as DROP INDEX */ - case AT_DropNotNull: /* may change some SQL plans */ + case AT_DropNotNull: /* may change some SQL plans */ cmd_lockmode = AccessExclusiveLock; break; /* * Subcommands that may be visible to concurrent SELECTs */ - case AT_DropColumn: /* change visible to SELECT */ + case AT_DropColumn: /* change visible to SELECT */ case AT_AddColumnToView: /* CREATE VIEW */ case AT_DropOids: /* calls AT_DropColumn */ case AT_EnableAlwaysRule: /* may change SELECT rules */ case AT_EnableReplicaRule: /* may change SELECT rules */ - case AT_EnableRule: /* may change SELECT rules */ - case AT_DisableRule: /* may change SELECT rules */ + case AT_EnableRule: /* may change SELECT rules */ + case AT_DisableRule: /* may change SELECT rules */ cmd_lockmode = AccessExclusiveLock; break; /* * Changing owner may remove implicit SELECT privileges */ - case AT_ChangeOwner: /* change visible to SELECT */ + case AT_ChangeOwner: /* change visible to SELECT */ cmd_lockmode = AccessExclusiveLock; break; @@ -3347,8 +3347,8 @@ AlterTableGetLockLevel(List *cmds) */ case AT_SetStatistics: /* Uses MVCC in getTableAttrs() */ case AT_ClusterOn: /* Uses MVCC in getIndexes() */ - case AT_DropCluster: /* Uses MVCC in getIndexes() */ - case AT_SetOptions: /* Uses MVCC in getTableAttrs() */ + case AT_DropCluster: /* Uses MVCC in getIndexes() */ + case AT_SetOptions: /* Uses MVCC in getTableAttrs() */ case AT_ResetOptions: /* Uses MVCC in getTableAttrs() */ cmd_lockmode = ShareUpdateExclusiveLock; break; @@ -3358,8 +3358,7 @@ AlterTableGetLockLevel(List *cmds) cmd_lockmode = AccessExclusiveLock; break; - case AT_ValidateConstraint: /* Uses MVCC in - * getConstraints() */ + case AT_ValidateConstraint: /* Uses MVCC in getConstraints() */ cmd_lockmode = ShareUpdateExclusiveLock; break; @@ -3469,8 +3468,7 @@ ATPrepCmd(List **wqueue, Relation rel, AlterTableCmd *cmd, /* Recursion occurs during execution phase */ pass = AT_PASS_ADD_COL; break; - case AT_AddColumnToView: /* add column via CREATE OR REPLACE - * VIEW */ + case AT_AddColumnToView: /* add column via CREATE OR REPLACE VIEW */ ATSimplePermissions(rel, ATT_VIEW); ATPrepAddColumn(wqueue, rel, recurse, recursing, true, cmd, lockmode); @@ -3561,7 +3559,7 @@ ATPrepCmd(List **wqueue, Relation rel, AlterTableCmd *cmd, /* No command-specific prep needed */ pass = AT_PASS_ADD_CONSTR; break; - case AT_DropConstraint: /* DROP CONSTRAINT */ + case AT_DropConstraint: /* DROP CONSTRAINT */ ATSimplePermissions(rel, ATT_TABLE | ATT_FOREIGN_TABLE); /* Recursion occurs during execution phase */ /* No command-specific prep needed except saving recurse flag */ @@ -3569,7 +3567,7 @@ ATPrepCmd(List **wqueue, Relation rel, AlterTableCmd *cmd, cmd->subtype = AT_DropConstraintRecurse; pass = AT_PASS_DROP; break; - case AT_AlterColumnType: /* ALTER COLUMN TYPE */ + case AT_AlterColumnType: /* ALTER COLUMN TYPE */ ATSimplePermissions(rel, ATT_TABLE | ATT_COMPOSITE_TYPE | ATT_FOREIGN_TABLE); /* Performs own recursion */ @@ -3644,7 +3642,7 @@ ATPrepCmd(List **wqueue, Relation rel, AlterTableCmd *cmd, pass = AT_PASS_MISC; /* doesn't actually matter */ break; case AT_SetRelOptions: /* SET (...) */ - case AT_ResetRelOptions: /* RESET (...) */ + case AT_ResetRelOptions: /* RESET (...) */ case AT_ReplaceRelOptions: /* reset them all, then set just these */ ATSimplePermissions(rel, ATT_TABLE | ATT_VIEW | ATT_MATVIEW | ATT_INDEX); /* This command never recurses */ @@ -3663,7 +3661,7 @@ ATPrepCmd(List **wqueue, Relation rel, AlterTableCmd *cmd, /* No command-specific prep needed */ pass = AT_PASS_MISC; break; - case AT_AlterConstraint: /* ALTER CONSTRAINT */ + case AT_AlterConstraint: /* ALTER CONSTRAINT */ ATSimplePermissions(rel, ATT_TABLE); pass = AT_PASS_MISC; break; @@ -3675,7 +3673,7 @@ ATPrepCmd(List **wqueue, Relation rel, AlterTableCmd *cmd, cmd->subtype = AT_ValidateConstraintRecurse; pass = AT_PASS_MISC; break; - case AT_ReplicaIdentity: /* REPLICA IDENTITY ... */ + case AT_ReplicaIdentity: /* REPLICA IDENTITY ... */ ATSimplePermissions(rel, ATT_TABLE | ATT_MATVIEW); pass = AT_PASS_MISC; /* This command never recurses */ @@ -3697,7 +3695,7 @@ ATPrepCmd(List **wqueue, Relation rel, AlterTableCmd *cmd, case AT_EnableReplicaRule: case AT_DisableRule: case AT_AddOf: /* OF */ - case AT_DropOf: /* NOT OF */ + case AT_DropOf: /* NOT OF */ case AT_EnableRowSecurity: case AT_DisableRowSecurity: case AT_ForceRowSecurity: @@ -3813,8 +3811,7 @@ ATExecCmd(List **wqueue, AlteredTableInfo *tab, Relation rel, switch (cmd->subtype) { case AT_AddColumn: /* ADD COLUMN */ - case AT_AddColumnToView: /* add column via CREATE OR REPLACE - * VIEW */ + case AT_AddColumnToView: /* add column via CREATE OR REPLACE VIEW */ address = ATExecAddColumn(wqueue, tab, rel, (ColumnDef *) cmd->def, false, false, false, false, lockmode); @@ -3882,8 +3879,7 @@ ATExecCmd(List **wqueue, AlteredTableInfo *tab, Relation rel, ATExecAddConstraint(wqueue, tab, rel, (Constraint *) cmd->def, true, false, lockmode); break; - case AT_ReAddConstraint: /* Re-add pre-existing check - * constraint */ + case AT_ReAddConstraint: /* Re-add pre-existing check constraint */ address = ATExecAddConstraint(wqueue, tab, rel, (Constraint *) cmd->def, true, true, lockmode); @@ -3895,7 +3891,7 @@ ATExecCmd(List **wqueue, AlteredTableInfo *tab, Relation rel, address = ATExecAddIndexConstraint(tab, rel, (IndexStmt *) cmd->def, lockmode); break; - case AT_AlterConstraint: /* ALTER CONSTRAINT */ + case AT_AlterConstraint: /* ALTER CONSTRAINT */ address = ATExecAlterConstraint(rel, cmd, false, false, lockmode); break; case AT_ValidateConstraint: /* VALIDATE CONSTRAINT */ @@ -3907,7 +3903,7 @@ ATExecCmd(List **wqueue, AlteredTableInfo *tab, Relation rel, address = ATExecValidateConstraint(rel, cmd->name, true, false, lockmode); break; - case AT_DropConstraint: /* DROP CONSTRAINT */ + case AT_DropConstraint: /* DROP CONSTRAINT */ ATExecDropConstraint(rel, cmd->name, cmd->behavior, false, false, cmd->missing_ok, lockmode); @@ -3917,7 +3913,7 @@ ATExecCmd(List **wqueue, AlteredTableInfo *tab, Relation rel, true, false, cmd->missing_ok, lockmode); break; - case AT_AlterColumnType: /* ALTER COLUMN TYPE */ + case AT_AlterColumnType: /* ALTER COLUMN TYPE */ address = ATExecAlterColumnType(tab, rel, cmd, lockmode); break; case AT_AlterColumnGenericOptions: /* ALTER COLUMN OPTIONS */ @@ -3947,7 +3943,7 @@ ATExecCmd(List **wqueue, AlteredTableInfo *tab, Relation rel, true, false, false, cmd->missing_ok, lockmode); break; - case AT_AddOidsRecurse: /* SET WITH OIDS */ + case AT_AddOidsRecurse: /* SET WITH OIDS */ /* Use the ADD COLUMN code, unless prep decided to do nothing */ if (cmd->def != NULL) address = @@ -3969,7 +3965,7 @@ ATExecCmd(List **wqueue, AlteredTableInfo *tab, Relation rel, */ break; case AT_SetRelOptions: /* SET (...) */ - case AT_ResetRelOptions: /* RESET (...) */ + case AT_ResetRelOptions: /* RESET (...) */ case AT_ReplaceRelOptions: /* replace entire option list */ ATExecSetRelOptions(rel, (List *) cmd->def, cmd->subtype, lockmode); break; @@ -3993,15 +3989,15 @@ ATExecCmd(List **wqueue, AlteredTableInfo *tab, Relation rel, ATExecEnableDisableTrigger(rel, NULL, TRIGGER_FIRES_ON_ORIGIN, false, lockmode); break; - case AT_DisableTrigAll: /* DISABLE TRIGGER ALL */ + case AT_DisableTrigAll: /* DISABLE TRIGGER ALL */ ATExecEnableDisableTrigger(rel, NULL, TRIGGER_DISABLED, false, lockmode); break; - case AT_EnableTrigUser: /* ENABLE TRIGGER USER */ + case AT_EnableTrigUser: /* ENABLE TRIGGER USER */ ATExecEnableDisableTrigger(rel, NULL, TRIGGER_FIRES_ON_ORIGIN, true, lockmode); break; - case AT_DisableTrigUser: /* DISABLE TRIGGER USER */ + case AT_DisableTrigUser: /* DISABLE TRIGGER USER */ ATExecEnableDisableTrigger(rel, NULL, TRIGGER_DISABLED, true, lockmode); break; diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c index 0271788bf9..d7ed71f767 100644 --- a/src/backend/commands/trigger.c +++ b/src/backend/commands/trigger.c @@ -3049,7 +3049,7 @@ TriggerEnabled(EState *estate, ResultRelInfo *relinfo, trigger->tgenabled == TRIGGER_DISABLED) return false; } - else /* ORIGIN or LOCAL role */ + else /* ORIGIN or LOCAL role */ { if (trigger->tgenabled == TRIGGER_FIRES_ON_REPLICA || trigger->tgenabled == TRIGGER_DISABLED) @@ -3290,13 +3290,13 @@ typedef struct AfterTriggerEventDataOneCtid { TriggerFlags ate_flags; /* status bits and offset to shared data */ ItemPointerData ate_ctid1; /* inserted, deleted, or old updated tuple */ -} AfterTriggerEventDataOneCtid; +} AfterTriggerEventDataOneCtid; /* AfterTriggerEventData, minus ate_ctid1 and ate_ctid2 */ typedef struct AfterTriggerEventDataZeroCtids { TriggerFlags ate_flags; /* status bits and offset to shared data */ -} AfterTriggerEventDataZeroCtids; +} AfterTriggerEventDataZeroCtids; #define SizeofTriggerEvent(evt) \ (((evt)->ate_flags & AFTER_TRIGGER_TUP_BITS) == AFTER_TRIGGER_2CTID ? \ diff --git a/src/backend/commands/vacuumlazy.c b/src/backend/commands/vacuumlazy.c index fc9c4f0fb1..153a360861 100644 --- a/src/backend/commands/vacuumlazy.c +++ b/src/backend/commands/vacuumlazy.c @@ -363,10 +363,10 @@ lazy_vacuum_rel(Relation onerel, int options, VacuumParams *params, write_rate = 0; if ((secs > 0) || (usecs > 0)) { - read_rate = (double) BLCKSZ *VacuumPageMiss / (1024 * 1024) / - (secs + usecs / 1000000.0); - write_rate = (double) BLCKSZ *VacuumPageDirty / (1024 * 1024) / - (secs + usecs / 1000000.0); + read_rate = (double) BLCKSZ * VacuumPageMiss / (1024 * 1024) / + (secs + usecs / 1000000.0); + write_rate = (double) BLCKSZ * VacuumPageDirty / (1024 * 1024) / + (secs + usecs / 1000000.0); } /* diff --git a/src/backend/executor/execCurrent.c b/src/backend/executor/execCurrent.c index 3af4a90b51..f00fce5913 100644 --- a/src/backend/executor/execCurrent.c +++ b/src/backend/executor/execCurrent.c @@ -151,7 +151,7 @@ execCurrentOf(CurrentOfExpr *cexpr, { ScanState *scanstate; bool lisnull; - Oid tuple_tableoid PG_USED_FOR_ASSERTS_ONLY; + Oid tuple_tableoid PG_USED_FOR_ASSERTS_ONLY; ItemPointer tuple_tid; /* diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c index 89aea2fe5c..f15ff64a3b 100644 --- a/src/backend/executor/functions.c +++ b/src/backend/executor/functions.c @@ -140,7 +140,7 @@ typedef struct SQLFunctionParseInfo char **argnames; /* names of input arguments; NULL if none */ /* Note that argnames[i] can be NULL, if some args are unnamed */ Oid collation; /* function's input collation, if known */ -} SQLFunctionParseInfo; +} SQLFunctionParseInfo; /* non-export function prototypes */ diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c index 7eeda95af7..96cdfb7ad2 100644 --- a/src/backend/executor/nodeAgg.c +++ b/src/backend/executor/nodeAgg.c @@ -391,7 +391,7 @@ typedef struct AggStatePerTransData FunctionCallInfoData serialfn_fcinfo; FunctionCallInfoData deserialfn_fcinfo; -} AggStatePerTransData; +} AggStatePerTransData; /* * AggStatePerAggData - per-aggregate information @@ -439,7 +439,7 @@ typedef struct AggStatePerAggData int16 resulttypeLen; bool resulttypeByVal; -} AggStatePerAggData; +} AggStatePerAggData; /* * AggStatePerGroupData - per-aggregate-per-group working state @@ -471,7 +471,7 @@ typedef struct AggStatePerGroupData * NULL and not auto-replace it with a later input value. Only the first * non-NULL input will be auto-substituted. */ -} AggStatePerGroupData; +} AggStatePerGroupData; /* * AggStatePerPhaseData - per-grouping-set-phase state @@ -493,7 +493,7 @@ typedef struct AggStatePerPhaseData FmgrInfo *eqfunctions; /* per-grouping-field equality fns */ Agg *aggnode; /* Agg node for phase data */ Sort *sortnode; /* Sort node for input ordering for phase */ -} AggStatePerPhaseData; +} AggStatePerPhaseData; /* * AggStatePerHashData - per-hashtable state @@ -515,7 +515,7 @@ typedef struct AggStatePerHashData AttrNumber *hashGrpColIdxInput; /* hash col indices in input slot */ AttrNumber *hashGrpColIdxHash; /* indices in hashtbl tuples */ Agg *aggnode; /* original Agg node, for numGroups etc. */ -} AggStatePerHashData; +} AggStatePerHashData; static void select_current_set(AggState *aggstate, int setno, bool is_hash); diff --git a/src/backend/executor/nodeHashjoin.c b/src/backend/executor/nodeHashjoin.c index f9ab0d6035..907090395c 100644 --- a/src/backend/executor/nodeHashjoin.c +++ b/src/backend/executor/nodeHashjoin.c @@ -687,7 +687,7 @@ ExecHashJoinNewBatch(HashJoinState *hjstate) BufFileClose(hashtable->outerBatchFile[curbatch]); hashtable->outerBatchFile[curbatch] = NULL; } - else /* we just finished the first batch */ + else /* we just finished the first batch */ { /* * Reset some of the skew optimization state variables, since we no diff --git a/src/backend/executor/nodeMaterial.c b/src/backend/executor/nodeMaterial.c index aa5d2529f4..32b7269cda 100644 --- a/src/backend/executor/nodeMaterial.c +++ b/src/backend/executor/nodeMaterial.c @@ -66,7 +66,7 @@ ExecMaterial(MaterialState *node) * Allocate a second read pointer to serve as the mark. We know it * must have index 1, so needn't store that. */ - int ptrno PG_USED_FOR_ASSERTS_ONLY; + int ptrno PG_USED_FOR_ASSERTS_ONLY; ptrno = tuplestore_alloc_read_pointer(tuplestorestate, node->eflags); diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c index 572e9dce94..336270f02a 100644 --- a/src/backend/executor/nodeMergejoin.c +++ b/src/backend/executor/nodeMergejoin.c @@ -137,7 +137,7 @@ typedef struct MergeJoinClauseData * stored here. */ SortSupportData ssup; -} MergeJoinClauseData; +} MergeJoinClauseData; /* Result type for MJEvalOuterValues and MJEvalInnerValues */ typedef enum @@ -216,7 +216,7 @@ MJExamineQuals(List *mergeclauses, clause->ssup.ssup_reverse = false; else if (opstrategy == BTGreaterStrategyNumber) clause->ssup.ssup_reverse = true; - else /* planner screwed up */ + else /* planner screwed up */ elog(ERROR, "unsupported mergejoin strategy %d", opstrategy); clause->ssup.ssup_nulls_first = nulls_first; diff --git a/src/backend/executor/nodeProjectSet.c b/src/backend/executor/nodeProjectSet.c index 2f0a4e647b..01048cc826 100644 --- a/src/backend/executor/nodeProjectSet.c +++ b/src/backend/executor/nodeProjectSet.c @@ -120,7 +120,7 @@ ExecProjectSRF(ProjectSetState *node, bool continuing) { TupleTableSlot *resultSlot = node->ps.ps_ResultTupleSlot; ExprContext *econtext = node->ps.ps_ExprContext; - bool hassrf PG_USED_FOR_ASSERTS_ONLY; + bool hassrf PG_USED_FOR_ASSERTS_ONLY; bool hasresult; int argno; diff --git a/src/backend/executor/nodeSetOp.c b/src/backend/executor/nodeSetOp.c index 9ae53bb8a7..0fb5615da3 100644 --- a/src/backend/executor/nodeSetOp.c +++ b/src/backend/executor/nodeSetOp.c @@ -64,7 +64,7 @@ typedef struct SetOpStatePerGroupData { long numLeft; /* number of left-input dups in group */ long numRight; /* number of right-input dups in group */ -} SetOpStatePerGroupData; +} SetOpStatePerGroupData; static TupleTableSlot *setop_retrieve_direct(SetOpState *setopstate); @@ -333,7 +333,7 @@ setop_fill_hash_table(SetOpState *setopstate) SetOp *node = (SetOp *) setopstate->ps.plan; PlanState *outerPlan; int firstFlag; - bool in_first_rel PG_USED_FOR_ASSERTS_ONLY; + bool in_first_rel PG_USED_FOR_ASSERTS_ONLY; /* * get state info from node diff --git a/src/backend/executor/nodeWindowAgg.c b/src/backend/executor/nodeWindowAgg.c index 628bc9f00b..433d97c8b4 100644 --- a/src/backend/executor/nodeWindowAgg.c +++ b/src/backend/executor/nodeWindowAgg.c @@ -95,7 +95,7 @@ typedef struct WindowStatePerFuncData int aggno; /* if so, index of its PerAggData */ WindowObject winobj; /* object used in window function API */ -} WindowStatePerFuncData; +} WindowStatePerFuncData; /* * For plain aggregate window functions, we also have one of these. diff --git a/src/backend/lib/binaryheap.c b/src/backend/lib/binaryheap.c index 9f99e77db0..ce4331ccde 100644 --- a/src/backend/lib/binaryheap.c +++ b/src/backend/lib/binaryheap.c @@ -35,7 +35,7 @@ binaryheap_allocate(int capacity, binaryheap_comparator compare, void *arg) int sz; binaryheap *heap; - sz = offsetof(binaryheap, bh_nodes) +sizeof(Datum) * capacity; + sz = offsetof(binaryheap, bh_nodes) + sizeof(Datum) * capacity; heap = (binaryheap *) palloc(sz); heap->bh_space = capacity; heap->bh_compare = compare; diff --git a/src/backend/lib/ilist.c b/src/backend/lib/ilist.c index 720cecb0e7..a108cd150b 100644 --- a/src/backend/lib/ilist.c +++ b/src/backend/lib/ilist.c @@ -32,7 +32,7 @@ slist_delete(slist_head *head, slist_node *node) { slist_node *last = &head->head; slist_node *cur; - bool found PG_USED_FOR_ASSERTS_ONLY = false; + bool found PG_USED_FOR_ASSERTS_ONLY = false; while ((cur = last->next) != NULL) { diff --git a/src/backend/lib/rbtree.c b/src/backend/lib/rbtree.c index cdf8a73aa5..3d80090a8c 100644 --- a/src/backend/lib/rbtree.c +++ b/src/backend/lib/rbtree.c @@ -429,7 +429,7 @@ rb_insert(RBTree *rb, const RBNode *data, bool *isNew) */ *isNew = true; - x = rb->allocfunc (rb->arg); + x = rb->allocfunc(rb->arg); x->color = RBRED; @@ -624,7 +624,7 @@ rb_delete_node(RBTree *rb, RBNode *z) /* Now we can recycle the y node */ if (rb->freefunc) - rb->freefunc (y, rb->arg); + rb->freefunc(y, rb->arg); } /* @@ -808,7 +808,7 @@ loop: iter->next_step = NextStepLeft; goto loop; } - else /* not moved - return current, then go up */ + else /* not moved - return current, then go up */ iter->next_step = NextStepUp; break; diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c index 081c06a1e6..28893d3519 100644 --- a/src/backend/libpq/auth.c +++ b/src/backend/libpq/auth.c @@ -92,8 +92,8 @@ static int auth_peer(hbaPort *port); #define PGSQL_PAM_SERVICE "postgresql" /* Service name passed to PAM */ static int CheckPAMAuth(Port *port, char *user, char *password); -static int pam_passwd_conv_proc(int num_msg, const struct pam_message ** msg, - struct pam_response ** resp, void *appdata_ptr); +static int pam_passwd_conv_proc(int num_msg, const struct pam_message **msg, + struct pam_response **resp, void *appdata_ptr); static struct pam_conv pam_passw_conv = { &pam_passwd_conv_proc, @@ -132,11 +132,11 @@ static int CheckBSDAuth(Port *port, char *user); /* Correct header from the Platform SDK */ typedef ULONG (*__ldap_start_tls_sA) ( - IN PLDAP ExternalHandle, - OUT PULONG ServerReturnValue, - OUT LDAPMessage **result, - IN PLDAPControlA * ServerControls, - IN PLDAPControlA * ClientControls + IN PLDAP ExternalHandle, + OUT PULONG ServerReturnValue, + OUT LDAPMessage **result, + IN PLDAPControlA * ServerControls, + IN PLDAPControlA * ClientControls ); #endif @@ -182,7 +182,7 @@ static int pg_GSS_recvauth(Port *port); #ifdef ENABLE_SSPI typedef SECURITY_STATUS (WINAPI * QUERY_SECURITY_CONTEXT_TOKEN_FN) ( - PCtxtHandle, void **); + PCtxtHandle, void **); static int pg_SSPI_recvauth(Port *port); static int pg_SSPI_make_upn(char *accountname, size_t accountnamesize, @@ -1337,6 +1337,7 @@ pg_SSPI_recvauth(Port *port) DWORD domainnamesize = sizeof(domainname); SID_NAME_USE accountnameuse; HMODULE secur32; + QUERY_SECURITY_CONTEXT_TOKEN_FN _QuerySecurityContextToken; /* @@ -2023,8 +2024,8 @@ auth_peer(hbaPort *port) */ static int -pam_passwd_conv_proc(int num_msg, const struct pam_message ** msg, - struct pam_response ** resp, void *appdata_ptr) +pam_passwd_conv_proc(int num_msg, const struct pam_message **msg, + struct pam_response **resp, void *appdata_ptr) { char *passwd; struct pam_response *reply; @@ -2919,7 +2920,7 @@ PerformRadiusTransaction(char *server, char *secret, char *portstr, char *identi addrsize = sizeof(struct sockaddr_in); #endif - if (bind(sock, (struct sockaddr *) & localaddr, addrsize)) + if (bind(sock, (struct sockaddr *) &localaddr, addrsize)) { ereport(LOG, (errmsg("could not bind local RADIUS socket: %m"))); @@ -3010,7 +3011,7 @@ PerformRadiusTransaction(char *server, char *secret, char *portstr, char *identi addrsize = sizeof(remoteaddr); packetlength = recvfrom(sock, receive_buffer, RADIUS_BUFFER_SIZE, 0, - (struct sockaddr *) & remoteaddr, &addrsize); + (struct sockaddr *) &remoteaddr, &addrsize); if (packetlength < 0) { ereport(LOG, diff --git a/src/backend/libpq/be-fsstubs.c b/src/backend/libpq/be-fsstubs.c index 2cb6039385..9033dd4da8 100644 --- a/src/backend/libpq/be-fsstubs.c +++ b/src/backend/libpq/be-fsstubs.c @@ -766,7 +766,7 @@ lo_get_fragment_internal(Oid loOid, int64 offset, int32 nbytes) LargeObjectDesc *loDesc; int64 loSize; int64 result_length; - int total_read PG_USED_FOR_ASSERTS_ONLY; + int total_read PG_USED_FOR_ASSERTS_ONLY; bytea *result = NULL; /* @@ -868,7 +868,7 @@ be_lo_from_bytea(PG_FUNCTION_ARGS) Oid loOid = PG_GETARG_OID(0); bytea *str = PG_GETARG_BYTEA_PP(1); LargeObjectDesc *loDesc; - int written PG_USED_FOR_ASSERTS_ONLY; + int written PG_USED_FOR_ASSERTS_ONLY; CreateFSContext(); @@ -891,7 +891,7 @@ be_lo_put(PG_FUNCTION_ARGS) int64 offset = PG_GETARG_INT64(1); bytea *str = PG_GETARG_BYTEA_PP(2); LargeObjectDesc *loDesc; - int written PG_USED_FOR_ASSERTS_ONLY; + int written PG_USED_FOR_ASSERTS_ONLY; CreateFSContext(); diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c index 823880ebff..4532434140 100644 --- a/src/backend/libpq/hba.c +++ b/src/backend/libpq/hba.c @@ -646,7 +646,7 @@ check_db(const char *dbname, const char *role, Oid roleid, List *tokens) } static bool -ipv4eq(struct sockaddr_in * a, struct sockaddr_in * b) +ipv4eq(struct sockaddr_in *a, struct sockaddr_in *b) { return (a->sin_addr.s_addr == b->sin_addr.s_addr); } @@ -654,7 +654,7 @@ ipv4eq(struct sockaddr_in * a, struct sockaddr_in * b) #ifdef HAVE_IPV6 static bool -ipv6eq(struct sockaddr_in6 * a, struct sockaddr_in6 * b) +ipv6eq(struct sockaddr_in6 *a, struct sockaddr_in6 *b) { int i; @@ -747,7 +747,7 @@ check_hostname(hbaPort *port, const char *hostname) if (gai->ai_addr->sa_family == AF_INET) { if (ipv4eq((struct sockaddr_in *) gai->ai_addr, - (struct sockaddr_in *) & port->raddr.addr)) + (struct sockaddr_in *) &port->raddr.addr)) { found = true; break; @@ -757,7 +757,7 @@ check_hostname(hbaPort *port, const char *hostname) else if (gai->ai_addr->sa_family == AF_INET6) { if (ipv6eq((struct sockaddr_in6 *) gai->ai_addr, - (struct sockaddr_in6 *) & port->raddr.addr)) + (struct sockaddr_in6 *) &port->raddr.addr)) { found = true; break; @@ -783,7 +783,7 @@ check_hostname(hbaPort *port, const char *hostname) * Check to see if a connecting IP matches the given address and netmask. */ static bool -check_ip(SockAddr *raddr, struct sockaddr * addr, struct sockaddr * mask) +check_ip(SockAddr *raddr, struct sockaddr *addr, struct sockaddr *mask) { if (raddr->addr.ss_family == addr->sa_family && pg_range_sockaddr(&raddr->addr, @@ -797,7 +797,7 @@ check_ip(SockAddr *raddr, struct sockaddr * addr, struct sockaddr * mask) * pg_foreach_ifaddr callback: does client addr match this machine interface? */ static void -check_network_callback(struct sockaddr * addr, struct sockaddr * netmask, +check_network_callback(struct sockaddr *addr, struct sockaddr *netmask, void *cb_data) { check_network_data *cn = (check_network_data *) cb_data; @@ -811,7 +811,7 @@ check_network_callback(struct sockaddr * addr, struct sockaddr * netmask, { /* Make an all-ones netmask of appropriate length for family */ pg_sockaddr_cidr_mask(&mask, NULL, addr->sa_family); - cn->result = check_ip(cn->raddr, addr, (struct sockaddr *) & mask); + cn->result = check_ip(cn->raddr, addr, (struct sockaddr *) &mask); } else { @@ -2041,8 +2041,8 @@ check_hba(hbaPort *port) else { if (!check_ip(&port->raddr, - (struct sockaddr *) & hba->addr, - (struct sockaddr *) & hba->mask)) + (struct sockaddr *) &hba->addr, + (struct sockaddr *) &hba->mask)) continue; } break; diff --git a/src/backend/libpq/ifaddr.c b/src/backend/libpq/ifaddr.c index 10643978c7..b5f3243410 100644 --- a/src/backend/libpq/ifaddr.c +++ b/src/backend/libpq/ifaddr.c @@ -32,14 +32,14 @@ #include "libpq/ifaddr.h" -static int range_sockaddr_AF_INET(const struct sockaddr_in * addr, - const struct sockaddr_in * netaddr, - const struct sockaddr_in * netmask); +static int range_sockaddr_AF_INET(const struct sockaddr_in *addr, + const struct sockaddr_in *netaddr, + const struct sockaddr_in *netmask); #ifdef HAVE_IPV6 -static int range_sockaddr_AF_INET6(const struct sockaddr_in6 * addr, - const struct sockaddr_in6 * netaddr, - const struct sockaddr_in6 * netmask); +static int range_sockaddr_AF_INET6(const struct sockaddr_in6 *addr, + const struct sockaddr_in6 *netaddr, + const struct sockaddr_in6 *netmask); #endif @@ -50,9 +50,9 @@ static int range_sockaddr_AF_INET6(const struct sockaddr_in6 * addr, * in the same address family; and AF_UNIX addresses are not supported. */ int -pg_range_sockaddr(const struct sockaddr_storage * addr, - const struct sockaddr_storage * netaddr, - const struct sockaddr_storage * netmask) +pg_range_sockaddr(const struct sockaddr_storage *addr, + const struct sockaddr_storage *netaddr, + const struct sockaddr_storage *netmask) { if (addr->ss_family == AF_INET) return range_sockaddr_AF_INET((const struct sockaddr_in *) addr, @@ -69,9 +69,9 @@ pg_range_sockaddr(const struct sockaddr_storage * addr, } static int -range_sockaddr_AF_INET(const struct sockaddr_in * addr, - const struct sockaddr_in * netaddr, - const struct sockaddr_in * netmask) +range_sockaddr_AF_INET(const struct sockaddr_in *addr, + const struct sockaddr_in *netaddr, + const struct sockaddr_in *netmask) { if (((addr->sin_addr.s_addr ^ netaddr->sin_addr.s_addr) & netmask->sin_addr.s_addr) == 0) @@ -84,9 +84,9 @@ range_sockaddr_AF_INET(const struct sockaddr_in * addr, #ifdef HAVE_IPV6 static int -range_sockaddr_AF_INET6(const struct sockaddr_in6 * addr, - const struct sockaddr_in6 * netaddr, - const struct sockaddr_in6 * netmask) +range_sockaddr_AF_INET6(const struct sockaddr_in6 *addr, + const struct sockaddr_in6 *netaddr, + const struct sockaddr_in6 *netmask) { int i; @@ -112,7 +112,7 @@ range_sockaddr_AF_INET6(const struct sockaddr_in6 * addr, * Return value is 0 if okay, -1 if not. */ int -pg_sockaddr_cidr_mask(struct sockaddr_storage * mask, char *numbits, int family) +pg_sockaddr_cidr_mask(struct sockaddr_storage *mask, char *numbits, int family) { long bits; char *endptr; @@ -190,7 +190,7 @@ pg_sockaddr_cidr_mask(struct sockaddr_storage * mask, char *numbits, int family) */ static void run_ifaddr_callback(PgIfAddrCallback callback, void *cb_data, - struct sockaddr * addr, struct sockaddr * mask) + struct sockaddr *addr, struct sockaddr *mask) { struct sockaddr_storage fullmask; @@ -222,7 +222,7 @@ run_ifaddr_callback(PgIfAddrCallback callback, void *cb_data, if (!mask) { pg_sockaddr_cidr_mask(&fullmask, NULL, addr->sa_family); - mask = (struct sockaddr *) & fullmask; + mask = (struct sockaddr *) &fullmask; } (*callback) (addr, mask, cb_data); @@ -284,8 +284,8 @@ pg_foreach_ifaddr(PgIfAddrCallback callback, void *cb_data) for (i = 0; i < length / sizeof(INTERFACE_INFO); ++i) run_ifaddr_callback(callback, cb_data, - (struct sockaddr *) & ii[i].iiAddress, - (struct sockaddr *) & ii[i].iiNetmask); + (struct sockaddr *) &ii[i].iiAddress, + (struct sockaddr *) &ii[i].iiNetmask); closesocket(sock); free(ii); @@ -425,7 +425,7 @@ pg_foreach_ifaddr(PgIfAddrCallback callback, void *cb_data) lifr = lifc.lifc_req; for (i = 0; i < total; ++i) { - addr = (struct sockaddr *) & lifr[i].lifr_addr; + addr = (struct sockaddr *) &lifr[i].lifr_addr; memcpy(&lmask, &lifr[i], sizeof(struct lifreq)); #ifdef HAVE_IPV6 fd = (addr->sa_family == AF_INET6) ? sock6 : sock; @@ -435,7 +435,7 @@ pg_foreach_ifaddr(PgIfAddrCallback callback, void *cb_data) if (ioctl(fd, SIOCGLIFNETMASK, &lmask) < 0) mask = NULL; else - mask = (struct sockaddr *) & lmask.lifr_addr; + mask = (struct sockaddr *) &lmask.lifr_addr; run_ifaddr_callback(callback, cb_data, addr, mask); } @@ -572,8 +572,8 @@ pg_foreach_ifaddr(PgIfAddrCallback callback, void *cb_data) memset(&mask, 0, sizeof(mask)); pg_sockaddr_cidr_mask(&mask, "8", AF_INET); run_ifaddr_callback(callback, cb_data, - (struct sockaddr *) & addr, - (struct sockaddr *) & mask); + (struct sockaddr *) &addr, + (struct sockaddr *) &mask); #ifdef HAVE_IPV6 /* addr ::1/128 */ @@ -583,8 +583,8 @@ pg_foreach_ifaddr(PgIfAddrCallback callback, void *cb_data) memset(&mask, 0, sizeof(mask)); pg_sockaddr_cidr_mask(&mask, "128", AF_INET6); run_ifaddr_callback(callback, cb_data, - (struct sockaddr *) & addr6, - (struct sockaddr *) & mask); + (struct sockaddr *) &addr6, + (struct sockaddr *) &mask); #endif return 0; diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c index d1cc38beb2..1dffa98c44 100644 --- a/src/backend/libpq/pqcomm.c +++ b/src/backend/libpq/pqcomm.c @@ -699,7 +699,7 @@ StreamConnection(pgsocket server_fd, Port *port) /* accept connection and fill in the client (remote) address */ port->raddr.salen = sizeof(port->raddr.addr); if ((port->sock = accept(server_fd, - (struct sockaddr *) & port->raddr.addr, + (struct sockaddr *) &port->raddr.addr, &port->raddr.salen)) == PGINVALID_SOCKET) { ereport(LOG, @@ -720,7 +720,7 @@ StreamConnection(pgsocket server_fd, Port *port) /* fill in the server (local) address */ port->laddr.salen = sizeof(port->laddr.addr); if (getsockname(port->sock, - (struct sockaddr *) & port->laddr.addr, + (struct sockaddr *) &port->laddr.addr, &port->laddr.salen) < 0) { elog(LOG, "getsockname() failed: %m"); @@ -1573,7 +1573,7 @@ fail: static void socket_putmessage_noblock(char msgtype, const char *s, size_t len) { - int res PG_USED_FOR_ASSERTS_ONLY; + int res PG_USED_FOR_ASSERTS_ONLY; int required; /* diff --git a/src/backend/nodes/nodeFuncs.c b/src/backend/nodes/nodeFuncs.c index 5af37a9388..2cceb99fd9 100644 --- a/src/backend/nodes/nodeFuncs.c +++ b/src/backend/nodes/nodeFuncs.c @@ -29,7 +29,7 @@ static bool expression_returns_set_walker(Node *node, void *context); static int leftmostLoc(int loc1, int loc2); static bool fix_opfuncids_walker(Node *node, void *context); static bool planstate_walk_subplans(List *plans, bool (*walker) (), - void *context); + void *context); static bool planstate_walk_members(List *plans, PlanState **planstates, bool (*walker) (), void *context); @@ -3091,7 +3091,7 @@ query_tree_mutator(Query *query, MUTATE(query->limitCount, query->limitCount, Node *); if (!(flags & QTW_IGNORE_CTE_SUBQUERIES)) MUTATE(query->cteList, query->cteList, List *); - else /* else copy CTE list as-is */ + else /* else copy CTE list as-is */ query->cteList = copyObject(query->cteList); query->rtable = range_table_mutator(query->rtable, mutator, context, flags); diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c index ef25fab71b..6ed3c634b8 100644 --- a/src/backend/optimizer/path/costsize.c +++ b/src/backend/optimizer/path/costsize.c @@ -827,7 +827,7 @@ index_pages_fetched(double tuples_fetched, BlockNumber pages, Assert(T <= total_pages); /* b is pro-rated share of effective_cache_size */ - b = (double) effective_cache_size *T / total_pages; + b = (double) effective_cache_size * T / total_pages; /* force it positive and integral */ if (b <= 1.0) @@ -3057,7 +3057,7 @@ final_cost_hashjoin(PlannerInfo *root, HashPath *path, path->num_batches = numbatches; /* and compute the number of "virtual" buckets in the whole join */ - virtualbuckets = (double) numbuckets *(double) numbatches; + virtualbuckets = (double) numbuckets * (double) numbatches; /* * Determine bucketsize fraction for inner relation. We use the smallest diff --git a/src/backend/optimizer/path/joinrels.c b/src/backend/optimizer/path/joinrels.c index 5a68de3cc8..4c775a76c6 100644 --- a/src/backend/optimizer/path/joinrels.c +++ b/src/backend/optimizer/path/joinrels.c @@ -93,7 +93,7 @@ join_search_one_level(PlannerInfo *root, int level) if (level == 2) /* consider remaining initial rels */ other_rels = lnext(r); - else /* consider all initial rels */ + else /* consider all initial rels */ other_rels = list_head(joinrels[1]); make_rels_by_clause_joins(root, diff --git a/src/backend/optimizer/prep/prepjointree.c b/src/backend/optimizer/prep/prepjointree.c index 749ea805f8..cfdd770f6a 100644 --- a/src/backend/optimizer/prep/prepjointree.c +++ b/src/backend/optimizer/prep/prepjointree.c @@ -1015,7 +1015,7 @@ pull_up_simple_subquery(PlannerInfo *root, Node *jtnode, RangeTblEntry *rte, if (rte->lateral) rvcontext.relids = get_relids_in_jointree((Node *) subquery->jointree, true); - else /* won't need relids */ + else /* won't need relids */ rvcontext.relids = NULL; rvcontext.outer_hasSubLinks = &parse->hasSubLinks; rvcontext.varno = varno; diff --git a/src/backend/optimizer/util/predtest.c b/src/backend/optimizer/util/predtest.c index 06fce8458c..72d70d52d1 100644 --- a/src/backend/optimizer/util/predtest.c +++ b/src/backend/optimizer/util/predtest.c @@ -1804,7 +1804,7 @@ lookup_proof_cache(Oid pred_op, Oid clause_op, bool refute_it) clause_op_infos = get_op_btree_interpretation(clause_op); if (clause_op_infos) pred_op_infos = get_op_btree_interpretation(pred_op); - else /* no point in looking */ + else /* no point in looking */ pred_op_infos = NIL; foreach(lcp, pred_op_infos) diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c index 65bd51e1fd..e46aa60097 100644 --- a/src/backend/parser/parse_expr.c +++ b/src/backend/parser/parse_expr.c @@ -2941,7 +2941,7 @@ make_row_comparison_op(ParseState *pstate, List *opname, } if (OidIsValid(opfamily)) opfamilies = lappend_oid(opfamilies, opfamily); - else /* should not happen */ + else /* should not happen */ ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("could not determine interpretation of row comparison operator %s", diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c index 34f1cf82ee..eb1706a4a6 100644 --- a/src/backend/parser/parse_func.c +++ b/src/backend/parser/parse_func.c @@ -834,7 +834,7 @@ func_match_argtypes(int nargs, } return ncandidates; -} /* func_match_argtypes() */ +} /* func_match_argtypes() */ /* func_select_candidate() @@ -1245,7 +1245,7 @@ func_select_candidate(int nargs, } return NULL; /* failed to select a best candidate */ -} /* func_select_candidate() */ +} /* func_select_candidate() */ /* func_get_detail() diff --git a/src/backend/port/win32/crashdump.c b/src/backend/port/win32/crashdump.c index ff44b6033e..c97cb9181e 100644 --- a/src/backend/port/win32/crashdump.c +++ b/src/backend/port/win32/crashdump.c @@ -89,7 +89,7 @@ typedef BOOL (WINAPI * MINIDUMPWRITEDUMP) (HANDLE hProcess, DWORD dwPid, HANDLE * any PostgreSQL functions. */ static LONG WINAPI -crashDumpHandler(struct _EXCEPTION_POINTERS * pExceptionInfo) +crashDumpHandler(struct _EXCEPTION_POINTERS *pExceptionInfo) { /* * We only write crash dumps if the "crashdumps" directory within the diff --git a/src/backend/port/win32/socket.c b/src/backend/port/win32/socket.c index f11d6e6eb8..535b9a0c67 100644 --- a/src/backend/port/win32/socket.c +++ b/src/backend/port/win32/socket.c @@ -298,7 +298,7 @@ pgwin32_socket(int af, int type, int protocol) } int -pgwin32_bind(SOCKET s, struct sockaddr * addr, int addrlen) +pgwin32_bind(SOCKET s, struct sockaddr *addr, int addrlen) { int res; @@ -320,7 +320,7 @@ pgwin32_listen(SOCKET s, int backlog) } SOCKET -pgwin32_accept(SOCKET s, struct sockaddr * addr, int *addrlen) +pgwin32_accept(SOCKET s, struct sockaddr *addr, int *addrlen) { SOCKET rs; @@ -342,7 +342,7 @@ pgwin32_accept(SOCKET s, struct sockaddr * addr, int *addrlen) /* No signal delivery during connect. */ int -pgwin32_connect(SOCKET s, const struct sockaddr * addr, int addrlen) +pgwin32_connect(SOCKET s, const struct sockaddr *addr, int addrlen) { int r; @@ -500,7 +500,7 @@ pgwin32_send(SOCKET s, const void *buf, int len, int flags) * since it is not used in postgresql! */ int -pgwin32_select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, const struct timeval * timeout) +pgwin32_select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, const struct timeval *timeout) { WSAEVENT events[FD_SETSIZE * 2]; /* worst case is readfds totally * different from writefds, so diff --git a/src/backend/port/win32/timer.c b/src/backend/port/win32/timer.c index 43097794f7..f1aa0f3a16 100644 --- a/src/backend/port/win32/timer.c +++ b/src/backend/port/win32/timer.c @@ -83,7 +83,7 @@ pg_timer_thread(LPVOID param) * to handle the timer setting and notification upon timeout. */ int -setitimer(int which, const struct itimerval * value, struct itimerval * ovalue) +setitimer(int which, const struct itimerval *value, struct itimerval *ovalue) { Assert(value != NULL); Assert(value->it_interval.tv_sec == 0 && value->it_interval.tv_usec == 0); diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c index 89dd3b321b..5baa6db321 100644 --- a/src/backend/postmaster/autovacuum.c +++ b/src/backend/postmaster/autovacuum.c @@ -242,7 +242,7 @@ typedef enum AutoVacForkFailed, /* failed trying to start a worker */ AutoVacRebalance, /* rebalance the cost limits */ AutoVacNumSignals /* must be last */ -} AutoVacuumSignal; +} AutoVacuumSignal; /*------------- * The main autovacuum shmem struct. On shared memory we store this main @@ -321,7 +321,7 @@ NON_EXEC_STATIC void AutoVacLauncherMain(int argc, char *argv[]) pg_attribute_no static Oid do_start_worker(void); static void launcher_determine_sleep(bool canlaunch, bool recursing, - struct timeval * nap); + struct timeval *nap); static void launch_worker(TimestampTz now); static List *get_database_list(void); static void rebuild_database_list(Oid newdb); @@ -849,7 +849,7 @@ shutdown: * cause a long sleep, which will be interrupted when a worker exits. */ static void -launcher_determine_sleep(bool canlaunch, bool recursing, struct timeval * nap) +launcher_determine_sleep(bool canlaunch, bool recursing, struct timeval *nap) { /* * We sleep until the next scheduled vacuum. We trust that when the diff --git a/src/backend/postmaster/bgworker.c b/src/backend/postmaster/bgworker.c index 712d700481..09b7fb4092 100644 --- a/src/backend/postmaster/bgworker.c +++ b/src/backend/postmaster/bgworker.c @@ -118,7 +118,7 @@ static const struct { const char *fn_name; bgworker_main_type fn_addr; -} InternalBGWorkers[] = +} InternalBGWorkers[] = { { diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c index f453dade6c..5cf9582246 100644 --- a/src/backend/postmaster/pgstat.c +++ b/src/backend/postmaster/pgstat.c @@ -443,7 +443,7 @@ pgstat_init(void) } alen = sizeof(pgStatAddr); - if (getsockname(pgStatSock, (struct sockaddr *) & pgStatAddr, &alen) < 0) + if (getsockname(pgStatSock, (struct sockaddr *) &pgStatAddr, &alen) < 0) { ereport(LOG, (errcode_for_socket_access(), @@ -459,7 +459,7 @@ pgstat_init(void) * provides a kernel-level check that only packets from this same * address will be received. */ - if (connect(pgStatSock, (struct sockaddr *) & pgStatAddr, alen) < 0) + if (connect(pgStatSock, (struct sockaddr *) &pgStatAddr, alen) < 0) { ereport(LOG, (errcode_for_socket_access(), @@ -1107,7 +1107,7 @@ pgstat_vacuum_stat(void) if (msg.m_nentries >= PGSTAT_NUM_TABPURGE) { len = offsetof(PgStat_MsgTabpurge, m_tableid[0]) - +msg.m_nentries * sizeof(Oid); + + msg.m_nentries * sizeof(Oid); pgstat_setheader(&msg.m_hdr, PGSTAT_MTYPE_TABPURGE); msg.m_databaseid = MyDatabaseId; @@ -1123,7 +1123,7 @@ pgstat_vacuum_stat(void) if (msg.m_nentries > 0) { len = offsetof(PgStat_MsgTabpurge, m_tableid[0]) - +msg.m_nentries * sizeof(Oid); + + msg.m_nentries * sizeof(Oid); pgstat_setheader(&msg.m_hdr, PGSTAT_MTYPE_TABPURGE); msg.m_databaseid = MyDatabaseId; @@ -1167,7 +1167,7 @@ pgstat_vacuum_stat(void) if (f_msg.m_nentries >= PGSTAT_NUM_FUNCPURGE) { len = offsetof(PgStat_MsgFuncpurge, m_functionid[0]) - +f_msg.m_nentries * sizeof(Oid); + + f_msg.m_nentries * sizeof(Oid); pgstat_send(&f_msg, len); @@ -1181,7 +1181,7 @@ pgstat_vacuum_stat(void) if (f_msg.m_nentries > 0) { len = offsetof(PgStat_MsgFuncpurge, m_functionid[0]) - +f_msg.m_nentries * sizeof(Oid); + + f_msg.m_nentries * sizeof(Oid); pgstat_send(&f_msg, len); } @@ -1284,7 +1284,7 @@ pgstat_drop_relation(Oid relid) msg.m_tableid[0] = relid; msg.m_nentries = 1; - len = offsetof(PgStat_MsgTabpurge, m_tableid[0]) +sizeof(Oid); + len = offsetof(PgStat_MsgTabpurge, m_tableid[0]) + sizeof(Oid); pgstat_setheader(&msg.m_hdr, PGSTAT_MTYPE_TABPURGE); msg.m_databaseid = MyDatabaseId; diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 5c79b1e40d..a5d3575b20 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -340,6 +340,7 @@ static PMState pmState = PM_INIT; /* Start time of SIGKILL timeout during immediate shutdown or child crash */ /* Zero means timeout is not running */ static time_t AbortStartTime = 0; + /* Length of said timeout */ #define SIGKILL_CHILDREN_AFTER_SECS 5 @@ -1558,7 +1559,7 @@ checkDataDir(void) * cases are as shown in the code. */ static void -DetermineSleepTime(struct timeval * timeout) +DetermineSleepTime(struct timeval *timeout) { TimestampTz next_wakeup = 0; @@ -3541,16 +3542,16 @@ LogChildExit(int lev, const char *procname, int pid, int exitstatus) errhint("See C include file \"ntstatus.h\" for a description of the hexadecimal value."), activity ? errdetail("Failed process was running: %s", activity) : 0)); #elif defined(HAVE_DECL_SYS_SIGLIST) && HAVE_DECL_SYS_SIGLIST - ereport(lev, - - /*------ - translator: %s is a noun phrase describing a child process, such as - "server process" */ - (errmsg("%s (PID %d) was terminated by signal %d: %s", - procname, pid, WTERMSIG(exitstatus), - WTERMSIG(exitstatus) < NSIG ? - sys_siglist[WTERMSIG(exitstatus)] : "(unknown)"), - activity ? errdetail("Failed process was running: %s", activity) : 0)); + ereport(lev, + + /*------ + translator: %s is a noun phrase describing a child process, such as + "server process" */ + (errmsg("%s (PID %d) was terminated by signal %d: %s", + procname, pid, WTERMSIG(exitstatus), + WTERMSIG(exitstatus) < NSIG ? + sys_siglist[WTERMSIG(exitstatus)] : "(unknown)"), + activity ? errdetail("Failed process was running: %s", activity) : 0)); #else ereport(lev, diff --git a/src/backend/postmaster/syslogger.c b/src/backend/postmaster/syslogger.c index 9f5ca5cac0..9828999eb8 100644 --- a/src/backend/postmaster/syslogger.c +++ b/src/backend/postmaster/syslogger.c @@ -797,7 +797,7 @@ process_pipe_input(char *logbuffer, int *bytes_in_logbuffer) int dest = LOG_DESTINATION_STDERR; /* While we have enough for a header, process data... */ - while (count >= (int) (offsetof(PipeProtoHeader, data) +1)) + while (count >= (int) (offsetof(PipeProtoHeader, data) + 1)) { PipeProtoHeader p; int chunklen; diff --git a/src/backend/regex/regc_color.c b/src/backend/regex/regc_color.c index 4b72894ad3..823bec018f 100644 --- a/src/backend/regex/regc_color.c +++ b/src/backend/regex/regc_color.c @@ -46,8 +46,8 @@ * initcm - set up new colormap */ static void -initcm(struct vars * v, - struct colormap * cm) +initcm(struct vars *v, + struct colormap *cm) { struct colordesc *cd; @@ -100,7 +100,7 @@ initcm(struct vars * v, * freecm - free dynamically-allocated things in a colormap */ static void -freecm(struct colormap * cm) +freecm(struct colormap *cm) { cm->magic = 0; if (cm->cd != cm->cdspace) @@ -117,7 +117,7 @@ freecm(struct colormap * cm) * pg_reg_getcolor - slow case of GETCOLOR() */ color -pg_reg_getcolor(struct colormap * cm, chr c) +pg_reg_getcolor(struct colormap *cm, chr c) { int rownum, colnum, @@ -169,7 +169,7 @@ pg_reg_getcolor(struct colormap * cm, chr c) * maxcolor - report largest color number in use */ static color -maxcolor(struct colormap * cm) +maxcolor(struct colormap *cm) { if (CISERR()) return COLORLESS; @@ -182,7 +182,7 @@ maxcolor(struct colormap * cm) * Beware: may relocate the colordescs. */ static color /* COLORLESS for error */ -newcolor(struct colormap * cm) +newcolor(struct colormap *cm) { struct colordesc *cd; size_t n; @@ -254,7 +254,7 @@ newcolor(struct colormap * cm) * freecolor - free a color (must have no arcs or subcolor) */ static void -freecolor(struct colormap * cm, +freecolor(struct colormap *cm, color co) { struct colordesc *cd = &cm->cd[co]; @@ -309,7 +309,7 @@ freecolor(struct colormap * cm, * pseudocolor - allocate a false color, to be managed by other means */ static color -pseudocolor(struct colormap * cm) +pseudocolor(struct colormap *cm) { color co; struct colordesc *cd; @@ -333,7 +333,7 @@ pseudocolor(struct colormap * cm) * This works only for chrs that map into the low color map. */ static color -subcolor(struct colormap * cm, chr c) +subcolor(struct colormap *cm, chr c) { color co; /* current color of c */ color sco; /* new subcolor */ @@ -363,7 +363,7 @@ subcolor(struct colormap * cm, chr c) * colormap, which do not necessarily correspond to exactly one chr code. */ static color -subcolorhi(struct colormap * cm, color *pco) +subcolorhi(struct colormap *cm, color *pco) { color co; /* current color of entry */ color sco; /* new subcolor */ @@ -386,7 +386,7 @@ subcolorhi(struct colormap * cm, color *pco) * newsub - allocate a new subcolor (if necessary) for a color */ static color -newsub(struct colormap * cm, +newsub(struct colormap *cm, color co) { color sco; /* new subcolor */ @@ -417,7 +417,7 @@ newsub(struct colormap * cm, * Returns array index of new row. Note the array might move. */ static int -newhicolorrow(struct colormap * cm, +newhicolorrow(struct colormap *cm, int oldrow) { int newrow = cm->hiarrayrows; @@ -466,7 +466,7 @@ newhicolorrow(struct colormap * cm, * Essentially, extends the 2-D array to the right with a copy of itself. */ static void -newhicolorcols(struct colormap * cm) +newhicolorcols(struct colormap *cm) { color *newarray; int r, @@ -519,10 +519,10 @@ newhicolorcols(struct colormap * cm) * mechanized with the "lastsubcolor" state variable. */ static void -subcolorcvec(struct vars * v, - struct cvec * cv, - struct state * lp, - struct state * rp) +subcolorcvec(struct vars *v, + struct cvec *cv, + struct state *lp, + struct state *rp) { struct colormap *cm = v->cm; color lastsubcolor = COLORLESS; @@ -621,10 +621,10 @@ subcolorcvec(struct vars * v, * to be able to handle both low and high chr codes. */ static void -subcoloronechr(struct vars * v, +subcoloronechr(struct vars *v, chr ch, - struct state * lp, - struct state * rp, + struct state *lp, + struct state *rp, color *lastsubcolor) { struct colormap *cm = v->cm; @@ -744,11 +744,11 @@ subcoloronechr(struct vars * v, * subcoloronerange - do subcolorcvec's work for a high range */ static void -subcoloronerange(struct vars * v, +subcoloronerange(struct vars *v, chr from, chr to, - struct state * lp, - struct state * rp, + struct state *lp, + struct state *rp, color *lastsubcolor) { struct colormap *cm = v->cm; @@ -882,10 +882,10 @@ subcoloronerange(struct vars * v, * subcoloronerow - do subcolorcvec's work for one new row in the high colormap */ static void -subcoloronerow(struct vars * v, +subcoloronerow(struct vars *v, int rownum, - struct state * lp, - struct state * rp, + struct state *lp, + struct state *rp, color *lastsubcolor) { struct colormap *cm = v->cm; @@ -913,8 +913,8 @@ subcoloronerow(struct vars * v, * okcolors - promote subcolors to full colors */ static void -okcolors(struct nfa * nfa, - struct colormap * cm) +okcolors(struct nfa *nfa, + struct colormap *cm) { struct colordesc *cd; struct colordesc *end = CDEND(cm); @@ -972,8 +972,8 @@ okcolors(struct nfa * nfa, * colorchain - add this arc to the color chain of its color */ static void -colorchain(struct colormap * cm, - struct arc * a) +colorchain(struct colormap *cm, + struct arc *a) { struct colordesc *cd = &cm->cd[a->co]; @@ -988,8 +988,8 @@ colorchain(struct colormap * cm, * uncolorchain - delete this arc from the color chain of its color */ static void -uncolorchain(struct colormap * cm, - struct arc * a) +uncolorchain(struct colormap *cm, + struct arc *a) { struct colordesc *cd = &cm->cd[a->co]; struct arc *aa = a->colorchainRev; @@ -1014,12 +1014,12 @@ uncolorchain(struct colormap * cm, * rainbow - add arcs of all full colors (but one) between specified states */ static void -rainbow(struct nfa * nfa, - struct colormap * cm, +rainbow(struct nfa *nfa, + struct colormap *cm, int type, color but, /* COLORLESS if no exceptions */ - struct state * from, - struct state * to) + struct state *from, + struct state *to) { struct colordesc *cd; struct colordesc *end = CDEND(cm); @@ -1037,13 +1037,13 @@ rainbow(struct nfa * nfa, * The calling sequence ought to be reconciled with cloneouts(). */ static void -colorcomplement(struct nfa * nfa, - struct colormap * cm, +colorcomplement(struct nfa *nfa, + struct colormap *cm, int type, - struct state * of, /* complements of this guy's PLAIN + struct state *of, /* complements of this guy's PLAIN * outarcs */ - struct state * from, - struct state * to) + struct state *from, + struct state *to) { struct colordesc *cd; struct colordesc *end = CDEND(cm); @@ -1063,7 +1063,7 @@ colorcomplement(struct nfa * nfa, * dumpcolors - debugging output */ static void -dumpcolors(struct colormap * cm, +dumpcolors(struct colormap *cm, FILE *f) { struct colordesc *cd; diff --git a/src/backend/regex/regc_cvec.c b/src/backend/regex/regc_cvec.c index 50b7a4574b..1030621559 100644 --- a/src/backend/regex/regc_cvec.c +++ b/src/backend/regex/regc_cvec.c @@ -63,7 +63,7 @@ newcvec(int nchrs, /* to hold this many chrs... */ * Returns pointer as convenience. */ static struct cvec * -clearcvec(struct cvec * cv) +clearcvec(struct cvec *cv) { assert(cv != NULL); cv->nchrs = 0; @@ -76,7 +76,7 @@ clearcvec(struct cvec * cv) * addchr - add a chr to a cvec */ static void -addchr(struct cvec * cv, /* character vector */ +addchr(struct cvec *cv, /* character vector */ chr c) /* character to add */ { assert(cv->nchrs < cv->chrspace); @@ -87,7 +87,7 @@ addchr(struct cvec * cv, /* character vector */ * addrange - add a range to a cvec */ static void -addrange(struct cvec * cv, /* character vector */ +addrange(struct cvec *cv, /* character vector */ chr from, /* first character of range */ chr to) /* last character of range */ { @@ -109,7 +109,7 @@ addrange(struct cvec * cv, /* character vector */ * so transientness is a convenient behavior. */ static struct cvec * -getcvec(struct vars * v, /* context */ +getcvec(struct vars *v, /* context */ int nchrs, /* to hold this many chrs... */ int nranges) /* ... and this many ranges */ { @@ -132,7 +132,7 @@ getcvec(struct vars * v, /* context */ * freecvec - free a cvec */ static void -freecvec(struct cvec * cv) +freecvec(struct cvec *cv) { FREE(cv); } diff --git a/src/backend/regex/regc_lex.c b/src/backend/regex/regc_lex.c index cd34c8ae41..b2506ca814 100644 --- a/src/backend/regex/regc_lex.c +++ b/src/backend/regex/regc_lex.c @@ -67,7 +67,7 @@ * lexstart - set up lexical stuff, scan leading options */ static void -lexstart(struct vars * v) +lexstart(struct vars *v) { prefixes(v); /* may turn on new type bits etc. */ NOERR(); @@ -96,7 +96,7 @@ lexstart(struct vars * v) * prefixes - implement various special prefixes */ static void -prefixes(struct vars * v) +prefixes(struct vars *v) { /* literal string doesn't get any of this stuff */ if (v->cflags & REG_QUOTE) @@ -200,7 +200,7 @@ prefixes(struct vars * v) * implicit assumptions about what sorts of strings can be subroutines. */ static void -lexnest(struct vars * v, +lexnest(struct vars *v, const chr *beginp, /* start of interpolation */ const chr *endp) /* one past end of interpolation */ { @@ -265,7 +265,7 @@ static const chr brbackw[] = { /* \w within brackets */ * Possibly ought to inquire whether there is a "word" character class. */ static void -lexword(struct vars * v) +lexword(struct vars *v) { lexnest(v, backw, ENDOF(backw)); } @@ -274,7 +274,7 @@ lexword(struct vars * v) * next - get next token */ static int /* 1 normal, 0 failure */ -next(struct vars * v) +next(struct vars *v) { chr c; @@ -384,7 +384,7 @@ next(struct vars * v) else FAILW(REG_BADBR); break; - case CHR('\\'): /* BRE bound ends with \} */ + case CHR('\\'): /* BRE bound ends with \} */ if (INCON(L_BBND) && NEXT1('}')) { v->now++; @@ -476,7 +476,7 @@ next(struct vars * v) NOTE(REG_ULOCALE); RET(CCLASS); break; - default: /* oops */ + default: /* oops */ v->now--; RETV(PLAIN, c); break; @@ -671,7 +671,7 @@ next(struct vars * v) case CHR('$'): RET('$'); break; - case CHR('\\'): /* mostly punt backslashes to code below */ + case CHR('\\'): /* mostly punt backslashes to code below */ if (ATEOS()) FAILW(REG_EESCAPE); break; @@ -734,7 +734,7 @@ next(struct vars * v) * Note slightly nonstandard use of the CCLASS type code. */ static int /* not actually used, but convenient for RETV */ -lexescape(struct vars * v) +lexescape(struct vars *v) { chr c; static const chr alert[] = { @@ -904,7 +904,7 @@ lexescape(struct vars * v) * if maxlen is large enough to make that possible. */ static chr /* chr value; errors signalled via ERR */ -lexdigits(struct vars * v, +lexdigits(struct vars *v, int base, int minlen, int maxlen) @@ -985,7 +985,7 @@ lexdigits(struct vars * v, * context-dependency of some things. */ static int /* 1 normal, 0 failure */ -brenext(struct vars * v, +brenext(struct vars *v, chr c) { switch (c) @@ -1106,7 +1106,7 @@ brenext(struct vars * v, * skip - skip white space and comments in expanded form */ static void -skip(struct vars * v) +skip(struct vars *v) { const chr *start = v->now; @@ -1146,7 +1146,7 @@ newline(void) * use that it hardly matters. */ static chr -chrnamed(struct vars * v, +chrnamed(struct vars *v, const chr *startp, /* start of name */ const chr *endp, /* just past end of name */ chr lastresort) /* what to return if name lookup fails */ diff --git a/src/backend/regex/regc_locale.c b/src/backend/regex/regc_locale.c index 7cb3a40a0c..acae90abce 100644 --- a/src/backend/regex/regc_locale.c +++ b/src/backend/regex/regc_locale.c @@ -56,7 +56,7 @@ static const struct cname { const char *name; const char code; -} cnames[] = +} cnames[] = { { @@ -377,7 +377,7 @@ enum classes * element - map collating-element name to chr */ static chr -element(struct vars * v, /* context */ +element(struct vars *v, /* context */ const chr *startp, /* points to start of name */ const chr *endp) /* points just past end of name */ { @@ -413,7 +413,7 @@ element(struct vars * v, /* context */ * range - supply cvec for a range, including legality check */ static struct cvec * -range(struct vars * v, /* context */ +range(struct vars *v, /* context */ chr a, /* range start */ chr b, /* range end, might equal a */ int cases) /* case-independent? */ @@ -505,7 +505,7 @@ before(chr x, chr y) * Must include case counterparts on request. */ static struct cvec * -eclass(struct vars * v, /* context */ +eclass(struct vars *v, /* context */ chr c, /* Collating element representing the * equivalence class. */ int cases) /* all cases? */ @@ -545,14 +545,14 @@ eclass(struct vars * v, /* context */ * because callers are not supposed to explicitly free the result either way. */ static struct cvec * -cclass(struct vars * v, /* context */ +cclass(struct vars *v, /* context */ const chr *startp, /* where the name starts */ const chr *endp, /* just past the end of the name */ int cases) /* case-independent? */ { size_t len; struct cvec *cv = NULL; - const char *const * namePtr; + const char *const *namePtr; int i, index; @@ -669,7 +669,7 @@ cclass(struct vars * v, /* context */ * cclass_column_index - get appropriate high colormap column index for chr */ static int -cclass_column_index(struct colormap * cm, chr c) +cclass_column_index(struct colormap *cm, chr c) { int colnum = 0; @@ -713,7 +713,7 @@ cclass_column_index(struct colormap * cm, chr c) * messy cases are done via range(). */ static struct cvec * -allcases(struct vars * v, /* context */ +allcases(struct vars *v, /* context */ chr c) /* character to get case equivs of */ { struct cvec *cv; diff --git a/src/backend/regex/regc_nfa.c b/src/backend/regex/regc_nfa.c index 90dca5d9de..2179a38a22 100644 --- a/src/backend/regex/regc_nfa.c +++ b/src/backend/regex/regc_nfa.c @@ -44,9 +44,9 @@ * newnfa - set up an NFA */ static struct nfa * /* the NFA, or NULL */ -newnfa(struct vars * v, - struct colormap * cm, - struct nfa * parent) /* NULL if primary NFA */ +newnfa(struct vars *v, + struct colormap *cm, + struct nfa *parent) /* NULL if primary NFA */ { struct nfa *nfa; @@ -95,7 +95,7 @@ newnfa(struct vars * v, * freenfa - free an entire NFA */ static void -freenfa(struct nfa * nfa) +freenfa(struct nfa *nfa) { struct state *s; @@ -121,7 +121,7 @@ freenfa(struct nfa * nfa) * newstate - allocate an NFA state, with zero flag value */ static struct state * /* NULL on error */ -newstate(struct nfa * nfa) +newstate(struct nfa *nfa) { struct state *s; @@ -185,7 +185,7 @@ newstate(struct nfa * nfa) * newfstate - allocate an NFA state with a specified flag value */ static struct state * /* NULL on error */ -newfstate(struct nfa * nfa, int flag) +newfstate(struct nfa *nfa, int flag) { struct state *s; @@ -199,8 +199,8 @@ newfstate(struct nfa * nfa, int flag) * dropstate - delete a state's inarcs and outarcs and free it */ static void -dropstate(struct nfa * nfa, - struct state * s) +dropstate(struct nfa *nfa, + struct state *s) { struct arc *a; @@ -215,8 +215,8 @@ dropstate(struct nfa * nfa, * freestate - free a state, which has no in-arcs or out-arcs */ static void -freestate(struct nfa * nfa, - struct state * s) +freestate(struct nfa *nfa, + struct state *s) { assert(s != NULL); assert(s->nins == 0 && s->nouts == 0); @@ -246,8 +246,8 @@ freestate(struct nfa * nfa, * destroystate - really get rid of an already-freed state */ static void -destroystate(struct nfa * nfa, - struct state * s) +destroystate(struct nfa *nfa, + struct state *s) { struct arcbatch *ab; struct arcbatch *abnext; @@ -273,11 +273,11 @@ destroystate(struct nfa * nfa, * In general we never want duplicates. */ static void -newarc(struct nfa * nfa, +newarc(struct nfa *nfa, int t, color co, - struct state * from, - struct state * to) + struct state *from, + struct state *to) { struct arc *a; @@ -319,11 +319,11 @@ newarc(struct nfa * nfa, * identical arc (same type/color/from/to). */ static void -createarc(struct nfa * nfa, +createarc(struct nfa *nfa, int t, color co, - struct state * from, - struct state * to) + struct state *from, + struct state *to) { struct arc *a; @@ -365,8 +365,8 @@ createarc(struct nfa * nfa, * allocarc - allocate a new out-arc within a state */ static struct arc * /* NULL for failure */ -allocarc(struct nfa * nfa, - struct state * s) +allocarc(struct nfa *nfa, + struct state *s) { struct arc *a; @@ -418,8 +418,8 @@ allocarc(struct nfa * nfa, * freearc - free an arc */ static void -freearc(struct nfa * nfa, - struct arc * victim) +freearc(struct nfa *nfa, + struct arc *victim) { struct state *from = victim->from; struct state *to = victim->to; @@ -492,7 +492,7 @@ freearc(struct nfa * nfa, * a similar changearcsource function. */ static void -changearctarget(struct arc * a, struct state * newto) +changearctarget(struct arc *a, struct state *newto) { struct state *oldto = a->to; struct arc *predecessor; @@ -534,7 +534,7 @@ changearctarget(struct arc * a, struct state * newto) * hasnonemptyout - Does state have a non-EMPTY out arc? */ static int -hasnonemptyout(struct state * s) +hasnonemptyout(struct state *s) { struct arc *a; @@ -551,7 +551,7 @@ hasnonemptyout(struct state * s) * If there is more than one such arc, the result is random. */ static struct arc * -findarc(struct state * s, +findarc(struct state *s, int type, color co) { @@ -567,10 +567,10 @@ findarc(struct state * s, * cparc - allocate a new arc within an NFA, copying details from old one */ static void -cparc(struct nfa * nfa, - struct arc * oa, - struct state * from, - struct state * to) +cparc(struct nfa *nfa, + struct arc *oa, + struct state *from, + struct state *to) { newarc(nfa, oa->type, oa->co, from, to); } @@ -579,8 +579,8 @@ cparc(struct nfa * nfa, * sortins - sort the in arcs of a state by from/color/type */ static void -sortins(struct nfa * nfa, - struct state * s) +sortins(struct nfa *nfa, + struct state *s) { struct arc **sortarray; struct arc *a; @@ -623,8 +623,8 @@ sortins(struct nfa * nfa, static int sortins_cmp(const void *a, const void *b) { - const struct arc *aa = *((const struct arc * const *) a); - const struct arc *bb = *((const struct arc * const *) b); + const struct arc *aa = *((const struct arc *const *) a); + const struct arc *bb = *((const struct arc *const *) b); /* we check the fields in the order they are most likely to be different */ if (aa->from->no < bb->from->no) @@ -646,8 +646,8 @@ sortins_cmp(const void *a, const void *b) * sortouts - sort the out arcs of a state by to/color/type */ static void -sortouts(struct nfa * nfa, - struct state * s) +sortouts(struct nfa *nfa, + struct state *s) { struct arc **sortarray; struct arc *a; @@ -690,8 +690,8 @@ sortouts(struct nfa * nfa, static int sortouts_cmp(const void *a, const void *b) { - const struct arc *aa = *((const struct arc * const *) a); - const struct arc *bb = *((const struct arc * const *) b); + const struct arc *aa = *((const struct arc *const *) a); + const struct arc *bb = *((const struct arc *const *) b); /* we check the fields in the order they are most likely to be different */ if (aa->to->no < bb->to->no) @@ -733,9 +733,9 @@ sortouts_cmp(const void *a, const void *b) * the arc lists, and then we can indeed just update the arcs in-place. */ static void -moveins(struct nfa * nfa, - struct state * oldState, - struct state * newState) +moveins(struct nfa *nfa, + struct state *oldState, + struct state *newState) { assert(oldState != newState); @@ -825,9 +825,9 @@ moveins(struct nfa * nfa, * copyins - copy in arcs of a state to another state */ static void -copyins(struct nfa * nfa, - struct state * oldState, - struct state * newState) +copyins(struct nfa *nfa, + struct state *oldState, + struct state *newState) { assert(oldState != newState); @@ -907,9 +907,9 @@ copyins(struct nfa * nfa, * and are not guaranteed unique. It's okay to clobber the array contents. */ static void -mergeins(struct nfa * nfa, - struct state * s, - struct arc ** arcarray, +mergeins(struct nfa *nfa, + struct state *s, + struct arc **arcarray, int arccount) { struct arc *na; @@ -1004,9 +1004,9 @@ mergeins(struct nfa * nfa, * moveouts - move all out arcs of a state to another state */ static void -moveouts(struct nfa * nfa, - struct state * oldState, - struct state * newState) +moveouts(struct nfa *nfa, + struct state *oldState, + struct state *newState) { assert(oldState != newState); @@ -1093,9 +1093,9 @@ moveouts(struct nfa * nfa, * copyouts - copy out arcs of a state to another state */ static void -copyouts(struct nfa * nfa, - struct state * oldState, - struct state * newState) +copyouts(struct nfa *nfa, + struct state *oldState, + struct state *newState) { assert(oldState != newState); @@ -1172,10 +1172,10 @@ copyouts(struct nfa * nfa, * cloneouts - copy out arcs of a state to another state pair, modifying type */ static void -cloneouts(struct nfa * nfa, - struct state * old, - struct state * from, - struct state * to, +cloneouts(struct nfa *nfa, + struct state *old, + struct state *from, + struct state *to, int type) { struct arc *a; @@ -1193,9 +1193,9 @@ cloneouts(struct nfa * nfa, * states using their tmp pointer. */ static void -delsub(struct nfa * nfa, - struct state * lp, /* the sub-NFA goes from here... */ - struct state * rp) /* ...to here, *not* inclusive */ +delsub(struct nfa *nfa, + struct state *lp, /* the sub-NFA goes from here... */ + struct state *rp) /* ...to here, *not* inclusive */ { assert(lp != rp); @@ -1216,9 +1216,9 @@ delsub(struct nfa * nfa, * This routine's basic job is to destroy all out-arcs of the state. */ static void -deltraverse(struct nfa * nfa, - struct state * leftend, - struct state * s) +deltraverse(struct nfa *nfa, + struct state *leftend, + struct state *s) { struct arc *a; struct state *to; @@ -1267,11 +1267,11 @@ deltraverse(struct nfa * nfa, * it's a state pointer, didn't you? :-)) */ static void -dupnfa(struct nfa * nfa, - struct state * start, /* duplicate of subNFA starting here */ - struct state * stop, /* and stopping here */ - struct state * from, /* stringing duplicate from here */ - struct state * to) /* to here */ +dupnfa(struct nfa *nfa, + struct state *start, /* duplicate of subNFA starting here */ + struct state *stop, /* and stopping here */ + struct state *from, /* stringing duplicate from here */ + struct state *to) /* to here */ { if (start == stop) { @@ -1291,9 +1291,9 @@ dupnfa(struct nfa * nfa, * duptraverse - recursive heart of dupnfa */ static void -duptraverse(struct nfa * nfa, - struct state * s, - struct state * stmp) /* s's duplicate, or NULL */ +duptraverse(struct nfa *nfa, + struct state *s, + struct state *stmp) /* s's duplicate, or NULL */ { struct arc *a; @@ -1328,8 +1328,8 @@ duptraverse(struct nfa * nfa, * cleartraverse - recursive cleanup for algorithms that leave tmp ptrs set */ static void -cleartraverse(struct nfa * nfa, - struct state * s) +cleartraverse(struct nfa *nfa, + struct state *s) { struct arc *a; @@ -1365,7 +1365,7 @@ cleartraverse(struct nfa * nfa, * that implementation detail not create user-visible performance differences. */ static struct state * -single_color_transition(struct state * s1, struct state * s2) +single_color_transition(struct state *s1, struct state *s2) { struct arc *a; @@ -1395,7 +1395,7 @@ single_color_transition(struct state * s1, struct state * s2) * specialcolors - fill in special colors for an NFA */ static void -specialcolors(struct nfa * nfa) +specialcolors(struct nfa *nfa) { /* false colors for BOS, BOL, EOS, EOL */ if (nfa->parent == NULL) @@ -1434,7 +1434,7 @@ specialcolors(struct nfa * nfa) * without making any progress in the input string. */ static long /* re_info bits */ -optimize(struct nfa * nfa, +optimize(struct nfa *nfa, FILE *f) /* for debug output; NULL none */ { #ifdef REG_DEBUG @@ -1474,7 +1474,7 @@ optimize(struct nfa * nfa, * pullback - pull back constraints backward to eliminate them */ static void -pullback(struct nfa * nfa, +pullback(struct nfa *nfa, FILE *f) /* for debug output; NULL none */ { struct state *s; @@ -1554,9 +1554,9 @@ pullback(struct nfa * nfa, * through their tmp fields). */ static int -pull(struct nfa * nfa, - struct arc * con, - struct state ** intermediates) +pull(struct nfa *nfa, + struct arc *con, + struct state **intermediates) { struct state *from = con->from; struct state *to = con->to; @@ -1641,7 +1641,7 @@ pull(struct nfa * nfa, * pushfwd - push forward constraints forward to eliminate them */ static void -pushfwd(struct nfa * nfa, +pushfwd(struct nfa *nfa, FILE *f) /* for debug output; NULL none */ { struct state *s; @@ -1721,9 +1721,9 @@ pushfwd(struct nfa * nfa, * through their tmp fields). */ static int -push(struct nfa * nfa, - struct arc * con, - struct state ** intermediates) +push(struct nfa *nfa, + struct arc *con, + struct state **intermediates) { struct state *from = con->from; struct state *to = con->to; @@ -1812,8 +1812,8 @@ push(struct nfa * nfa, * #def COMPATIBLE 3 // compatible but not satisfied yet */ static int -combine(struct arc * con, - struct arc * a) +combine(struct arc *con, + struct arc *a) { #define CA(ct,at) (((ct)<<CHAR_BIT) | (at)) @@ -1866,7 +1866,7 @@ combine(struct arc * con, * fixempties - get rid of EMPTY arcs */ static void -fixempties(struct nfa * nfa, +fixempties(struct nfa *nfa, FILE *f) /* for debug output; NULL none */ { struct state *s; @@ -2093,10 +2093,10 @@ fixempties(struct nfa * nfa, * the NFA ... but that could still be enough to cause trouble. */ static struct state * -emptyreachable(struct nfa * nfa, - struct state * s, - struct state * lastfound, - struct arc ** inarcsorig) +emptyreachable(struct nfa *nfa, + struct state *s, + struct state *lastfound, + struct arc **inarcsorig) { struct arc *a; @@ -2121,7 +2121,7 @@ emptyreachable(struct nfa * nfa, * isconstraintarc - detect whether an arc is of a constraint type */ static inline int -isconstraintarc(struct arc * a) +isconstraintarc(struct arc *a) { switch (a->type) { @@ -2139,7 +2139,7 @@ isconstraintarc(struct arc * a) * hasconstraintout - does state have a constraint out arc? */ static int -hasconstraintout(struct state * s) +hasconstraintout(struct state *s) { struct arc *a; @@ -2160,7 +2160,7 @@ hasconstraintout(struct state * s) * of such loops before doing that. */ static void -fixconstraintloops(struct nfa * nfa, +fixconstraintloops(struct nfa *nfa, FILE *f) /* for debug output; NULL none */ { struct state *s; @@ -2259,7 +2259,7 @@ restart: * of the NFA ... but that could still be enough to cause trouble. */ static int -findconstraintloop(struct nfa * nfa, struct state * s) +findconstraintloop(struct nfa *nfa, struct state *s) { struct arc *a; @@ -2348,7 +2348,7 @@ findconstraintloop(struct nfa * nfa, struct state * s) * break the loop just by removing those loop arcs, with no new states added. */ static void -breakconstraintloop(struct nfa * nfa, struct state * sinitial) +breakconstraintloop(struct nfa *nfa, struct state *sinitial) { struct state *s; struct state *shead; @@ -2494,11 +2494,11 @@ breakconstraintloop(struct nfa * nfa, struct state * sinitial) * successor states. */ static void -clonesuccessorstates(struct nfa * nfa, - struct state * ssource, - struct state * sclone, - struct state * spredecessor, - struct arc * refarc, +clonesuccessorstates(struct nfa *nfa, + struct state *ssource, + struct state *sclone, + struct state *spredecessor, + struct arc *refarc, char *curdonemap, char *outerdonemap, int nstates) @@ -2726,7 +2726,7 @@ clonesuccessorstates(struct nfa * nfa, * cleanup - clean up NFA after optimizations */ static void -cleanup(struct nfa * nfa) +cleanup(struct nfa *nfa) { struct state *s; struct state *nexts; @@ -2761,10 +2761,10 @@ cleanup(struct nfa * nfa) * markreachable - recursive marking of reachable states */ static void -markreachable(struct nfa * nfa, - struct state * s, - struct state * okay, /* consider only states with this mark */ - struct state * mark) /* the value to mark with */ +markreachable(struct nfa *nfa, + struct state *s, + struct state *okay, /* consider only states with this mark */ + struct state *mark) /* the value to mark with */ { struct arc *a; @@ -2787,10 +2787,10 @@ markreachable(struct nfa * nfa, * markcanreach - recursive marking of states which can reach here */ static void -markcanreach(struct nfa * nfa, - struct state * s, - struct state * okay, /* consider only states with this mark */ - struct state * mark) /* the value to mark with */ +markcanreach(struct nfa *nfa, + struct state *s, + struct state *okay, /* consider only states with this mark */ + struct state *mark) /* the value to mark with */ { struct arc *a; @@ -2813,7 +2813,7 @@ markcanreach(struct nfa * nfa, * analyze - ascertain potentially-useful facts about an optimized NFA */ static long /* re_info bits to be ORed in */ -analyze(struct nfa * nfa) +analyze(struct nfa *nfa) { struct arc *a; struct arc *aa; @@ -2834,8 +2834,8 @@ analyze(struct nfa * nfa) * compact - construct the compact representation of an NFA */ static void -compact(struct nfa * nfa, - struct cnfa * cnfa) +compact(struct nfa *nfa, + struct cnfa *cnfa) { struct state *s; struct arc *a; @@ -2922,7 +2922,7 @@ compact(struct nfa * nfa, * carcsort - sort compacted-NFA arcs by color */ static void -carcsort(struct carc * first, size_t n) +carcsort(struct carc *first, size_t n) { if (n > 1) qsort(first, n, sizeof(struct carc), carc_cmp); @@ -2949,7 +2949,7 @@ carc_cmp(const void *a, const void *b) * freecnfa - free a compacted NFA */ static void -freecnfa(struct cnfa * cnfa) +freecnfa(struct cnfa *cnfa) { assert(cnfa->nstates != 0); /* not empty already */ cnfa->nstates = 0; @@ -2962,7 +2962,7 @@ freecnfa(struct cnfa * cnfa) * dumpnfa - dump an NFA in human-readable form */ static void -dumpnfa(struct nfa * nfa, +dumpnfa(struct nfa *nfa, FILE *f) { #ifdef REG_DEBUG @@ -2999,7 +2999,7 @@ dumpnfa(struct nfa * nfa, * dumpstate - dump an NFA state in human-readable form */ static void -dumpstate(struct state * s, +dumpstate(struct state *s, FILE *f) { struct arc *a; @@ -3025,7 +3025,7 @@ dumpstate(struct state * s, * dumparcs - dump out-arcs in human-readable form */ static void -dumparcs(struct state * s, +dumparcs(struct state *s, FILE *f) { int pos; @@ -3057,8 +3057,8 @@ dumparcs(struct state * s, * dumparc - dump one outarc in readable form, including prefixing tab */ static void -dumparc(struct arc * a, - struct state * s, +dumparc(struct arc *a, + struct state *s, FILE *f) { struct arc *aa; @@ -3121,7 +3121,7 @@ dumparc(struct arc * a, */ #ifdef REG_DEBUG static void -dumpcnfa(struct cnfa * cnfa, +dumpcnfa(struct cnfa *cnfa, FILE *f) { int st; @@ -3151,7 +3151,7 @@ dumpcnfa(struct cnfa * cnfa, */ static void dumpcstate(int st, - struct cnfa * cnfa, + struct cnfa *cnfa, FILE *f) { struct carc *ca; diff --git a/src/backend/regex/regcomp.c b/src/backend/regex/regcomp.c index 0834ae6e06..777373e691 100644 --- a/src/backend/regex/regcomp.c +++ b/src/backend/regex/regcomp.c @@ -491,14 +491,14 @@ pg_regcomp(regex_t *re, * moresubs - enlarge subRE vector */ static void -moresubs(struct vars * v, +moresubs(struct vars *v, int wanted) /* want enough room for this one */ { struct subre **p; size_t n; assert(wanted > 0 && (size_t) wanted >= v->nsubs); - n = (size_t) wanted *3 / 2 + 1; + n = (size_t) wanted * 3 / 2 + 1; if (v->subs == v->sub10) { @@ -528,7 +528,7 @@ moresubs(struct vars * v, * (if any), to make error-handling code terser. */ static int -freev(struct vars * v, +freev(struct vars *v, int err) { if (v->re != NULL) @@ -557,8 +557,8 @@ freev(struct vars * v, * NFA must have been optimize()d already. */ static void -makesearch(struct vars * v, - struct nfa * nfa) +makesearch(struct vars *v, + struct nfa *nfa) { struct arc *a; struct arc *b; @@ -646,11 +646,11 @@ makesearch(struct vars * v, * of a chain of '|' subres. */ static struct subre * -parse(struct vars * v, +parse(struct vars *v, int stopper, /* EOS or ')' */ int type, /* LACON (lookaround subRE) or PLAIN */ - struct state * init, /* initial state */ - struct state * final) /* final state */ + struct state *init, /* initial state */ + struct state *final) /* final state */ { struct state *left; /* scaffolding for branch */ struct state *right; @@ -725,11 +725,11 @@ parse(struct vars * v, * ',' nodes introduced only when necessary due to substructure. */ static struct subre * -parsebranch(struct vars * v, +parsebranch(struct vars *v, int stopper, /* EOS or ')' */ int type, /* LACON (lookaround subRE) or PLAIN */ - struct state * left, /* leftmost state */ - struct state * right, /* rightmost state */ + struct state *left, /* leftmost state */ + struct state *right, /* rightmost state */ int partial) /* is this only part of a branch? */ { struct state *lp; /* left end of current construct */ @@ -774,12 +774,12 @@ parsebranch(struct vars * v, * of the branch, making this function's name somewhat inaccurate. */ static void -parseqatom(struct vars * v, +parseqatom(struct vars *v, int stopper, /* EOS or ')' */ int type, /* LACON (lookaround subRE) or PLAIN */ - struct state * lp, /* left state to hang it on */ - struct state * rp, /* right state to hang it on */ - struct subre * top) /* subtree top */ + struct state *lp, /* left state to hang it on */ + struct state *rp, /* right state to hang it on */ + struct subre *top) /* subtree top */ { struct state *s; /* temporaries for new states */ struct state *s2; @@ -1222,10 +1222,10 @@ parseqatom(struct vars * v, * nonword - generate arcs for non-word-character ahead or behind */ static void -nonword(struct vars * v, +nonword(struct vars *v, int dir, /* AHEAD or BEHIND */ - struct state * lp, - struct state * rp) + struct state *lp, + struct state *rp) { int anchor = (dir == AHEAD) ? '$' : '^'; @@ -1240,10 +1240,10 @@ nonword(struct vars * v, * word - generate arcs for word character ahead or behind */ static void -word(struct vars * v, +word(struct vars *v, int dir, /* AHEAD or BEHIND */ - struct state * lp, - struct state * rp) + struct state *lp, + struct state *rp) { assert(dir == AHEAD || dir == BEHIND); cloneouts(v->nfa, v->wordchrs, lp, rp, dir); @@ -1254,7 +1254,7 @@ word(struct vars * v, * scannum - scan a number */ static int /* value, <= DUPMAX */ -scannum(struct vars * v) +scannum(struct vars *v) { int n = 0; @@ -1285,9 +1285,9 @@ scannum(struct vars * v) * code in parse(), and when this is called, it doesn't matter any more. */ static void -repeat(struct vars * v, - struct state * lp, - struct state * rp, +repeat(struct vars *v, + struct state *lp, + struct state *rp, int m, int n) { @@ -1371,9 +1371,9 @@ repeat(struct vars * v, * Also called from cbracket for complemented bracket expressions. */ static void -bracket(struct vars * v, - struct state * lp, - struct state * rp) +bracket(struct vars *v, + struct state *lp, + struct state *rp) { assert(SEE('[')); NEXT(); @@ -1390,9 +1390,9 @@ bracket(struct vars * v, * arcs as the b.e. is seen... but that gets messy. */ static void -cbracket(struct vars * v, - struct state * lp, - struct state * rp) +cbracket(struct vars *v, + struct state *lp, + struct state *rp) { struct state *left = newstate(v->nfa); struct state *right = newstate(v->nfa); @@ -1420,9 +1420,9 @@ cbracket(struct vars * v, * brackpart - handle one item (or range) within a bracket expression */ static void -brackpart(struct vars * v, - struct state * lp, - struct state * rp) +brackpart(struct vars *v, + struct state *lp, + struct state *rp) { chr startc; chr endc; @@ -1533,7 +1533,7 @@ brackpart(struct vars * v, * to look past the final bracket of the [. etc. */ static const chr * /* just after end of sequence */ -scanplain(struct vars * v) +scanplain(struct vars *v) { const chr *endp; @@ -1558,10 +1558,10 @@ scanplain(struct vars * v) * This is mostly a shortcut for efficient handling of the common case. */ static void -onechr(struct vars * v, +onechr(struct vars *v, chr c, - struct state * lp, - struct state * rp) + struct state *lp, + struct state *rp) { if (!(v->cflags & REG_ICASE)) { @@ -1585,7 +1585,7 @@ onechr(struct vars * v, * should be cleaned up to reduce dependencies on input scanning. */ static void -wordchrs(struct vars * v) +wordchrs(struct vars *v) { struct state *left; struct state *right; @@ -1617,12 +1617,12 @@ wordchrs(struct vars * v) * can be optimized. */ static void -processlacon(struct vars * v, - struct state * begin, /* start of parsed LACON sub-re */ - struct state * end, /* end of parsed LACON sub-re */ +processlacon(struct vars *v, + struct state *begin, /* start of parsed LACON sub-re */ + struct state *end, /* end of parsed LACON sub-re */ int latype, - struct state * lp, /* left state to hang it on */ - struct state * rp) /* right state to hang it on */ + struct state *lp, /* left state to hang it on */ + struct state *rp) /* right state to hang it on */ { struct state *s1; int n; @@ -1683,11 +1683,11 @@ processlacon(struct vars * v, * subre - allocate a subre */ static struct subre * -subre(struct vars * v, +subre(struct vars *v, int op, int flags, - struct state * begin, - struct state * end) + struct state *begin, + struct state *end) { struct subre *ret = v->treefree; @@ -1735,8 +1735,8 @@ subre(struct vars * v, * freesubre - free a subRE subtree */ static void -freesubre(struct vars * v, /* might be NULL */ - struct subre * sr) +freesubre(struct vars *v, /* might be NULL */ + struct subre *sr) { if (sr == NULL) return; @@ -1753,8 +1753,8 @@ freesubre(struct vars * v, /* might be NULL */ * freesrnode - free one node in a subRE subtree */ static void -freesrnode(struct vars * v, /* might be NULL */ - struct subre * sr) +freesrnode(struct vars *v, /* might be NULL */ + struct subre *sr) { if (sr == NULL) return; @@ -1777,8 +1777,8 @@ freesrnode(struct vars * v, /* might be NULL */ * optst - optimize a subRE subtree */ static void -optst(struct vars * v, - struct subre * t) +optst(struct vars *v, + struct subre *t) { /* * DGP (2007-11-13): I assume it was the programmer's intent to eventually @@ -1793,7 +1793,7 @@ optst(struct vars * v, * numst - number tree nodes (assigning "id" indexes) */ static int /* next number */ -numst(struct subre * t, +numst(struct subre *t, int start) /* starting point for subtree numbers */ { int i; @@ -1827,7 +1827,7 @@ numst(struct subre * t, * in or between these two functions. */ static void -markst(struct subre * t) +markst(struct subre *t) { assert(t != NULL); @@ -1842,7 +1842,7 @@ markst(struct subre * t) * cleanst - free any tree nodes not marked INUSE */ static void -cleanst(struct vars * v) +cleanst(struct vars *v) { struct subre *t; struct subre *next; @@ -1861,8 +1861,8 @@ cleanst(struct vars * v) * nfatree - turn a subRE subtree into a tree of compacted NFAs */ static long /* optimize results from top node */ -nfatree(struct vars * v, - struct subre * t, +nfatree(struct vars *v, + struct subre *t, FILE *f) /* for debug output */ { assert(t != NULL && t->begin != NULL); @@ -1881,8 +1881,8 @@ nfatree(struct vars * v, * If converttosearch is true, apply makesearch() to the NFA. */ static long /* optimize results */ -nfanode(struct vars * v, - struct subre * t, +nfanode(struct vars *v, + struct subre *t, int converttosearch, FILE *f) /* for debug output */ { @@ -1920,9 +1920,9 @@ nfanode(struct vars * v, * newlacon - allocate a lookaround-constraint subRE */ static int /* lacon number */ -newlacon(struct vars * v, - struct state * begin, - struct state * end, +newlacon(struct vars *v, + struct state *begin, + struct state *end, int latype) { int n; @@ -1959,7 +1959,7 @@ newlacon(struct vars * v, * freelacons - free lookaround-constraint subRE vector */ static void -freelacons(struct subre * subs, +freelacons(struct subre *subs, int n) { struct subre *sub; @@ -2102,7 +2102,7 @@ dump(regex_t *re, * dumpst - dump a subRE tree */ static void -dumpst(struct subre * t, +dumpst(struct subre *t, FILE *f, int nfapresent) /* is the original NFA still around? */ { @@ -2117,7 +2117,7 @@ dumpst(struct subre * t, * stdump - recursive guts of dumpst */ static void -stdump(struct subre * t, +stdump(struct subre *t, FILE *f, int nfapresent) /* is the original NFA still around? */ { @@ -2167,7 +2167,7 @@ stdump(struct subre * t, * stid - identify a subtree node for dumping */ static const char * /* points to buf or constant string */ -stid(struct subre * t, +stid(struct subre *t, char *buf, size_t bufsize) { diff --git a/src/backend/regex/rege_dfa.c b/src/backend/regex/rege_dfa.c index b98c9d3902..366b79f492 100644 --- a/src/backend/regex/rege_dfa.c +++ b/src/backend/regex/rege_dfa.c @@ -39,8 +39,8 @@ * Internal errors also return NULL, with v->err set. */ static chr * -longest(struct vars * v, - struct dfa * d, +longest(struct vars *v, + struct dfa *d, chr *start, /* where the match should start */ chr *stop, /* match must end at or before here */ int *hitstopp) /* record whether hit v->stop, if non-NULL */ @@ -165,8 +165,8 @@ longest(struct vars * v, * Internal errors also return NULL, with v->err set. */ static chr * -shortest(struct vars * v, - struct dfa * d, +shortest(struct vars *v, + struct dfa *d, chr *start, /* where the match should start */ chr *min, /* match must end at or after here */ chr *max, /* match must end at or before here */ @@ -300,10 +300,10 @@ shortest(struct vars * v, * Internal errors also return 0, with v->err set. */ static int -matchuntil(struct vars * v, - struct dfa * d, +matchuntil(struct vars *v, + struct dfa *d, chr *probe, /* we want to know if a match ends here */ - struct sset ** lastcss, /* state storage across calls */ + struct sset **lastcss, /* state storage across calls */ chr **lastcp) /* state storage across calls */ { chr *cp = *lastcp; @@ -414,8 +414,8 @@ matchuntil(struct vars * v, * lastcold - determine last point at which no progress had been made */ static chr * /* endpoint, or NULL */ -lastcold(struct vars * v, - struct dfa * d) +lastcold(struct vars *v, + struct dfa *d) { struct sset *ss; chr *nopr; @@ -434,10 +434,10 @@ lastcold(struct vars * v, * newdfa - set up a fresh DFA */ static struct dfa * -newdfa(struct vars * v, - struct cnfa * cnfa, - struct colormap * cm, - struct smalldfa * sml) /* preallocated space, may be NULL */ +newdfa(struct vars *v, + struct cnfa *cnfa, + struct colormap *cm, + struct smalldfa *sml) /* preallocated space, may be NULL */ { struct dfa *d; size_t nss = cnfa->nstates * 2; @@ -514,7 +514,7 @@ newdfa(struct vars * v, * freedfa - free a DFA */ static void -freedfa(struct dfa * d) +freedfa(struct dfa *d) { if (d->cptsmalloced) { @@ -554,8 +554,8 @@ hash(unsigned *uv, * initialize - hand-craft a cache entry for startup, otherwise get ready */ static struct sset * -initialize(struct vars * v, - struct dfa * d, +initialize(struct vars *v, + struct dfa *d, chr *start) { struct sset *ss; @@ -600,9 +600,9 @@ initialize(struct vars * v, * Internal errors also return NULL, with v->err set. */ static struct sset * -miss(struct vars * v, - struct dfa * d, - struct sset * css, +miss(struct vars *v, + struct dfa *d, + struct sset *css, color co, chr *cp, /* next chr */ chr *start) /* where the attempt got started */ @@ -740,8 +740,8 @@ miss(struct vars * v, * lacon - lookaround-constraint checker for miss() */ static int /* predicate: constraint satisfied? */ -lacon(struct vars * v, - struct cnfa * pcnfa, /* parent cnfa */ +lacon(struct vars *v, + struct cnfa *pcnfa, /* parent cnfa */ chr *cp, color co) /* "color" of the lookaround constraint */ { @@ -797,8 +797,8 @@ lacon(struct vars * v, * clear the innards of the state set -- that's up to the caller. */ static struct sset * -getvacant(struct vars * v, - struct dfa * d, +getvacant(struct vars *v, + struct dfa *d, chr *cp, chr *start) { @@ -868,8 +868,8 @@ getvacant(struct vars * v, * pickss - pick the next stateset to be used */ static struct sset * -pickss(struct vars * v, - struct dfa * d, +pickss(struct vars *v, + struct dfa *d, chr *cp, chr *start) { diff --git a/src/backend/regex/regerror.c b/src/backend/regex/regerror.c index f2fe696425..2d38fbc646 100644 --- a/src/backend/regex/regerror.c +++ b/src/backend/regex/regerror.c @@ -42,7 +42,7 @@ static const struct rerr int code; const char *name; const char *explain; -} rerrs[] = +} rerrs[] = { /* the actual table is built from regex.h */ diff --git a/src/backend/regex/regexec.c b/src/backend/regex/regexec.c index 5cbfd9b151..471ddb2aad 100644 --- a/src/backend/regex/regexec.c +++ b/src/backend/regex/regexec.c @@ -334,8 +334,8 @@ cleanup: * The DFA will be freed by the cleanup step in pg_regexec(). */ static struct dfa * -getsubdfa(struct vars * v, - struct subre * t) +getsubdfa(struct vars *v, + struct subre *t) { if (v->subdfas[t->id] == NULL) { @@ -352,7 +352,7 @@ getsubdfa(struct vars * v, * Same as above, but for LACONs. */ static struct dfa * -getladfa(struct vars * v, +getladfa(struct vars *v, int n) { assert(n > 0 && n < v->g->nlacons && v->g->lacons != NULL); @@ -372,9 +372,9 @@ getladfa(struct vars * v, * find - find a match for the main NFA (no-complications case) */ static int -find(struct vars * v, - struct cnfa * cnfa, - struct colormap * cm) +find(struct vars *v, + struct cnfa *cnfa, + struct colormap *cm) { struct dfa *s; struct dfa *d; @@ -463,9 +463,9 @@ find(struct vars * v, * cfind - find a match for the main NFA (with complications) */ static int -cfind(struct vars * v, - struct cnfa * cnfa, - struct colormap * cm) +cfind(struct vars *v, + struct cnfa *cnfa, + struct colormap *cm) { struct dfa *s; struct dfa *d; @@ -503,11 +503,11 @@ cfind(struct vars * v, * cfindloop - the heart of cfind */ static int -cfindloop(struct vars * v, - struct cnfa * cnfa, - struct colormap * cm, - struct dfa * d, - struct dfa * s, +cfindloop(struct vars *v, + struct cnfa *cnfa, + struct colormap *cm, + struct dfa *d, + struct dfa *s, chr **coldp) /* where to put coldstart pointer */ { chr *begin; @@ -632,8 +632,8 @@ zapallsubs(regmatch_t *p, * zaptreesubs - initialize subexpressions within subtree to "no match" */ static void -zaptreesubs(struct vars * v, - struct subre * t) +zaptreesubs(struct vars *v, + struct subre *t) { if (t->op == '(') { @@ -657,8 +657,8 @@ zaptreesubs(struct vars * v, * subset - set subexpression match data for a successful subre */ static void -subset(struct vars * v, - struct subre * sub, +subset(struct vars *v, + struct subre *sub, chr *begin, chr *end) { @@ -689,8 +689,8 @@ subset(struct vars * v, * zaptreesubs (or zapallsubs at the top level). */ static int /* regexec return code */ -cdissect(struct vars * v, - struct subre * t, +cdissect(struct vars *v, + struct subre *t, chr *begin, /* beginning of relevant substring */ chr *end) /* end of same */ { @@ -760,8 +760,8 @@ cdissect(struct vars * v, * ccondissect - dissect match for concatenation node */ static int /* regexec return code */ -ccondissect(struct vars * v, - struct subre * t, +ccondissect(struct vars *v, + struct subre *t, chr *begin, /* beginning of relevant substring */ chr *end) /* end of same */ { @@ -838,8 +838,8 @@ ccondissect(struct vars * v, * crevcondissect - dissect match for concatenation node, shortest-first */ static int /* regexec return code */ -crevcondissect(struct vars * v, - struct subre * t, +crevcondissect(struct vars *v, + struct subre *t, chr *begin, /* beginning of relevant substring */ chr *end) /* end of same */ { @@ -916,8 +916,8 @@ crevcondissect(struct vars * v, * cbrdissect - dissect match for backref node */ static int /* regexec return code */ -cbrdissect(struct vars * v, - struct subre * t, +cbrdissect(struct vars *v, + struct subre *t, chr *begin, /* beginning of relevant substring */ chr *end) /* end of same */ { @@ -997,8 +997,8 @@ cbrdissect(struct vars * v, * caltdissect - dissect match for alternation node */ static int /* regexec return code */ -caltdissect(struct vars * v, - struct subre * t, +caltdissect(struct vars *v, + struct subre *t, chr *begin, /* beginning of relevant substring */ chr *end) /* end of same */ { @@ -1034,8 +1034,8 @@ caltdissect(struct vars * v, * citerdissect - dissect match for iteration node */ static int /* regexec return code */ -citerdissect(struct vars * v, - struct subre * t, +citerdissect(struct vars *v, + struct subre *t, chr *begin, /* beginning of relevant substring */ chr *end) /* end of same */ { @@ -1235,8 +1235,8 @@ backtrack: * creviterdissect - dissect match for iteration node, shortest-first */ static int /* regexec return code */ -creviterdissect(struct vars * v, - struct subre * t, +creviterdissect(struct vars *v, + struct subre *t, chr *begin, /* beginning of relevant substring */ chr *end) /* end of same */ { diff --git a/src/backend/regex/regexport.c b/src/backend/regex/regexport.c index 371c1f9da6..53417f0e7d 100644 --- a/src/backend/regex/regexport.c +++ b/src/backend/regex/regexport.c @@ -90,7 +90,7 @@ pg_reg_getfinalstate(const regex_t *regex) * arcs_len (possibly 0) are emitted into arcs[]. */ static void -traverse_lacons(struct cnfa * cnfa, int st, +traverse_lacons(struct cnfa *cnfa, int st, int *arcs_count, regex_arc_t *arcs, int arcs_len) { diff --git a/src/backend/regex/regprefix.c b/src/backend/regex/regprefix.c index cb74f2f311..96ca0e1ed3 100644 --- a/src/backend/regex/regprefix.c +++ b/src/backend/regex/regprefix.c @@ -19,7 +19,7 @@ /* * forward declarations */ -static int findprefix(struct cnfa * cnfa, struct colormap * cm, +static int findprefix(struct cnfa *cnfa, struct colormap *cm, chr *string, size_t *slength); @@ -109,8 +109,8 @@ pg_regprefix(regex_t *re, * *slength (which must be preset to zero) incremented for each chr. */ static int /* regprefix return code */ -findprefix(struct cnfa * cnfa, - struct colormap * cm, +findprefix(struct cnfa *cnfa, + struct colormap *cm, chr *string, size_t *slength) { diff --git a/src/backend/replication/basebackup.c b/src/backend/replication/basebackup.c index cb5f58b6ba..f3671cf41f 100644 --- a/src/backend/replication/basebackup.c +++ b/src/backend/replication/basebackup.c @@ -54,11 +54,11 @@ typedef struct static int64 sendDir(char *path, int basepathlen, bool sizeonly, List *tablespaces, bool sendtblspclinks); static bool sendFile(char *readfilename, char *tarfilename, - struct stat * statbuf, bool missing_ok); + struct stat *statbuf, bool missing_ok); static void sendFileWithContent(const char *filename, const char *content); static int64 _tarWriteHeader(const char *filename, const char *linktarget, - struct stat * statbuf, bool sizeonly); -static int64 _tarWriteDir(const char *pathbuf, int basepathlen, struct stat * statbuf, + struct stat *statbuf, bool sizeonly); +static int64 _tarWriteDir(const char *pathbuf, int basepathlen, struct stat *statbuf, bool sizeonly); static void send_int8_string(StringInfoData *buf, int64 intval); static void SendBackupHeader(List *tablespaces); @@ -1199,7 +1199,7 @@ sendDir(char *path, int basepathlen, bool sizeonly, List *tablespaces, * and the file did not exist. */ static bool -sendFile(char *readfilename, char *tarfilename, struct stat * statbuf, +sendFile(char *readfilename, char *tarfilename, struct stat *statbuf, bool missing_ok) { FILE *fp; @@ -1273,7 +1273,7 @@ sendFile(char *readfilename, char *tarfilename, struct stat * statbuf, static int64 _tarWriteHeader(const char *filename, const char *linktarget, - struct stat * statbuf, bool sizeonly) + struct stat *statbuf, bool sizeonly) { char h[512]; enum tarError rc; @@ -1314,7 +1314,7 @@ _tarWriteHeader(const char *filename, const char *linktarget, * write it as a directory anyway. */ static int64 -_tarWriteDir(const char *pathbuf, int basepathlen, struct stat * statbuf, +_tarWriteDir(const char *pathbuf, int basepathlen, struct stat *statbuf, bool sizeonly) { /* If symlink, write it as a directory anyway */ diff --git a/src/backend/replication/logical/reorderbuffer.c b/src/backend/replication/logical/reorderbuffer.c index 8f4f7f842b..0182fb7fa7 100644 --- a/src/backend/replication/logical/reorderbuffer.c +++ b/src/backend/replication/logical/reorderbuffer.c @@ -180,8 +180,7 @@ static void AssertTXNLsnOrder(ReorderBuffer *rb); * --------------------------------------- */ static ReorderBufferIterTXNState *ReorderBufferIterTXNInit(ReorderBuffer *rb, ReorderBufferTXN *txn); -static ReorderBufferChange * - ReorderBufferIterTXNNext(ReorderBuffer *rb, ReorderBufferIterTXNState *state); +static ReorderBufferChange *ReorderBufferIterTXNNext(ReorderBuffer *rb, ReorderBufferIterTXNState *state); static void ReorderBufferIterTXNFinish(ReorderBuffer *rb, ReorderBufferIterTXNState *state); static void ReorderBufferExecuteInvalidations(ReorderBuffer *rb, ReorderBufferTXN *txn); diff --git a/src/backend/replication/walreceiver.c b/src/backend/replication/walreceiver.c index 2723612718..01b86ffe8a 100644 --- a/src/backend/replication/walreceiver.c +++ b/src/backend/replication/walreceiver.c @@ -106,7 +106,7 @@ static struct { XLogRecPtr Write; /* last byte + 1 written out in the standby */ XLogRecPtr Flush; /* last byte + 1 flushed in the standby */ -} LogstreamResult; +} LogstreamResult; static StringInfoData reply_message; static StringInfoData incoming_message; diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c index 976a42f86d..b61eaef6f5 100644 --- a/src/backend/replication/walsender.c +++ b/src/backend/replication/walsender.c @@ -117,7 +117,8 @@ bool am_cascading_walsender = false; /* Am I cascading WAL to bool am_db_walsender = false; /* Connected to a database? */ /* User-settable parameters for walsender */ -int max_wal_senders = 0; /* the maximum number of concurrent walsenders */ +int max_wal_senders = 0; /* the maximum number of concurrent + * walsenders */ int wal_sender_timeout = 60 * 1000; /* maximum time to send one * WAL data message */ bool log_replication_commands = false; @@ -214,7 +215,7 @@ static struct int write_head; int read_heads[NUM_SYNC_REP_WAIT_MODE]; WalTimeSample last_read[NUM_SYNC_REP_WAIT_MODE]; -} LagTracker; +} LagTracker; /* Signal handlers */ static void WalSndLastCycleHandler(SIGNAL_ARGS); diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c index e6812eef89..2ca6c63799 100644 --- a/src/backend/rewrite/rewriteHandler.c +++ b/src/backend/rewrite/rewriteHandler.c @@ -1400,7 +1400,7 @@ matchLocks(CmdType event, oneLock->enabled == RULE_DISABLED) continue; } - else /* ORIGIN or LOCAL ROLE */ + else /* ORIGIN or LOCAL ROLE */ { if (oneLock->enabled == RULE_FIRES_ON_REPLICA || oneLock->enabled == RULE_DISABLED) diff --git a/src/backend/snowball/dict_snowball.c b/src/backend/snowball/dict_snowball.c index 0c322a49c6..7cf668de19 100644 --- a/src/backend/snowball/dict_snowball.c +++ b/src/backend/snowball/dict_snowball.c @@ -126,7 +126,7 @@ typedef struct DictSnowball struct SN_env *z; StopList stoplist; bool needrecode; /* needs recoding before/after call stem */ - int (*stem) (struct SN_env * z); + int (*stem) (struct SN_env *z); /* * snowball saves alloced memory between calls, so we should run it in our diff --git a/src/backend/statistics/dependencies.c b/src/backend/statistics/dependencies.c index ba3b1d00bb..00ee3a3e0a 100644 --- a/src/backend/statistics/dependencies.c +++ b/src/backend/statistics/dependencies.c @@ -409,7 +409,7 @@ statext_dependencies_build(int numrows, HeapTuple *rows, Bitmapset *attrs, continue; d = (MVDependency *) palloc0(offsetof(MVDependency, attributes) - +k * sizeof(AttrNumber)); + + k * sizeof(AttrNumber)); /* copy the dependency (and keep the indexes into stxkeys) */ d->degree = degree; @@ -431,7 +431,7 @@ statext_dependencies_build(int numrows, HeapTuple *rows, Bitmapset *attrs, dependencies->ndeps++; dependencies = (MVDependencies *) repalloc(dependencies, offsetof(MVDependencies, deps) - +dependencies->ndeps * sizeof(MVDependency)); + + dependencies->ndeps * sizeof(MVDependency)); dependencies->deps[dependencies->ndeps - 1] = d; } @@ -552,7 +552,7 @@ statext_dependencies_deserialize(bytea *data) /* allocate space for the MCV items */ dependencies = repalloc(dependencies, offsetof(MVDependencies, deps) - +(dependencies->ndeps * sizeof(MVDependency *))); + + (dependencies->ndeps * sizeof(MVDependency *))); for (i = 0; i < dependencies->ndeps; i++) { @@ -573,7 +573,7 @@ statext_dependencies_deserialize(bytea *data) /* now that we know the number of attributes, allocate the dependency */ d = (MVDependency *) palloc0(offsetof(MVDependency, attributes) - +(k * sizeof(AttrNumber))); + + (k * sizeof(AttrNumber))); d->degree = degree; d->nattributes = k; diff --git a/src/backend/statistics/extended_stats.c b/src/backend/statistics/extended_stats.c index 8d7460c96b..73d7ef3c27 100644 --- a/src/backend/statistics/extended_stats.c +++ b/src/backend/statistics/extended_stats.c @@ -353,7 +353,7 @@ multi_sort_init(int ndims) Assert(ndims >= 2); mss = (MultiSortSupport) palloc0(offsetof(MultiSortSupportData, ssup) - +sizeof(SortSupportData) * ndims); + + sizeof(SortSupportData) * ndims); mss->ndims = ndims; diff --git a/src/backend/statistics/mvdistinct.c b/src/backend/statistics/mvdistinct.c index d8d422cd45..4b8d8926d2 100644 --- a/src/backend/statistics/mvdistinct.c +++ b/src/backend/statistics/mvdistinct.c @@ -166,7 +166,7 @@ statext_ndistinct_serialize(MVNDistinct *ndistinct) * for each item, including number of items for each. */ len = VARHDRSZ + SizeOfMVNDistinct + - ndistinct->nitems * (offsetof(MVNDistinctItem, attrs) +sizeof(int)); + ndistinct->nitems * (offsetof(MVNDistinctItem, attrs) + sizeof(int)); /* and also include space for the actual attribute numbers */ for (i = 0; i < ndistinct->nitems; i++) @@ -513,10 +513,10 @@ estimate_ndistinct(double totalrows, int numrows, int d, int f1) denom, ndistinct; - numer = (double) numrows *(double) d; + numer = (double) numrows * (double) d; denom = (double) (numrows - f1) + - (double) f1 *(double) numrows / totalrows; + (double) f1 * (double) numrows / totalrows; ndistinct = numer / denom; diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 2109cbf858..77296646d9 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -2118,7 +2118,7 @@ BgBufferSync(WritebackContext *wb_context) int32 passes_delta = strategy_passes - prev_strategy_passes; strategy_delta = strategy_buf_id - prev_strategy_buf_id; - strategy_delta += (long) passes_delta *NBuffers; + strategy_delta += (long) passes_delta * NBuffers; Assert(strategy_delta >= 0); @@ -4195,7 +4195,7 @@ ckpt_buforder_comparator(const void *pa, const void *pb) /* compare block number */ else if (a->blockNum < b->blockNum) return -1; - else /* should not be the same block ... */ + else /* should not be the same block ... */ return 1; } diff --git a/src/backend/storage/buffer/freelist.c b/src/backend/storage/buffer/freelist.c index 5d0a636ba8..e14524bb41 100644 --- a/src/backend/storage/buffer/freelist.c +++ b/src/backend/storage/buffer/freelist.c @@ -94,7 +94,7 @@ typedef struct BufferAccessStrategyData * struct. */ Buffer buffers[FLEXIBLE_ARRAY_MEMBER]; -} BufferAccessStrategyData; +} BufferAccessStrategyData; /* Prototypes for internal functions */ diff --git a/src/backend/storage/ipc/dsm.c b/src/backend/storage/ipc/dsm.c index 387849e22c..008cd9145c 100644 --- a/src/backend/storage/ipc/dsm.c +++ b/src/backend/storage/ipc/dsm.c @@ -1160,5 +1160,5 @@ static uint64 dsm_control_bytes_needed(uint32 nitems) { return offsetof(dsm_control_header, item) - +sizeof(dsm_control_item) * (uint64) nitems; + + sizeof(dsm_control_item) * (uint64) nitems; } diff --git a/src/backend/storage/ipc/shm_mq.c b/src/backend/storage/ipc/shm_mq.c index fcd6cc7a8c..f45a67cc27 100644 --- a/src/backend/storage/ipc/shm_mq.c +++ b/src/backend/storage/ipc/shm_mq.c @@ -145,7 +145,7 @@ static shm_mq_result shm_mq_receive_bytes(shm_mq *mq, Size bytes_needed, bool nowait, Size *nbytesp, void **datap); static bool shm_mq_counterparty_gone(volatile shm_mq *mq, BackgroundWorkerHandle *handle); -static bool shm_mq_wait_internal(volatile shm_mq *mq, PGPROC *volatile * ptr, +static bool shm_mq_wait_internal(volatile shm_mq *mq, PGPROC *volatile *ptr, BackgroundWorkerHandle *handle); static uint64 shm_mq_get_bytes_read(volatile shm_mq *mq, bool *detached); static void shm_mq_inc_bytes_read(volatile shm_mq *mq, Size n); @@ -365,7 +365,7 @@ shm_mq_sendv(shm_mq_handle *mqh, shm_mq_iovec *iov, int iovcnt, bool nowait) { Assert(mqh->mqh_partial_bytes < sizeof(Size)); res = shm_mq_send_bytes(mqh, sizeof(Size) - mqh->mqh_partial_bytes, - ((char *) &nbytes) +mqh->mqh_partial_bytes, + ((char *) &nbytes) + mqh->mqh_partial_bytes, nowait, &bytes_written); if (res == SHM_MQ_DETACHED) @@ -1053,7 +1053,7 @@ shm_mq_counterparty_gone(volatile shm_mq *mq, BackgroundWorkerHandle *handle) * non-NULL when our counterpart attaches to the queue. */ static bool -shm_mq_wait_internal(volatile shm_mq *mq, PGPROC *volatile * ptr, +shm_mq_wait_internal(volatile shm_mq *mq, PGPROC *volatile *ptr, BackgroundWorkerHandle *handle) { bool result = false; diff --git a/src/backend/storage/ipc/shm_toc.c b/src/backend/storage/ipc/shm_toc.c index 50334cd797..a532f4fa5c 100644 --- a/src/backend/storage/ipc/shm_toc.c +++ b/src/backend/storage/ipc/shm_toc.c @@ -96,7 +96,7 @@ shm_toc_allocate(shm_toc *toc, Size nbytes) total_bytes = vtoc->toc_total_bytes; allocated_bytes = vtoc->toc_allocated_bytes; nentry = vtoc->toc_nentry; - toc_bytes = offsetof(shm_toc, toc_entry) +nentry * sizeof(shm_toc_entry) + toc_bytes = offsetof(shm_toc, toc_entry) + nentry * sizeof(shm_toc_entry) + allocated_bytes; /* Check for memory exhaustion and overflow. */ @@ -132,7 +132,7 @@ shm_toc_freespace(shm_toc *toc) nentry = vtoc->toc_nentry; SpinLockRelease(&toc->toc_mutex); - toc_bytes = offsetof(shm_toc, toc_entry) +nentry * sizeof(shm_toc_entry); + toc_bytes = offsetof(shm_toc, toc_entry) + nentry * sizeof(shm_toc_entry); Assert(allocated_bytes + BUFFERALIGN(toc_bytes) <= total_bytes); return total_bytes - (allocated_bytes + BUFFERALIGN(toc_bytes)); } @@ -176,7 +176,7 @@ shm_toc_insert(shm_toc *toc, uint64 key, void *address) total_bytes = vtoc->toc_total_bytes; allocated_bytes = vtoc->toc_allocated_bytes; nentry = vtoc->toc_nentry; - toc_bytes = offsetof(shm_toc, toc_entry) +nentry * sizeof(shm_toc_entry) + toc_bytes = offsetof(shm_toc, toc_entry) + nentry * sizeof(shm_toc_entry) + allocated_bytes; /* Check for memory exhaustion and overflow. */ diff --git a/src/backend/storage/ipc/shmem.c b/src/backend/storage/ipc/shmem.c index 67150debf2..b5f49727f7 100644 --- a/src/backend/storage/ipc/shmem.c +++ b/src/backend/storage/ipc/shmem.c @@ -314,7 +314,7 @@ InitShmemIndex(void) * for NULL. */ HTAB * -ShmemInitHash(const char *name, /* table string name for shmem index */ +ShmemInitHash(const char *name, /* table string name for shmem index */ long init_size, /* initial table size */ long max_size, /* max size of the table */ HASHCTL *infoP, /* info about key and bucket size */ diff --git a/src/backend/storage/lmgr/lwlock.c b/src/backend/storage/lmgr/lwlock.c index 35536e4789..a021fbb229 100644 --- a/src/backend/storage/lmgr/lwlock.c +++ b/src/backend/storage/lmgr/lwlock.c @@ -168,7 +168,7 @@ typedef struct lwlock_stats_key { int tranche; void *instance; -} lwlock_stats_key; +} lwlock_stats_key; typedef struct lwlock_stats { @@ -178,7 +178,7 @@ typedef struct lwlock_stats int block_count; int dequeue_self_count; int spin_delay_count; -} lwlock_stats; +} lwlock_stats; static HTAB *lwlock_stats_htab; static lwlock_stats lwlock_stats_dummy; @@ -232,7 +232,7 @@ LOG_LWDEBUG(const char *where, LWLock *lock, const char *msg) static void init_lwlock_stats(void); static void print_lwlock_stats(int code, Datum arg); -static lwlock_stats *get_lwlock_stats_entry(LWLock *lockid); +static lwlock_stats * get_lwlock_stats_entry(LWLock *lockid); static void init_lwlock_stats(void) @@ -851,7 +851,7 @@ LWLockWaitListLock(LWLock *lock) static void LWLockWaitListUnlock(LWLock *lock) { - uint32 old_state PG_USED_FOR_ASSERTS_ONLY; + uint32 old_state PG_USED_FOR_ASSERTS_ONLY; old_state = pg_atomic_fetch_and_u32(&lock->state, ~LW_FLAG_LOCKED); @@ -1092,7 +1092,7 @@ LWLockDequeueSelf(LWLock *lock) #ifdef LOCK_DEBUG { /* not waiting anymore */ - uint32 nwaiters PG_USED_FOR_ASSERTS_ONLY = pg_atomic_fetch_sub_u32(&lock->nwaiters, 1); + uint32 nwaiters PG_USED_FOR_ASSERTS_ONLY = pg_atomic_fetch_sub_u32(&lock->nwaiters, 1); Assert(nwaiters < MAX_BACKENDS); } @@ -1242,7 +1242,7 @@ LWLockAcquire(LWLock *lock, LWLockMode mode) #ifdef LOCK_DEBUG { /* not waiting anymore */ - uint32 nwaiters PG_USED_FOR_ASSERTS_ONLY = pg_atomic_fetch_sub_u32(&lock->nwaiters, 1); + uint32 nwaiters PG_USED_FOR_ASSERTS_ONLY = pg_atomic_fetch_sub_u32(&lock->nwaiters, 1); Assert(nwaiters < MAX_BACKENDS); } @@ -1400,7 +1400,7 @@ LWLockAcquireOrWait(LWLock *lock, LWLockMode mode) #ifdef LOCK_DEBUG { /* not waiting anymore */ - uint32 nwaiters PG_USED_FOR_ASSERTS_ONLY = pg_atomic_fetch_sub_u32(&lock->nwaiters, 1); + uint32 nwaiters PG_USED_FOR_ASSERTS_ONLY = pg_atomic_fetch_sub_u32(&lock->nwaiters, 1); Assert(nwaiters < MAX_BACKENDS); } @@ -1616,7 +1616,7 @@ LWLockWaitForVar(LWLock *lock, uint64 *valptr, uint64 oldval, uint64 *newval) #ifdef LOCK_DEBUG { /* not waiting anymore */ - uint32 nwaiters PG_USED_FOR_ASSERTS_ONLY = pg_atomic_fetch_sub_u32(&lock->nwaiters, 1); + uint32 nwaiters PG_USED_FOR_ASSERTS_ONLY = pg_atomic_fetch_sub_u32(&lock->nwaiters, 1); Assert(nwaiters < MAX_BACKENDS); } diff --git a/src/backend/storage/lmgr/predicate.c b/src/backend/storage/lmgr/predicate.c index f0b127cc60..b07ef4c21b 100644 --- a/src/backend/storage/lmgr/predicate.c +++ b/src/backend/storage/lmgr/predicate.c @@ -337,7 +337,7 @@ typedef struct OldSerXidControlData TransactionId headXid; /* newest valid Xid in the SLRU */ TransactionId tailXid; /* oldest xmin we might be interested in */ bool warningIssued; /* have we issued SLRU wrap-around warning? */ -} OldSerXidControlData; +} OldSerXidControlData; typedef struct OldSerXidControlData *OldSerXidControl; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 3e716b1c6c..b76c170630 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -286,7 +286,7 @@ InitProcGlobal(void) void InitProcess(void) { - PGPROC *volatile * procgloballist; + PGPROC *volatile *procgloballist; /* * ProcGlobal should be set up already (if we are a backend, we inherit @@ -781,7 +781,7 @@ static void ProcKill(int code, Datum arg) { PGPROC *proc; - PGPROC *volatile * procgloballist; + PGPROC *volatile *procgloballist; Assert(MyProc != NULL); diff --git a/src/backend/storage/lmgr/s_lock.c b/src/backend/storage/lmgr/s_lock.c index ac82e704fa..09f1c64e46 100644 --- a/src/backend/storage/lmgr/s_lock.c +++ b/src/backend/storage/lmgr/s_lock.c @@ -250,10 +250,10 @@ update_spins_per_delay(int shared_spins_per_delay) static void tas_dummy() { - __asm__ __volatile__( + __asm__ __volatile__( #if defined(__NetBSD__) && defined(__ELF__) /* no underscore for label and % for registers */ - "\ + "\ .global tas \n\ tas: \n\ movel %sp@(0x4),%a0 \n\ @@ -265,7 +265,7 @@ _success: \n\ moveq #0,%d0 \n\ rts \n" #else - "\ + "\ .global _tas \n\ _tas: \n\ movel sp@(0x4),a0 \n\ @@ -277,7 +277,7 @@ _success: \n\ moveq #0,d0 \n\ rts \n" #endif /* __NetBSD__ && __ELF__ */ - ); + ); } #endif /* __m68k__ && !__linux__ */ #endif /* not __GNUC__ */ diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c index 9bc00b6214..1b1de1f879 100644 --- a/src/backend/storage/smgr/md.c +++ b/src/backend/storage/smgr/md.c @@ -518,7 +518,7 @@ mdextend(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum, v = _mdfd_getseg(reln, forknum, blocknum, skipFsync, EXTENSION_CREATE); - seekpos = (off_t) BLCKSZ *(blocknum % ((BlockNumber) RELSEG_SIZE)); + seekpos = (off_t) BLCKSZ * (blocknum % ((BlockNumber) RELSEG_SIZE)); Assert(seekpos < (off_t) BLCKSZ * RELSEG_SIZE); @@ -664,7 +664,7 @@ mdprefetch(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum) v = _mdfd_getseg(reln, forknum, blocknum, false, EXTENSION_FAIL); - seekpos = (off_t) BLCKSZ *(blocknum % ((BlockNumber) RELSEG_SIZE)); + seekpos = (off_t) BLCKSZ * (blocknum % ((BlockNumber) RELSEG_SIZE)); Assert(seekpos < (off_t) BLCKSZ * RELSEG_SIZE); @@ -715,7 +715,7 @@ mdwriteback(SMgrRelation reln, ForkNumber forknum, Assert(nflush >= 1); Assert(nflush <= nblocks); - seekpos = (off_t) BLCKSZ *(blocknum % ((BlockNumber) RELSEG_SIZE)); + seekpos = (off_t) BLCKSZ * (blocknum % ((BlockNumber) RELSEG_SIZE)); FileWriteback(v->mdfd_vfd, seekpos, (off_t) BLCKSZ * nflush, WAIT_EVENT_DATA_FILE_FLUSH); @@ -744,7 +744,7 @@ mdread(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum, v = _mdfd_getseg(reln, forknum, blocknum, false, EXTENSION_FAIL | EXTENSION_CREATE_RECOVERY); - seekpos = (off_t) BLCKSZ *(blocknum % ((BlockNumber) RELSEG_SIZE)); + seekpos = (off_t) BLCKSZ * (blocknum % ((BlockNumber) RELSEG_SIZE)); Assert(seekpos < (off_t) BLCKSZ * RELSEG_SIZE); @@ -820,7 +820,7 @@ mdwrite(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum, v = _mdfd_getseg(reln, forknum, blocknum, skipFsync, EXTENSION_FAIL | EXTENSION_CREATE_RECOVERY); - seekpos = (off_t) BLCKSZ *(blocknum % ((BlockNumber) RELSEG_SIZE)); + seekpos = (off_t) BLCKSZ * (blocknum % ((BlockNumber) RELSEG_SIZE)); Assert(seekpos < (off_t) BLCKSZ * RELSEG_SIZE); diff --git a/src/backend/storage/smgr/smgr.c b/src/backend/storage/smgr/smgr.c index 0ed1fe91d5..e9850f79ae 100644 --- a/src/backend/storage/smgr/smgr.c +++ b/src/backend/storage/smgr/smgr.c @@ -41,23 +41,23 @@ typedef struct f_smgr void (*smgr_shutdown) (void); /* may be NULL */ void (*smgr_close) (SMgrRelation reln, ForkNumber forknum); void (*smgr_create) (SMgrRelation reln, ForkNumber forknum, - bool isRedo); + bool isRedo); bool (*smgr_exists) (SMgrRelation reln, ForkNumber forknum); void (*smgr_unlink) (RelFileNodeBackend rnode, ForkNumber forknum, - bool isRedo); + bool isRedo); void (*smgr_extend) (SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum, char *buffer, bool skipFsync); void (*smgr_prefetch) (SMgrRelation reln, ForkNumber forknum, - BlockNumber blocknum); + BlockNumber blocknum); void (*smgr_read) (SMgrRelation reln, ForkNumber forknum, - BlockNumber blocknum, char *buffer); + BlockNumber blocknum, char *buffer); void (*smgr_write) (SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum, char *buffer, bool skipFsync); void (*smgr_writeback) (SMgrRelation reln, ForkNumber forknum, - BlockNumber blocknum, BlockNumber nblocks); + BlockNumber blocknum, BlockNumber nblocks); BlockNumber (*smgr_nblocks) (SMgrRelation reln, ForkNumber forknum); void (*smgr_truncate) (SMgrRelation reln, ForkNumber forknum, - BlockNumber nblocks); + BlockNumber nblocks); void (*smgr_immedsync) (SMgrRelation reln, ForkNumber forknum); void (*smgr_pre_ckpt) (void); /* may be NULL */ void (*smgr_sync) (void); /* may be NULL */ diff --git a/src/backend/tcop/fastpath.c b/src/backend/tcop/fastpath.c index 5f272d8448..ba0f06c302 100644 --- a/src/backend/tcop/fastpath.c +++ b/src/backend/tcop/fastpath.c @@ -58,9 +58,9 @@ struct fp_info }; -static int16 parse_fcall_arguments(StringInfo msgBuf, struct fp_info * fip, +static int16 parse_fcall_arguments(StringInfo msgBuf, struct fp_info *fip, FunctionCallInfo fcinfo); -static int16 parse_fcall_arguments_20(StringInfo msgBuf, struct fp_info * fip, +static int16 parse_fcall_arguments_20(StringInfo msgBuf, struct fp_info *fip, FunctionCallInfo fcinfo); @@ -195,7 +195,7 @@ SendFunctionResult(Datum retval, bool isnull, Oid rettype, int16 format) * function 'func_id'. */ static void -fetch_fp_info(Oid func_id, struct fp_info * fip) +fetch_fp_info(Oid func_id, struct fp_info *fip) { HeapTuple func_htp; Form_pg_proc pp; @@ -405,7 +405,7 @@ HandleFunctionRequest(StringInfo msgBuf) * is returned. */ static int16 -parse_fcall_arguments(StringInfo msgBuf, struct fp_info * fip, +parse_fcall_arguments(StringInfo msgBuf, struct fp_info *fip, FunctionCallInfo fcinfo) { int nargs; @@ -543,7 +543,7 @@ parse_fcall_arguments(StringInfo msgBuf, struct fp_info * fip, * is returned. */ static int16 -parse_fcall_arguments_20(StringInfo msgBuf, struct fp_info * fip, +parse_fcall_arguments_20(StringInfo msgBuf, struct fp_info *fip, FunctionCallInfo fcinfo) { int nargs; diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index f99dd0a2d4..fd6c9cf039 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -3041,10 +3041,10 @@ ia64_get_bsp(void) char *ret; /* the ;; is a "stop", seems to be required before fetching BSP */ - __asm__ __volatile__( - ";;\n" - " mov %0=ar.bsp \n" - : "=r"(ret)); + __asm__ __volatile__( + ";;\n" + " mov %0=ar.bsp \n" +: "=r"(ret)); return ret; } diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c index a22fd5397e..dd1916f366 100644 --- a/src/backend/tcop/utility.c +++ b/src/backend/tcop/utility.c @@ -1221,7 +1221,7 @@ ProcessUtilitySlow(ParseState *pstate, AlterDomainValidateConstraint(stmt->typeName, stmt->name); break; - default: /* oops */ + default: /* oops */ elog(ERROR, "unrecognized alter domain type: %d", (int) stmt->subtype); break; diff --git a/src/backend/tsearch/regis.c b/src/backend/tsearch/regis.c index aea76e85b5..2b89f596f0 100644 --- a/src/backend/tsearch/regis.c +++ b/src/backend/tsearch/regis.c @@ -115,7 +115,7 @@ RS_compile(Regis *r, bool issuffix, const char *str) ptr->type = RSF_ONEOF; state = RS_IN_ONEOF; } - else /* shouldn't get here */ + else /* shouldn't get here */ elog(ERROR, "invalid regis pattern: \"%s\"", str); } else if (state == RS_IN_ONEOF) @@ -131,7 +131,7 @@ RS_compile(Regis *r, bool issuffix, const char *str) ptr->len = pg_mblen(c); state = RS_IN_ONEOF_IN; } - else /* shouldn't get here */ + else /* shouldn't get here */ elog(ERROR, "invalid regis pattern: \"%s\"", str); } else if (state == RS_IN_ONEOF_IN || state == RS_IN_NONEOF) @@ -143,7 +143,7 @@ RS_compile(Regis *r, bool issuffix, const char *str) } else if (t_iseq(c, ']')) state = RS_IN_WAIT; - else /* shouldn't get here */ + else /* shouldn't get here */ elog(ERROR, "invalid regis pattern: \"%s\"", str); } else diff --git a/src/backend/tsearch/spell.c b/src/backend/tsearch/spell.c index c1e194a8f5..817237ce4d 100644 --- a/src/backend/tsearch/spell.c +++ b/src/backend/tsearch/spell.c @@ -803,7 +803,7 @@ get_nextfield(char **str, char *next) state = PAE_INMASK; } } - else /* state == PAE_INMASK */ + else /* state == PAE_INMASK */ { if (t_isspace(*str)) { diff --git a/src/backend/tsearch/ts_typanalyze.c b/src/backend/tsearch/ts_typanalyze.c index 017435cc59..f4298ca9aa 100644 --- a/src/backend/tsearch/ts_typanalyze.c +++ b/src/backend/tsearch/ts_typanalyze.c @@ -501,8 +501,8 @@ lexeme_compare(const void *key1, const void *key2) static int trackitem_compare_frequencies_desc(const void *e1, const void *e2) { - const TrackItem *const * t1 = (const TrackItem *const *) e1; - const TrackItem *const * t2 = (const TrackItem *const *) e2; + const TrackItem *const *t1 = (const TrackItem *const *) e1; + const TrackItem *const *t2 = (const TrackItem *const *) e2; return (*t2)->frequency - (*t1)->frequency; } @@ -513,8 +513,8 @@ trackitem_compare_frequencies_desc(const void *e1, const void *e2) static int trackitem_compare_lexemes(const void *e1, const void *e2) { - const TrackItem *const * t1 = (const TrackItem *const *) e1; - const TrackItem *const * t2 = (const TrackItem *const *) e2; + const TrackItem *const *t1 = (const TrackItem *const *) e1; + const TrackItem *const *t2 = (const TrackItem *const *) e2; return lexeme_compare(&(*t1)->key, &(*t2)->key); } diff --git a/src/backend/tsearch/wparser_def.c b/src/backend/tsearch/wparser_def.c index bb7edc1516..0cfc6552d7 100644 --- a/src/backend/tsearch/wparser_def.c +++ b/src/backend/tsearch/wparser_def.c @@ -665,17 +665,17 @@ SpecialTags(TParser *prs) { switch (prs->state->lenchartoken) { - case 8: /* </script */ + case 8: /* </script */ if (pg_strncasecmp(prs->token, "</script", 8) == 0) prs->ignore = false; break; - case 7: /* <script || </style */ + case 7: /* <script || </style */ if (pg_strncasecmp(prs->token, "</style", 7) == 0) prs->ignore = false; else if (pg_strncasecmp(prs->token, "<script", 7) == 0) prs->ignore = true; break; - case 6: /* <style */ + case 6: /* <style */ if (pg_strncasecmp(prs->token, "<style", 6) == 0) prs->ignore = true; break; diff --git a/src/backend/utils/adt/array_typanalyze.c b/src/backend/utils/adt/array_typanalyze.c index 85b7a43292..e3ef18cace 100644 --- a/src/backend/utils/adt/array_typanalyze.c +++ b/src/backend/utils/adt/array_typanalyze.c @@ -751,8 +751,8 @@ element_compare(const void *key1, const void *key2) static int trackitem_compare_frequencies_desc(const void *e1, const void *e2) { - const TrackItem *const * t1 = (const TrackItem *const *) e1; - const TrackItem *const * t2 = (const TrackItem *const *) e2; + const TrackItem *const *t1 = (const TrackItem *const *) e1; + const TrackItem *const *t2 = (const TrackItem *const *) e2; return (*t2)->frequency - (*t1)->frequency; } @@ -763,8 +763,8 @@ trackitem_compare_frequencies_desc(const void *e1, const void *e2) static int trackitem_compare_element(const void *e1, const void *e2) { - const TrackItem *const * t1 = (const TrackItem *const *) e1; - const TrackItem *const * t2 = (const TrackItem *const *) e2; + const TrackItem *const *t1 = (const TrackItem *const *) e1; + const TrackItem *const *t2 = (const TrackItem *const *) e2; return element_compare(&(*t1)->key, &(*t2)->key); } @@ -775,8 +775,8 @@ trackitem_compare_element(const void *e1, const void *e2) static int countitem_compare_count(const void *e1, const void *e2) { - const DECountItem *const * t1 = (const DECountItem *const *) e1; - const DECountItem *const * t2 = (const DECountItem *const *) e2; + const DECountItem *const *t1 = (const DECountItem *const *) e1; + const DECountItem *const *t2 = (const DECountItem *const *) e2; if ((*t1)->count < (*t2)->count) return -1; diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c index d9c8aa569c..1d202dba12 100644 --- a/src/backend/utils/adt/arrayfuncs.c +++ b/src/backend/utils/adt/arrayfuncs.c @@ -84,7 +84,7 @@ typedef struct ArrayIteratorData /* current position information, updated on each iteration */ char *data_ptr; /* our current position in the array */ int current_item; /* the item # we're at in the array */ -} ArrayIteratorData; +} ArrayIteratorData; static bool array_isspace(char ch); static int ArrayCount(const char *str, int *dim, char typdelim); diff --git a/src/backend/utils/adt/arrayutils.c b/src/backend/utils/adt/arrayutils.c index a46d8629c3..27b24703b0 100644 --- a/src/backend/utils/adt/arrayutils.c +++ b/src/backend/utils/adt/arrayutils.c @@ -93,7 +93,7 @@ ArrayGetNItems(int ndim, const int *dims) errmsg("array size exceeds the maximum allowed (%d)", (int) MaxArraySize))); - prod = (int64) ret *(int64) dims[i]; + prod = (int64) ret * (int64) dims[i]; ret = (int32) prod; if ((int64) ret != prod) diff --git a/src/backend/utils/adt/cash.c b/src/backend/utils/adt/cash.c index a170294b94..677037c246 100644 --- a/src/backend/utils/adt/cash.c +++ b/src/backend/utils/adt/cash.c @@ -84,7 +84,7 @@ num_word(Cash value) } return buf; -} /* num_word() */ +} /* num_word() */ /* cash_in() * Convert a string to a cash data type. @@ -132,7 +132,7 @@ cash_in(PG_FUNCTION_ARGS) dsymbol = '.'; if (*lconvert->mon_thousands_sep != '\0') ssymbol = lconvert->mon_thousands_sep; - else /* ssymbol should not equal dsymbol */ + else /* ssymbol should not equal dsymbol */ ssymbol = (dsymbol != ',') ? "," : "."; csymbol = (*lconvert->currency_symbol != '\0') ? lconvert->currency_symbol : "$"; psymbol = (*lconvert->positive_sign != '\0') ? lconvert->positive_sign : "+"; @@ -347,7 +347,7 @@ cash_out(PG_FUNCTION_ARGS) dsymbol = '.'; if (*lconvert->mon_thousands_sep != '\0') ssymbol = lconvert->mon_thousands_sep; - else /* ssymbol should not equal dsymbol */ + else /* ssymbol should not equal dsymbol */ ssymbol = (dsymbol != ',') ? "," : "."; csymbol = (*lconvert->currency_symbol != '\0') ? lconvert->currency_symbol : "$"; diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c index 76ab9496e2..3095047f0b 100644 --- a/src/backend/utils/adt/date.c +++ b/src/backend/utils/adt/date.c @@ -41,10 +41,10 @@ #endif -static int time2tm(TimeADT time, struct pg_tm * tm, fsec_t *fsec); -static int timetz2tm(TimeTzADT *time, struct pg_tm * tm, fsec_t *fsec, int *tzp); -static int tm2time(struct pg_tm * tm, fsec_t fsec, TimeADT *result); -static int tm2timetz(struct pg_tm * tm, fsec_t fsec, int tz, TimeTzADT *result); +static int time2tm(TimeADT time, struct pg_tm *tm, fsec_t *fsec); +static int timetz2tm(TimeTzADT *time, struct pg_tm *tm, fsec_t *fsec, int *tzp); +static int tm2time(struct pg_tm *tm, fsec_t fsec, TimeADT *result); +static int tm2timetz(struct pg_tm *tm, fsec_t fsec, int tz, TimeTzADT *result); static void AdjustTimeForTypmod(TimeADT *time, int32 typmod); @@ -302,7 +302,7 @@ EncodeSpecialDate(DateADT dt, char *str) strcpy(str, EARLY); else if (DATE_IS_NOEND(dt)) strcpy(str, LATE); - else /* shouldn't happen */ + else /* shouldn't happen */ elog(ERROR, "invalid argument for EncodeSpecialDate"); } @@ -1235,7 +1235,7 @@ time_in(PG_FUNCTION_ARGS) * Convert a tm structure to a time data type. */ static int -tm2time(struct pg_tm * tm, fsec_t fsec, TimeADT *result) +tm2time(struct pg_tm *tm, fsec_t fsec, TimeADT *result) { *result = ((((tm->tm_hour * MINS_PER_HOUR + tm->tm_min) * SECS_PER_MINUTE) + tm->tm_sec) * USECS_PER_SEC) + fsec; @@ -1250,7 +1250,7 @@ tm2time(struct pg_tm * tm, fsec_t fsec, TimeADT *result) * if pg_time_t is just 32 bits) - thomas 97/05/27 */ static int -time2tm(TimeADT time, struct pg_tm * tm, fsec_t *fsec) +time2tm(TimeADT time, struct pg_tm *tm, fsec_t *fsec) { tm->tm_hour = time / USECS_PER_HOUR; time -= tm->tm_hour * USECS_PER_HOUR; @@ -1934,7 +1934,7 @@ time_part(PG_FUNCTION_ARGS) * Convert a tm structure to a time data type. */ static int -tm2timetz(struct pg_tm * tm, fsec_t fsec, int tz, TimeTzADT *result) +tm2timetz(struct pg_tm *tm, fsec_t fsec, int tz, TimeTzADT *result) { result->time = ((((tm->tm_hour * MINS_PER_HOUR + tm->tm_min) * SECS_PER_MINUTE) + tm->tm_sec) * USECS_PER_SEC) + fsec; @@ -2068,7 +2068,7 @@ timetztypmodout(PG_FUNCTION_ARGS) * Convert TIME WITH TIME ZONE data type to POSIX time structure. */ static int -timetz2tm(TimeTzADT *time, struct pg_tm * tm, fsec_t *fsec, int *tzp) +timetz2tm(TimeTzADT *time, struct pg_tm *tm, fsec_t *fsec, int *tzp) { TimeOffset trem = time->time; diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index 30db3bf7e5..107b8fdad9 100644 --- a/src/backend/utils/adt/datetime.c +++ b/src/backend/utils/adt/datetime.c @@ -34,22 +34,22 @@ static int DecodeNumber(int flen, char *field, bool haveTextMonth, int fmask, int *tmask, - struct pg_tm * tm, fsec_t *fsec, bool *is2digits); + struct pg_tm *tm, fsec_t *fsec, bool *is2digits); static int DecodeNumberField(int len, char *str, int fmask, int *tmask, - struct pg_tm * tm, fsec_t *fsec, bool *is2digits); + struct pg_tm *tm, fsec_t *fsec, bool *is2digits); static int DecodeTime(char *str, int fmask, int range, - int *tmask, struct pg_tm * tm, fsec_t *fsec); + int *tmask, struct pg_tm *tm, fsec_t *fsec); static const datetkn *datebsearch(const char *key, const datetkn *base, int nel); static int DecodeDate(char *str, int fmask, int *tmask, bool *is2digits, - struct pg_tm * tm); + struct pg_tm *tm); static char *AppendSeconds(char *cp, int sec, fsec_t fsec, int precision, bool fillzeros); -static void AdjustFractSeconds(double frac, struct pg_tm * tm, fsec_t *fsec, +static void AdjustFractSeconds(double frac, struct pg_tm *tm, fsec_t *fsec, int scale); -static void AdjustFractDays(double frac, struct pg_tm * tm, fsec_t *fsec, +static void AdjustFractDays(double frac, struct pg_tm *tm, fsec_t *fsec, int scale); -static int DetermineTimeZoneOffsetInternal(struct pg_tm * tm, pg_tz *tzp, +static int DetermineTimeZoneOffsetInternal(struct pg_tm *tm, pg_tz *tzp, pg_time_t *tp); static bool DetermineTimeZoneAbbrevOffsetInternal(pg_time_t t, const char *abbr, pg_tz *tzp, @@ -311,7 +311,7 @@ date2j(int y, int m, int d) julian += 7834 * m / 256 + d; return julian; -} /* date2j() */ +} /* date2j() */ void j2date(int jd, int *year, int *month, int *day) @@ -338,7 +338,7 @@ j2date(int jd, int *year, int *month, int *day) *month = (quad + 10) % MONTHS_PER_YEAR + 1; return; -} /* j2date() */ +} /* j2date() */ /* @@ -358,7 +358,7 @@ j2day(int date) date += 7; return date; -} /* j2day() */ +} /* j2day() */ /* @@ -367,7 +367,7 @@ j2day(int date) * Get the transaction start time ("now()") broken down as a struct pg_tm. */ void -GetCurrentDateTime(struct pg_tm * tm) +GetCurrentDateTime(struct pg_tm *tm) { int tz; fsec_t fsec; @@ -384,7 +384,7 @@ GetCurrentDateTime(struct pg_tm * tm) * including fractional seconds and timezone offset. */ void -GetCurrentTimeUsec(struct pg_tm * tm, fsec_t *fsec, int *tzp) +GetCurrentTimeUsec(struct pg_tm *tm, fsec_t *fsec, int *tzp) { int tz; @@ -471,7 +471,7 @@ AppendSeconds(char *cp, int sec, fsec_t fsec, int precision, bool fillzeros) * there; callers are responsible for NUL terminating str themselves. */ static char * -AppendTimestampSeconds(char *cp, struct pg_tm * tm, fsec_t fsec) +AppendTimestampSeconds(char *cp, struct pg_tm *tm, fsec_t fsec) { return AppendSeconds(cp, tm->tm_sec, fsec, MAX_TIMESTAMP_PRECISION, true); } @@ -481,7 +481,7 @@ AppendTimestampSeconds(char *cp, struct pg_tm * tm, fsec_t fsec) * We assume the input frac is less than 1 so overflow is not an issue. */ static void -AdjustFractSeconds(double frac, struct pg_tm * tm, fsec_t *fsec, int scale) +AdjustFractSeconds(double frac, struct pg_tm *tm, fsec_t *fsec, int scale) { int sec; @@ -496,7 +496,7 @@ AdjustFractSeconds(double frac, struct pg_tm * tm, fsec_t *fsec, int scale) /* As above, but initial scale produces days */ static void -AdjustFractDays(double frac, struct pg_tm * tm, fsec_t *fsec, int scale) +AdjustFractDays(double frac, struct pg_tm *tm, fsec_t *fsec, int scale) { int extra_days; @@ -781,7 +781,7 @@ ParseDateTime(const char *timestr, char *workbuf, size_t buflen, */ int DecodeDateTime(char **field, int *ftype, int nf, - int *dtype, struct pg_tm * tm, fsec_t *fsec, int *tzp) + int *dtype, struct pg_tm *tm, fsec_t *fsec, int *tzp) { int fmask = 0, tmask, @@ -1468,7 +1468,7 @@ DecodeDateTime(char **field, int *ftype, int nf, * though probably some higher-level code will. */ int -DetermineTimeZoneOffset(struct pg_tm * tm, pg_tz *tzp) +DetermineTimeZoneOffset(struct pg_tm *tm, pg_tz *tzp) { pg_time_t t; @@ -1490,7 +1490,7 @@ DetermineTimeZoneOffset(struct pg_tm * tm, pg_tz *tzp) * of mktime(), anyway. */ static int -DetermineTimeZoneOffsetInternal(struct pg_tm * tm, pg_tz *tzp, pg_time_t *tp) +DetermineTimeZoneOffsetInternal(struct pg_tm *tm, pg_tz *tzp, pg_time_t *tp) { int date, sec; @@ -1626,7 +1626,7 @@ overflow: * back to doing DetermineTimeZoneOffset().) */ int -DetermineTimeZoneAbbrevOffset(struct pg_tm * tm, const char *abbr, pg_tz *tzp) +DetermineTimeZoneAbbrevOffset(struct pg_tm *tm, const char *abbr, pg_tz *tzp) { pg_time_t t; int zone_offset; @@ -1742,7 +1742,7 @@ DetermineTimeZoneAbbrevOffsetInternal(pg_time_t t, const char *abbr, pg_tz *tzp, */ int DecodeTimeOnly(char **field, int *ftype, int nf, - int *dtype, struct pg_tm * tm, fsec_t *fsec, int *tzp) + int *dtype, struct pg_tm *tm, fsec_t *fsec, int *tzp) { int fmask = 0, tmask, @@ -2367,7 +2367,7 @@ DecodeTimeOnly(char **field, int *ftype, int nf, */ static int DecodeDate(char *str, int fmask, int *tmask, bool *is2digits, - struct pg_tm * tm) + struct pg_tm *tm) { fsec_t fsec; int nf = 0; @@ -2477,7 +2477,7 @@ DecodeDate(char *str, int fmask, int *tmask, bool *is2digits, */ int ValidateDate(int fmask, bool isjulian, bool is2digits, bool bc, - struct pg_tm * tm) + struct pg_tm *tm) { if (fmask & DTK_M(YEAR)) { @@ -2556,7 +2556,7 @@ ValidateDate(int fmask, bool isjulian, bool is2digits, bool bc, */ static int DecodeTime(char *str, int fmask, int range, - int *tmask, struct pg_tm * tm, fsec_t *fsec) + int *tmask, struct pg_tm *tm, fsec_t *fsec) { char *cp; int dterr; @@ -2632,7 +2632,7 @@ DecodeTime(char *str, int fmask, int range, */ static int DecodeNumber(int flen, char *str, bool haveTextMonth, int fmask, - int *tmask, struct pg_tm * tm, fsec_t *fsec, bool *is2digits) + int *tmask, struct pg_tm *tm, fsec_t *fsec, bool *is2digits) { int val; char *cp; @@ -2817,7 +2817,7 @@ DecodeNumber(int flen, char *str, bool haveTextMonth, int fmask, */ static int DecodeNumberField(int len, char *str, int fmask, - int *tmask, struct pg_tm * tm, fsec_t *fsec, bool *is2digits) + int *tmask, struct pg_tm *tm, fsec_t *fsec, bool *is2digits) { char *cp; @@ -3068,7 +3068,7 @@ DecodeSpecial(int field, char *lowtoken, int *val) * Zero out a pg_tm and associated fsec_t */ static inline void -ClearPgTm(struct pg_tm * tm, fsec_t *fsec) +ClearPgTm(struct pg_tm *tm, fsec_t *fsec) { tm->tm_year = 0; tm->tm_mon = 0; @@ -3093,7 +3093,7 @@ ClearPgTm(struct pg_tm * tm, fsec_t *fsec) */ int DecodeInterval(char **field, int *ftype, int nf, int range, - int *dtype, struct pg_tm * tm, fsec_t *fsec) + int *dtype, struct pg_tm *tm, fsec_t *fsec) { bool is_before = FALSE; char *cp; @@ -3519,7 +3519,7 @@ ISO8601IntegerWidth(char *fieldstart) */ int DecodeISO8601Interval(char *str, - int *dtype, struct pg_tm * tm, fsec_t *fsec) + int *dtype, struct pg_tm *tm, fsec_t *fsec) { bool datepart = true; bool havefield = false; @@ -3749,7 +3749,7 @@ DecodeUnits(int field, char *lowtoken, int *val) } return type; -} /* DecodeUnits() */ +} /* DecodeUnits() */ /* * Report an error detected by one of the datetime input processing routines. @@ -3881,7 +3881,7 @@ EncodeTimezone(char *str, int tz, int style) * Encode date as local time. */ void -EncodeDateOnly(struct pg_tm * tm, int style, char *str) +EncodeDateOnly(struct pg_tm *tm, int style, char *str) { Assert(tm->tm_mon >= 1 && tm->tm_mon <= MONTHS_PER_YEAR); @@ -3966,7 +3966,7 @@ EncodeDateOnly(struct pg_tm * tm, int style, char *str) * output. */ void -EncodeTimeOnly(struct pg_tm * tm, fsec_t fsec, bool print_tz, int tz, int style, char *str) +EncodeTimeOnly(struct pg_tm *tm, fsec_t fsec, bool print_tz, int tz, int style, char *str) { str = pg_ltostr_zeropad(str, tm->tm_hour, 2); *str++ = ':'; @@ -3996,7 +3996,7 @@ EncodeTimeOnly(struct pg_tm * tm, fsec_t fsec, bool print_tz, int tz, int style, * XSD - yyyy-mm-ddThh:mm:ss.ss+/-tz */ void -EncodeDateTime(struct pg_tm * tm, fsec_t fsec, bool print_tz, int tz, const char *tzn, int style, char *str) +EncodeDateTime(struct pg_tm *tm, fsec_t fsec, bool print_tz, int tz, const char *tzn, int style, char *str) { int day; @@ -4238,7 +4238,7 @@ AddVerboseIntPart(char *cp, int value, const char *units, * "day-time literal"s (that look like ('4 5:6:7') */ void -EncodeInterval(struct pg_tm * tm, fsec_t fsec, int style, char *str) +EncodeInterval(struct pg_tm *tm, fsec_t fsec, int style, char *str) { char *cp = str; int year = tm->tm_year; diff --git a/src/backend/utils/adt/dbsize.c b/src/backend/utils/adt/dbsize.c index f0725860b4..ac4feddbfd 100644 --- a/src/backend/utils/adt/dbsize.c +++ b/src/backend/utils/adt/dbsize.c @@ -889,7 +889,7 @@ pg_relation_filenode(PG_FUNCTION_ARGS) /* okay, these have storage */ if (relform->relfilenode) result = relform->relfilenode; - else /* Consult the relation mapper */ + else /* Consult the relation mapper */ result = RelationMapOidToFilenode(relid, relform->relisshared); break; @@ -976,7 +976,7 @@ pg_relation_filepath(PG_FUNCTION_ARGS) rnode.dbNode = MyDatabaseId; if (relform->relfilenode) rnode.relNode = relform->relfilenode; - else /* Consult the relation mapper */ + else /* Consult the relation mapper */ rnode.relNode = RelationMapOidToFilenode(relid, relform->relisshared); break; diff --git a/src/backend/utils/adt/encode.c b/src/backend/utils/adt/encode.c index 8fd8ede39e..8773538b8d 100644 --- a/src/backend/utils/adt/encode.c +++ b/src/backend/utils/adt/encode.c @@ -520,7 +520,7 @@ static const struct { const char *name; struct pg_encoding enc; -} enclist[] = +} enclist[] = { { diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c index 4127bece12..ba7e4fc934 100644 --- a/src/backend/utils/adt/formatting.c +++ b/src/backend/utils/adt/formatting.c @@ -667,7 +667,7 @@ typedef enum /* last */ _DCH_last_ -} DCH_poz; +} DCH_poz; typedef enum { @@ -710,7 +710,7 @@ typedef enum /* last */ _NUM_last_ -} NUM_poz; +} NUM_poz; /* ---------- * KeyWords for DATE-TIME version @@ -976,10 +976,10 @@ static void from_char_set_mode(TmFromChar *tmfc, const FromCharDateMode mode); static void from_char_set_int(int *dest, const int value, const FormatNode *node); static int from_char_parse_int_len(int *dest, char **src, const int len, FormatNode *node); static int from_char_parse_int(int *dest, char **src, FormatNode *node); -static int seq_search(char *name, const char *const * array, int type, int max, int *len); -static int from_char_seq_search(int *dest, char **src, const char *const * array, int type, int max, FormatNode *node); +static int seq_search(char *name, const char *const *array, int type, int max, int *len); +static int from_char_seq_search(int *dest, char **src, const char *const *array, int type, int max, FormatNode *node); static void do_to_timestamp(text *date_txt, text *fmt, - struct pg_tm * tm, fsec_t *fsec); + struct pg_tm *tm, fsec_t *fsec); static char *fill_str(char *str, int c, int max); static FormatNode *NUM_cache(int len, NUMDesc *Num, text *pars_str, bool *shouldFree); static char *int_to_roman(int number); @@ -1450,9 +1450,9 @@ str_numth(char *dest, char *num, int type) #ifdef USE_ICU typedef int32_t (*ICU_Convert_Func) (UChar *dest, int32_t destCapacity, - const UChar *src, int32_t srcLength, - const char *locale, - UErrorCode *pErrorCode); + const UChar *src, int32_t srcLength, + const char *locale, + UErrorCode *pErrorCode); static int32_t icu_convert_case(ICU_Convert_Func func, pg_locale_t mylocale, @@ -2303,10 +2303,10 @@ from_char_parse_int(int *dest, char **src, FormatNode *node) * ---------- */ static int -seq_search(char *name, const char *const * array, int type, int max, int *len) +seq_search(char *name, const char *const *array, int type, int max, int *len) { const char *p; - const char *const * a; + const char *const *a; char *n; int last, i; @@ -2381,7 +2381,7 @@ seq_search(char *name, const char *const * array, int type, int max, int *len) * If the string doesn't match, throw an error. */ static int -from_char_seq_search(int *dest, char **src, const char *const * array, int type, int max, +from_char_seq_search(int *dest, char **src, const char *const *array, int type, int max, FormatNode *node) { int len; @@ -3609,7 +3609,7 @@ to_date(PG_FUNCTION_ARGS) */ static void do_to_timestamp(text *date_txt, text *fmt, - struct pg_tm * tm, fsec_t *fsec) + struct pg_tm *tm, fsec_t *fsec) { FormatNode *format; TmFromChar tmfc; diff --git a/src/backend/utils/adt/geo_ops.c b/src/backend/utils/adt/geo_ops.c index 655b81cc46..40de01b7bc 100644 --- a/src/backend/utils/adt/geo_ops.c +++ b/src/backend/utils/adt/geo_ops.c @@ -126,7 +126,7 @@ single_decode(char *num, char **endptr_p, const char *type_name, const char *orig_string) { return float8in_internal(num, endptr_p, type_name, orig_string); -} /* single_decode() */ +} /* single_decode() */ static void single_encode(float8 x, StringInfo str) @@ -135,7 +135,7 @@ single_encode(float8 x, StringInfo str) appendStringInfoString(str, xstr); pfree(xstr); -} /* single_encode() */ +} /* single_encode() */ static void pair_decode(char *str, double *x, double *y, char **endptr_p, @@ -264,7 +264,7 @@ path_decode(char *str, bool opentype, int npts, Point *p, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), errmsg("invalid input syntax for type %s: \"%s\"", type_name, orig_string))); -} /* path_decode() */ +} /* path_decode() */ static char * path_encode(enum path_delim path_delim, int npts, Point *pt) @@ -309,7 +309,7 @@ path_encode(enum path_delim path_delim, int npts, Point *pt) } return str.data; -} /* path_encode() */ +} /* path_encode() */ /*------------------------------------------------------------- * pair_count - count the number of points @@ -1333,7 +1333,7 @@ path_in(PG_FUNCTION_ARGS) } base_size = sizeof(path->p[0]) * npts; - size = offsetof(PATH, p) +base_size; + size = offsetof(PATH, p) + base_size; /* Check for integer overflow */ if (base_size / npts != sizeof(path->p[0]) || size <= base_size) @@ -1403,7 +1403,7 @@ path_recv(PG_FUNCTION_ARGS) (errcode(ERRCODE_INVALID_BINARY_REPRESENTATION), errmsg("invalid number of points in external \"path\" value"))); - size = offsetof(PATH, p) +sizeof(path->p[0]) * npts; + size = offsetof(PATH, p) + sizeof(path->p[0]) * npts; path = (PATH *) palloc(size); SET_VARSIZE(path, size); @@ -3431,7 +3431,7 @@ poly_in(PG_FUNCTION_ARGS) "polygon", str))); base_size = sizeof(poly->p[0]) * npts; - size = offsetof(POLYGON, p) +base_size; + size = offsetof(POLYGON, p) + base_size; /* Check for integer overflow */ if (base_size / npts != sizeof(poly->p[0]) || size <= base_size) @@ -3486,7 +3486,7 @@ poly_recv(PG_FUNCTION_ARGS) (errcode(ERRCODE_INVALID_BINARY_REPRESENTATION), errmsg("invalid number of points in external \"polygon\" value"))); - size = offsetof(POLYGON, p) +sizeof(poly->p[0]) * npts; + size = offsetof(POLYGON, p) + sizeof(poly->p[0]) * npts; poly = (POLYGON *) palloc0(size); /* zero any holes */ SET_VARSIZE(poly, size); @@ -4243,7 +4243,7 @@ path_add(PG_FUNCTION_ARGS) PG_RETURN_NULL(); base_size = sizeof(p1->p[0]) * (p1->npts + p2->npts); - size = offsetof(PATH, p) +base_size; + size = offsetof(PATH, p) + base_size; /* Check for integer overflow */ if (base_size / sizeof(p1->p[0]) != (p1->npts + p2->npts) || @@ -4385,7 +4385,7 @@ path_poly(PG_FUNCTION_ARGS) * Never overflows: the old size fit in MaxAllocSize, and the new size is * just a small constant larger. */ - size = offsetof(POLYGON, p) +sizeof(poly->p[0]) * path->npts; + size = offsetof(POLYGON, p) + sizeof(poly->p[0]) * path->npts; poly = (POLYGON *) palloc(size); SET_VARSIZE(poly, size); @@ -4460,7 +4460,7 @@ box_poly(PG_FUNCTION_ARGS) int size; /* map four corners of the box to a polygon */ - size = offsetof(POLYGON, p) +sizeof(poly->p[0]) * 4; + size = offsetof(POLYGON, p) + sizeof(poly->p[0]) * 4; poly = (POLYGON *) palloc(size); SET_VARSIZE(poly, size); @@ -4494,7 +4494,7 @@ poly_path(PG_FUNCTION_ARGS) * Never overflows: the old size fit in MaxAllocSize, and the new size is * smaller by a small constant. */ - size = offsetof(PATH, p) +sizeof(path->p[0]) * poly->npts; + size = offsetof(PATH, p) + sizeof(path->p[0]) * poly->npts; path = (PATH *) palloc(size); SET_VARSIZE(path, size); @@ -5172,7 +5172,7 @@ circle_poly(PG_FUNCTION_ARGS) errmsg("must request at least 2 points"))); base_size = sizeof(poly->p[0]) * npts; - size = offsetof(POLYGON, p) +base_size; + size = offsetof(POLYGON, p) + base_size; /* Check for integer overflow */ if (base_size / npts != sizeof(poly->p[0]) || size <= base_size) diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c index bd4422e08a..96ef25b900 100644 --- a/src/backend/utils/adt/int.c +++ b/src/backend/utils/adt/int.c @@ -822,7 +822,7 @@ int2mul(PG_FUNCTION_ARGS) * The most practical way to detect overflow is to do the arithmetic in * int32 (so that the result can't overflow) and then do a range check. */ - result32 = (int32) arg1 *(int32) arg2; + result32 = (int32) arg1 * (int32) arg2; if (result32 < SHRT_MIN || result32 > SHRT_MAX) ereport(ERROR, diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c index e256eaf55e..3e206c2121 100644 --- a/src/backend/utils/adt/jsonb.c +++ b/src/backend/utils/adt/jsonb.c @@ -1661,7 +1661,7 @@ jsonb_agg_transfn(PG_FUNCTION_ARGS) { /* same for numeric */ v.val.numeric = - DatumGetNumeric(DirectFunctionCall1(numeric_uplus, + DatumGetNumeric(DirectFunctionCall1(numeric_uplus, NumericGetDatum(v.val.numeric))); } result->res = pushJsonbValue(&result->parseState, @@ -1891,7 +1891,7 @@ jsonb_object_agg_transfn(PG_FUNCTION_ARGS) { /* same for numeric */ v.val.numeric = - DatumGetNumeric(DirectFunctionCall1(numeric_uplus, + DatumGetNumeric(DirectFunctionCall1(numeric_uplus, NumericGetDatum(v.val.numeric))); } result->res = pushJsonbValue(&result->parseState, diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c index d7ece68c18..01df06ebfd 100644 --- a/src/backend/utils/adt/jsonfuncs.c +++ b/src/backend/utils/adt/jsonfuncs.c @@ -84,7 +84,8 @@ typedef struct GetState char **path_names; /* field name(s) being sought */ int *path_indexes; /* array index(es) being sought */ bool *pathok; /* is path matched to current depth? */ - int *array_cur_index; /* current element index at each path level */ + int *array_cur_index; /* current element index at each path + * level */ } GetState; /* state for json_array_length */ diff --git a/src/backend/utils/adt/like_match.c b/src/backend/utils/adt/like_match.c index 1c37229e09..634953ae67 100644 --- a/src/backend/utils/adt/like_match.c +++ b/src/backend/utils/adt/like_match.c @@ -236,7 +236,7 @@ MatchText(char *t, int tlen, char *p, int plen, * matching this pattern. */ return LIKE_ABORT; -} /* MatchText() */ +} /* MatchText() */ /* * like_escape() --- given a pattern and an ESCAPE string, diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c index 3f6a9d3b82..38dc1266e0 100644 --- a/src/backend/utils/adt/nabstime.c +++ b/src/backend/utils/adt/nabstime.c @@ -71,8 +71,8 @@ * Function prototypes -- internal to this file only */ -static AbsoluteTime tm2abstime(struct pg_tm * tm, int tz); -static void reltime2tm(RelativeTime time, struct pg_tm * tm); +static AbsoluteTime tm2abstime(struct pg_tm *tm, int tz); +static void reltime2tm(RelativeTime time, struct pg_tm *tm); static void parsetinterval(char *i_string, AbsoluteTime *i_start, AbsoluteTime *i_end); @@ -96,7 +96,7 @@ GetCurrentAbsoluteTime(void) void -abstime2tm(AbsoluteTime _time, int *tzp, struct pg_tm * tm, char **tzn) +abstime2tm(AbsoluteTime _time, int *tzp, struct pg_tm *tm, char **tzn) { pg_time_t time = (pg_time_t) _time; struct pg_tm *tx; @@ -148,7 +148,7 @@ abstime2tm(AbsoluteTime _time, int *tzp, struct pg_tm * tm, char **tzn) * Note that tm has full year (not 1900-based) and 1-based month. */ static AbsoluteTime -tm2abstime(struct pg_tm * tm, int tz) +tm2abstime(struct pg_tm *tm, int tz) { int day; AbsoluteTime sec; @@ -680,7 +680,7 @@ reltimesend(PG_FUNCTION_ARGS) static void -reltime2tm(RelativeTime time, struct pg_tm * tm) +reltime2tm(RelativeTime time, struct pg_tm *tm) { double dtime = time; diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c index 24ae3c6886..a2855984d5 100644 --- a/src/backend/utils/adt/pg_locale.c +++ b/src/backend/utils/adt/pg_locale.c @@ -390,7 +390,7 @@ assign_locale_messages(const char *newval, void *extra) * itself.) It's important that this not throw elog(ERROR). */ static void -free_struct_lconv(struct lconv * s) +free_struct_lconv(struct lconv *s) { if (s->decimal_point) free(s->decimal_point); @@ -419,7 +419,7 @@ free_struct_lconv(struct lconv * s) * about) are non-NULL. The field list must match free_struct_lconv(). */ static bool -struct_lconv_is_valid(struct lconv * s) +struct_lconv_is_valid(struct lconv *s) { if (s->decimal_point == NULL) return false; @@ -705,7 +705,7 @@ PGLC_localeconv(void) */ static size_t strftime_win32(char *dst, size_t dstlen, - const char *format, const struct tm * tm) + const char *format, const struct tm *tm) { size_t len; wchar_t wformat[8]; /* formats used below need 3 bytes */ @@ -756,7 +756,7 @@ strftime_win32(char *dst, size_t dstlen, /* Subroutine for cache_locale_time(). */ static void -cache_single_time(char **dst, const char *format, const struct tm * tm) +cache_single_time(char **dst, const char *format, const struct tm *tm) { char buf[MAX_L10N_DATA]; char *ptr; diff --git a/src/backend/utils/adt/rangetypes.c b/src/backend/utils/adt/rangetypes.c index 304345b904..94a77c9b6a 100644 --- a/src/backend/utils/adt/rangetypes.c +++ b/src/backend/utils/adt/rangetypes.c @@ -2051,7 +2051,7 @@ range_parse(const char *string, char *flags, char **lbound_str, } else if (*ptr == ')') ptr++; - else /* must be a comma */ + else /* must be a comma */ ereport(ERROR, (errcode(ERRCODE_INVALID_TEXT_REPRESENTATION), errmsg("malformed range literal: \"%s\"", diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c index 6a0d273bd2..5f3f7968d5 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -1260,7 +1260,7 @@ pg_get_indexdef_worker(Oid indexrelid, int colno, quote_identifier(NameStr(idxrelrec->relname)), generate_relation_name(indrelid, NIL), quote_identifier(NameStr(amrec->amname))); - else /* currently, must be EXCLUDE constraint */ + else /* currently, must be EXCLUDE constraint */ appendStringInfo(&buf, "EXCLUDE USING %s (", quote_identifier(NameStr(amrec->amname))); } @@ -7374,17 +7374,17 @@ isSimpleNode(Node *node, Node *parentNode, int prettyFlags) return false; return true; /* own parentheses */ } - case T_BoolExpr: /* lower precedence */ - case T_ArrayRef: /* other separators */ + case T_BoolExpr: /* lower precedence */ + case T_ArrayRef: /* other separators */ case T_ArrayExpr: /* other separators */ - case T_RowExpr: /* other separators */ + case T_RowExpr: /* other separators */ case T_CoalesceExpr: /* own parentheses */ case T_MinMaxExpr: /* own parentheses */ - case T_XmlExpr: /* own parentheses */ + case T_XmlExpr: /* own parentheses */ case T_NullIfExpr: /* other separators */ case T_Aggref: /* own parentheses */ case T_WindowFunc: /* own parentheses */ - case T_CaseExpr: /* other separators */ + case T_CaseExpr: /* other separators */ return true; default: return false; @@ -7425,16 +7425,16 @@ isSimpleNode(Node *node, Node *parentNode, int prettyFlags) return false; return true; /* own parentheses */ } - case T_ArrayRef: /* other separators */ + case T_ArrayRef: /* other separators */ case T_ArrayExpr: /* other separators */ - case T_RowExpr: /* other separators */ + case T_RowExpr: /* other separators */ case T_CoalesceExpr: /* own parentheses */ case T_MinMaxExpr: /* own parentheses */ - case T_XmlExpr: /* own parentheses */ + case T_XmlExpr: /* own parentheses */ case T_NullIfExpr: /* other separators */ case T_Aggref: /* own parentheses */ case T_WindowFunc: /* own parentheses */ - case T_CaseExpr: /* other separators */ + case T_CaseExpr: /* other separators */ return true; default: return false; diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index 22dabf59af..33788a2b36 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -4205,7 +4205,7 @@ convert_string_datum(Datum value, Oid typid) { char *xfrmstr; size_t xfrmlen; - size_t xfrmlen2 PG_USED_FOR_ASSERTS_ONLY; + size_t xfrmlen2 PG_USED_FOR_ASSERTS_ONLY; /* * XXX: We could guess at a suitable output buffer size and only call @@ -4221,7 +4221,8 @@ convert_string_datum(Datum value, Oid typid) /* * * http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx? - * FeedbackID=99694 */ + * FeedbackID=99694 + */ { char x[1]; diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c index 3f6e0d4497..d477e23550 100644 --- a/src/backend/utils/adt/timestamp.c +++ b/src/backend/utils/adt/timestamp.c @@ -455,7 +455,7 @@ timestamptz_in(PG_FUNCTION_ARGS) * don't care, so we don't bother being consistent. */ static int -parse_sane_timezone(struct pg_tm * tm, text *zone) +parse_sane_timezone(struct pg_tm *tm, text *zone) { char tzname[TZ_STRLEN_MAX + 1]; int rt; @@ -1526,7 +1526,7 @@ EncodeSpecialTimestamp(Timestamp dt, char *str) strcpy(str, EARLY); else if (TIMESTAMP_IS_NOEND(dt)) strcpy(str, LATE); - else /* shouldn't happen */ + else /* shouldn't happen */ elog(ERROR, "invalid argument for EncodeSpecialTimestamp"); } @@ -1740,7 +1740,7 @@ dt2time(Timestamp jd, int *hour, int *min, int *sec, fsec_t *fsec) time -= (*min) * USECS_PER_MINUTE; *sec = time / USECS_PER_SEC; *fsec = time - (*sec * USECS_PER_SEC); -} /* dt2time() */ +} /* dt2time() */ /* @@ -1755,7 +1755,7 @@ dt2time(Timestamp jd, int *hour, int *min, int *sec, fsec_t *fsec) * If attimezone is NULL, the global timezone setting will be used. */ int -timestamp2tm(Timestamp dt, int *tzp, struct pg_tm * tm, fsec_t *fsec, const char **tzn, pg_tz *attimezone) +timestamp2tm(Timestamp dt, int *tzp, struct pg_tm *tm, fsec_t *fsec, const char **tzn, pg_tz *attimezone) { Timestamp date; Timestamp time; @@ -1851,7 +1851,7 @@ timestamp2tm(Timestamp dt, int *tzp, struct pg_tm * tm, fsec_t *fsec, const char * Returns -1 on failure (value out of range). */ int -tm2timestamp(struct pg_tm * tm, fsec_t fsec, int *tzp, Timestamp *result) +tm2timestamp(struct pg_tm *tm, fsec_t fsec, int *tzp, Timestamp *result) { TimeOffset date; TimeOffset time; @@ -1899,7 +1899,7 @@ tm2timestamp(struct pg_tm * tm, fsec_t fsec, int *tzp, Timestamp *result) * Convert an interval data type to a tm structure. */ int -interval2tm(Interval span, struct pg_tm * tm, fsec_t *fsec) +interval2tm(Interval span, struct pg_tm *tm, fsec_t *fsec) { TimeOffset time; TimeOffset tfrac; @@ -1927,7 +1927,7 @@ interval2tm(Interval span, struct pg_tm * tm, fsec_t *fsec) } int -tm2interval(struct pg_tm * tm, fsec_t fsec, Interval *span) +tm2interval(struct pg_tm *tm, fsec_t fsec, Interval *span) { double total_months = (double) tm->tm_year * MONTHS_PER_YEAR + tm->tm_mon; @@ -1981,7 +1981,7 @@ interval_finite(PG_FUNCTION_ARGS) *---------------------------------------------------------*/ void -GetEpochTime(struct pg_tm * tm) +GetEpochTime(struct pg_tm *tm) { struct pg_tm *t0; pg_time_t epoch = 0; @@ -2011,7 +2011,7 @@ SetEpochTimestamp(void) tm2timestamp(tm, 0, NULL, &dt); return dt; -} /* SetEpochTimestamp() */ +} /* SetEpochTimestamp() */ /* * We are currently sharing some code between timestamp and timestamptz. @@ -4930,7 +4930,7 @@ timestamp_izone(PG_FUNCTION_ARGS) errmsg("timestamp out of range"))); PG_RETURN_TIMESTAMPTZ(result); -} /* timestamp_izone() */ +} /* timestamp_izone() */ /* timestamp_timestamptz() * Convert local timestamp to timestamp at GMT diff --git a/src/backend/utils/adt/tsquery.c b/src/backend/utils/adt/tsquery.c index 3e2fc6e9df..41e1ecd70f 100644 --- a/src/backend/utils/adt/tsquery.c +++ b/src/backend/utils/adt/tsquery.c @@ -1015,7 +1015,8 @@ tsqueryrecv(PG_FUNCTION_ARGS) if (item->type == QI_VAL) { - size_t val_len; /* length after recoding to server encoding */ + size_t val_len; /* length after recoding to server + * encoding */ uint8 weight; uint8 prefix; const char *val; diff --git a/src/backend/utils/adt/tsrank.c b/src/backend/utils/adt/tsrank.c index 76e5e541b6..a41eb1fa9c 100644 --- a/src/backend/utils/adt/tsrank.c +++ b/src/backend/utils/adt/tsrank.c @@ -910,7 +910,7 @@ calc_rank_cd(const float4 *arrdata, TSVector txt, TSQuery query, int method) CurExtPos = ((double) (ext.q + ext.p)) / 2.0; if (NExtent > 0 && CurExtPos > PrevExtPos /* prevent division by * zero in a case of - multiple lexize */ ) + * multiple lexize */ ) SumDist += 1.0 / (CurExtPos - PrevExtPos); PrevExtPos = CurExtPos; diff --git a/src/backend/utils/adt/tsvector_op.c b/src/backend/utils/adt/tsvector_op.c index c694637c8f..89aa0f1b32 100644 --- a/src/backend/utils/adt/tsvector_op.c +++ b/src/backend/utils/adt/tsvector_op.c @@ -411,7 +411,7 @@ tsvector_bsearch(const TSVector tsv, char *lexeme, int lexeme_len) StopHigh = StopMiddle; else if (cmp > 0) StopLow = StopMiddle + 1; - else /* found it */ + else /* found it */ return StopMiddle; } @@ -1058,7 +1058,7 @@ tsvector_concat(PG_FUNCTION_ARGS) if (ptr2->haspos) dataoff += add_pos(in2, ptr2, out, ptr, maxpos) * sizeof(WordEntryPos); } - else /* must have ptr2->haspos */ + else /* must have ptr2->haspos */ { int addlen = add_pos(in2, ptr2, out, ptr, maxpos); @@ -1255,7 +1255,7 @@ checkclass_str(CHKVAL *chkval, WordEntry *entry, QueryOperand *val, posvec_iter++; } } - else /* data != NULL */ + else /* data != NULL */ { data->npos = posvec->npos; data->pos = posvec->pos; @@ -1489,7 +1489,7 @@ TS_phrase_output(ExecPhraseData *data, Lindex++; Rindex++; } - else /* Lpos > Rpos */ + else /* Lpos > Rpos */ { /* Rpos is not matched in Ldata, should we output it? */ if (emit & TSPO_R_ONLY) diff --git a/src/backend/utils/adt/tsvector_parser.c b/src/backend/utils/adt/tsvector_parser.c index 2680114f7c..060d073fb7 100644 --- a/src/backend/utils/adt/tsvector_parser.c +++ b/src/backend/utils/adt/tsvector_parser.c @@ -363,7 +363,7 @@ gettoken_tsvector(TSVectorParseState state, else if (!t_isdigit(state->prsbuf)) PRSSYNTAXERROR; } - else /* internal error */ + else /* internal error */ elog(ERROR, "unrecognized state in gettoken_tsvector: %d", statecode); diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c index 5fe82400e7..cb1fd4d9ce 100644 --- a/src/backend/utils/adt/varlena.c +++ b/src/backend/utils/adt/varlena.c @@ -221,7 +221,7 @@ text_to_cstring_buffer(const text *src, char *dst, size_t dst_len) dst_len--; if (dst_len >= src_len) dst_len = src_len; - else /* ensure truncation is encoding-safe */ + else /* ensure truncation is encoding-safe */ dst_len = pg_mbcliplen(VARDATA_ANY(srcunpacked), src_len, dst_len); memcpy(dst, VARDATA_ANY(srcunpacked), dst_len); dst[dst_len] = '\0'; diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index b19044c46c..74bfd56169 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -1571,7 +1571,7 @@ SearchCatCacheList(CatCache *cache, oldcxt = MemoryContextSwitchTo(CacheMemoryContext); nmembers = list_length(ctlist); cl = (CatCList *) - palloc(offsetof(CatCList, members) +nmembers * sizeof(CatCTup *)); + palloc(offsetof(CatCList, members) + nmembers * sizeof(CatCTup *)); heap_copytuple_with_tuple(ntp, &cl->tuple); MemoryContextSwitchTo(oldcxt); heap_freetuple(ntp); diff --git a/src/backend/utils/cache/inval.c b/src/backend/utils/cache/inval.c index 819121638e..055705136a 100644 --- a/src/backend/utils/cache/inval.c +++ b/src/backend/utils/cache/inval.c @@ -194,7 +194,7 @@ static struct SYSCACHECALLBACK int16 link; /* next callback index+1 for same cache */ SyscacheCallbackFunction function; Datum arg; -} syscache_callback_list[MAX_SYSCACHE_CALLBACKS]; +} syscache_callback_list[MAX_SYSCACHE_CALLBACKS]; static int16 syscache_callback_links[SysCacheSize]; @@ -204,7 +204,7 @@ static struct RELCACHECALLBACK { RelcacheCallbackFunction function; Datum arg; -} relcache_callback_list[MAX_RELCACHE_CALLBACKS]; +} relcache_callback_list[MAX_RELCACHE_CALLBACKS]; static int relcache_callback_count = 0; diff --git a/src/backend/utils/cache/typcache.c b/src/backend/utils/cache/typcache.c index 0cf5001a75..6ba199b40d 100644 --- a/src/backend/utils/cache/typcache.c +++ b/src/backend/utils/cache/typcache.c @@ -888,8 +888,8 @@ load_domaintype_info(TypeCacheEntry *typentry) static int dcs_cmp(const void *a, const void *b) { - const DomainConstraintState *const * ca = (const DomainConstraintState *const *) a; - const DomainConstraintState *const * cb = (const DomainConstraintState *const *) b; + const DomainConstraintState *const *ca = (const DomainConstraintState *const *) a; + const DomainConstraintState *const *cb = (const DomainConstraintState *const *) b; return strcmp((*ca)->name, (*cb)->name); } diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index 22004cb819..cad75c80d8 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -627,7 +627,7 @@ errcode_for_file_access(void) case ENOTDIR: /* Not a directory */ case EISDIR: /* Is a directory */ #if defined(ENOTEMPTY) && (ENOTEMPTY != EEXIST) /* same code on AIX */ - case ENOTEMPTY: /* Directory not empty */ + case ENOTEMPTY: /* Directory not empty */ #endif edata->sqlerrcode = ERRCODE_WRONG_OBJECT_TYPE; break; diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c index 28c2583f96..bfd1b11850 100644 --- a/src/backend/utils/fmgr/dfmgr.c +++ b/src/backend/utils/fmgr/dfmgr.c @@ -214,7 +214,7 @@ internal_load_library(const char *libname) * File not loaded yet. */ file_scanner = (DynamicFileList *) - malloc(offsetof(DynamicFileList, filename) +strlen(libname) + 1); + malloc(offsetof(DynamicFileList, filename) + strlen(libname) + 1); if (file_scanner == NULL) ereport(ERROR, (errcode(ERRCODE_OUT_OF_MEMORY), diff --git a/src/backend/utils/fmgr/fmgr.c b/src/backend/utils/fmgr/fmgr.c index f6d2b7d63e..0382c158c5 100644 --- a/src/backend/utils/fmgr/fmgr.c +++ b/src/backend/utils/fmgr/fmgr.c @@ -1828,7 +1828,7 @@ Float8GetDatum(float8 X) */ struct varlena * -pg_detoast_datum(struct varlena * datum) +pg_detoast_datum(struct varlena *datum) { if (VARATT_IS_EXTENDED(datum)) return heap_tuple_untoast_attr(datum); @@ -1837,7 +1837,7 @@ pg_detoast_datum(struct varlena * datum) } struct varlena * -pg_detoast_datum_copy(struct varlena * datum) +pg_detoast_datum_copy(struct varlena *datum) { if (VARATT_IS_EXTENDED(datum)) return heap_tuple_untoast_attr(datum); @@ -1853,14 +1853,14 @@ pg_detoast_datum_copy(struct varlena * datum) } struct varlena * -pg_detoast_datum_slice(struct varlena * datum, int32 first, int32 count) +pg_detoast_datum_slice(struct varlena *datum, int32 first, int32 count) { /* Only get the specified portion from the toast rel */ return heap_tuple_untoast_attr_slice(datum, first, count); } struct varlena * -pg_detoast_datum_packed(struct varlena * datum) +pg_detoast_datum_packed(struct varlena *datum) { if (VARATT_IS_COMPRESSED(datum) || VARATT_IS_EXTERNAL(datum)) return heap_tuple_untoast_attr(datum); diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c index 1adc5841f7..578b1daccf 100644 --- a/src/backend/utils/hash/dynahash.c +++ b/src/backend/utils/hash/dynahash.c @@ -331,7 +331,7 @@ hash_create(const char *tabname, long nelem, HASHCTL *info, int flags) } /* Initialize the hash header, plus a copy of the table name */ - hashp = (HTAB *) DynaHashAlloc(sizeof(HTAB) + strlen(tabname) +1); + hashp = (HTAB *) DynaHashAlloc(sizeof(HTAB) + strlen(tabname) + 1); MemSet(hashp, 0, sizeof(HTAB)); hashp->tabname = (char *) (hashp + 1); diff --git a/src/backend/utils/mb/wchar.c b/src/backend/utils/mb/wchar.c index fd51eedf7c..9334039f78 100644 --- a/src/backend/utils/mb/wchar.c +++ b/src/backend/utils/mb/wchar.c @@ -98,7 +98,7 @@ pg_euc2wchar_with_len(const unsigned char *from, pg_wchar *to, int len) *to |= *from++; len -= 2; } - else /* must be ASCII */ + else /* must be ASCII */ { *to = *from++; len--; @@ -581,7 +581,7 @@ struct mbinterval /* auxiliary function for binary search in interval table */ static int -mbbisearch(pg_wchar ucs, const struct mbinterval * table, int max) +mbbisearch(pg_wchar ucs, const struct mbinterval *table, int max) { int min = 0; int mid; diff --git a/src/backend/utils/misc/backend_random.c b/src/backend/utils/misc/backend_random.c index d8556143dc..9a0b2ce9eb 100644 --- a/src/backend/utils/misc/backend_random.c +++ b/src/backend/utils/misc/backend_random.c @@ -69,9 +69,9 @@ typedef struct { bool initialized; unsigned short seed[3]; -} BackendRandomShmemStruct; +} BackendRandomShmemStruct; -static BackendRandomShmemStruct *BackendRandomShmem; +static BackendRandomShmemStruct * BackendRandomShmem; Size BackendRandomShmemSize(void) diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 92e1d63b2f..d9469e4181 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -136,15 +136,15 @@ static void do_serialize(char **destptr, Size *maxbytes, const char *fmt,...) pg static void set_config_sourcefile(const char *name, char *sourcefile, int sourceline); -static bool call_bool_check_hook(struct config_bool * conf, bool *newval, +static bool call_bool_check_hook(struct config_bool *conf, bool *newval, void **extra, GucSource source, int elevel); -static bool call_int_check_hook(struct config_int * conf, int *newval, +static bool call_int_check_hook(struct config_int *conf, int *newval, void **extra, GucSource source, int elevel); -static bool call_real_check_hook(struct config_real * conf, double *newval, +static bool call_real_check_hook(struct config_real *conf, double *newval, void **extra, GucSource source, int elevel); -static bool call_string_check_hook(struct config_string * conf, char **newval, +static bool call_string_check_hook(struct config_string *conf, char **newval, void **extra, GucSource source, int elevel); -static bool call_enum_check_hook(struct config_enum * conf, int *newval, +static bool call_enum_check_hook(struct config_enum *conf, int *newval, void **extra, GucSource source, int elevel); static bool check_log_destination(char **newval, void **extra, GucSource source); @@ -3951,17 +3951,17 @@ static int GUCNestLevel = 0; /* 1 when in main transaction */ static int guc_var_compare(const void *a, const void *b); static int guc_name_compare(const char *namea, const char *nameb); static void InitializeGUCOptionsFromEnvironment(void); -static void InitializeOneGUCOption(struct config_generic * gconf); -static void push_old_value(struct config_generic * gconf, GucAction action); -static void ReportGUCOption(struct config_generic * record); -static void reapply_stacked_values(struct config_generic * variable, - struct config_string * pHolder, +static void InitializeOneGUCOption(struct config_generic *gconf); +static void push_old_value(struct config_generic *gconf, GucAction action); +static void ReportGUCOption(struct config_generic *record); +static void reapply_stacked_values(struct config_generic *variable, + struct config_string *pHolder, GucStack *stack, const char *curvalue, GucContext curscontext, GucSource cursource); static void ShowGUCConfigOption(const char *name, DestReceiver *dest); static void ShowAllGUCConfig(DestReceiver *dest); -static char *_ShowOption(struct config_generic * record, bool use_units); +static char *_ShowOption(struct config_generic *record, bool use_units); static bool validate_option_array_item(const char *name, const char *value, bool skipIfNoPermissions); static void write_auto_conf_file(int fd, const char *filename, ConfigVariable *head_p); @@ -4022,7 +4022,7 @@ guc_strdup(int elevel, const char *src) * Detect whether strval is referenced anywhere in a GUC string item */ static bool -string_field_used(struct config_string * conf, char *strval) +string_field_used(struct config_string *conf, char *strval) { GucStack *stack; @@ -4045,7 +4045,7 @@ string_field_used(struct config_string * conf, char *strval) * states). */ static void -set_string_field(struct config_string * conf, char **field, char *newval) +set_string_field(struct config_string *conf, char **field, char *newval) { char *oldval = *field; @@ -4061,7 +4061,7 @@ set_string_field(struct config_string * conf, char **field, char *newval) * Detect whether an "extra" struct is referenced anywhere in a GUC item */ static bool -extra_field_used(struct config_generic * gconf, void *extra) +extra_field_used(struct config_generic *gconf, void *extra) { GucStack *stack; @@ -4106,7 +4106,7 @@ extra_field_used(struct config_generic * gconf, void *extra) * states). */ static void -set_extra_field(struct config_generic * gconf, void **field, void *newval) +set_extra_field(struct config_generic *gconf, void **field, void *newval) { void *oldval = *field; @@ -4126,7 +4126,7 @@ set_extra_field(struct config_generic * gconf, void **field, void *newval) * initialized to NULL before this is used, else we'll try to free() them. */ static void -set_stack_value(struct config_generic * gconf, config_var_value *val) +set_stack_value(struct config_generic *gconf, config_var_value *val) { switch (gconf->vartype) { @@ -4160,7 +4160,7 @@ set_stack_value(struct config_generic * gconf, config_var_value *val) * The "extra" field associated with the stack entry is cleared, too. */ static void -discard_stack_value(struct config_generic * gconf, config_var_value *val) +discard_stack_value(struct config_generic *gconf, config_var_value *val) { switch (gconf->vartype) { @@ -4283,7 +4283,7 @@ build_guc_variables(void) * list is expanded if needed. */ static bool -add_guc_variable(struct config_generic * var, int elevel) +add_guc_variable(struct config_generic *var, int elevel) { if (num_guc_variables + 1 >= size_guc_variables) { @@ -4420,8 +4420,8 @@ find_option(const char *name, bool create_placeholders, int elevel) static int guc_var_compare(const void *a, const void *b) { - const struct config_generic *confa = *(struct config_generic * const *) a; - const struct config_generic *confb = *(struct config_generic * const *) b; + const struct config_generic *confa = *(struct config_generic *const *) a; + const struct config_generic *confb = *(struct config_generic *const *) b; return guc_name_compare(confa->name, confb->name); } @@ -4566,7 +4566,7 @@ InitializeGUCOptionsFromEnvironment(void) * might fail, but that the hooks might wish to compute an "extra" struct. */ static void -InitializeOneGUCOption(struct config_generic * gconf) +InitializeOneGUCOption(struct config_generic *gconf) { gconf->status = 0; gconf->source = PGC_S_DEFAULT; @@ -4961,7 +4961,7 @@ ResetAllOptions(void) * Push previous state during transactional assignment to a GUC variable. */ static void -push_old_value(struct config_generic * gconf, GucAction action) +push_old_value(struct config_generic *gconf, GucAction action) { GucStack *stack; @@ -5138,7 +5138,7 @@ AtEOXact_GUC(bool isCommit, int nestLevel) /* we keep the current active value */ discard_stack_value(gconf, &stack->prior); } - else /* must be GUC_LOCAL */ + else /* must be GUC_LOCAL */ restorePrior = true; } else if (prev == NULL || @@ -5385,7 +5385,7 @@ BeginReportingGUCOptions(void) * ReportGUCOption: if appropriate, transmit option value to frontend */ static void -ReportGUCOption(struct config_generic * record) +ReportGUCOption(struct config_generic *record) { if (reporting_enabled && (record->flags & GUC_REPORT)) { @@ -5614,7 +5614,7 @@ parse_real(const char *value, double *result) * allocated for modification. */ const char * -config_enum_lookup_by_value(struct config_enum * record, int val) +config_enum_lookup_by_value(struct config_enum *record, int val) { const struct config_enum_entry *entry; @@ -5637,7 +5637,7 @@ config_enum_lookup_by_value(struct config_enum * record, int val) * true. If it's not found, return FALSE and retval is set to 0. */ bool -config_enum_lookup_by_name(struct config_enum * record, const char *value, +config_enum_lookup_by_name(struct config_enum *record, const char *value, int *retval) { const struct config_enum_entry *entry; @@ -5663,7 +5663,7 @@ config_enum_lookup_by_name(struct config_enum * record, const char *value, * If suffix is non-NULL, it is added to the end of the string. */ static char * -config_enum_get_options(struct config_enum * record, const char *prefix, +config_enum_get_options(struct config_enum *record, const char *prefix, const char *suffix, const char *separator) { const struct config_enum_entry *entry; @@ -5721,10 +5721,10 @@ config_enum_get_options(struct config_enum * record, const char *prefix, * Returns true if OK, false if not (or throws error, if elevel >= ERROR) */ static bool -parse_and_validate_value(struct config_generic * record, +parse_and_validate_value(struct config_generic *record, const char *name, const char *value, GucSource source, int elevel, - union config_var_val * newval, void **newextra) + union config_var_val *newval, void **newextra) { switch (record->vartype) { @@ -7545,7 +7545,7 @@ init_custom_variable(const char *name, * variable into the GUC variable array, replacing any placeholder. */ static void -define_custom_variable(struct config_generic * variable) +define_custom_variable(struct config_generic *variable) { const char *name = variable->name; const char **nameAddr = &name; @@ -7645,8 +7645,8 @@ define_custom_variable(struct config_generic * variable) * fashion implied by the stack entry. */ static void -reapply_stacked_values(struct config_generic * variable, - struct config_string * pHolder, +reapply_stacked_values(struct config_generic *variable, + struct config_string *pHolder, GucStack *stack, const char *curvalue, GucContext curscontext, GucSource cursource) @@ -7842,7 +7842,7 @@ DefineCustomEnumVariable(const char *name, const char *long_desc, int *valueAddr, int bootValue, - const struct config_enum_entry * options, + const struct config_enum_entry *options, GucContext context, int flags, GucEnumCheckHook check_hook, @@ -8630,7 +8630,7 @@ show_all_file_settings(PG_FUNCTION_ARGS) } static char * -_ShowOption(struct config_generic * record, bool use_units) +_ShowOption(struct config_generic *record, bool use_units) { char buffer[256]; const char *val; @@ -8741,7 +8741,7 @@ _ShowOption(struct config_generic * record, bool use_units) * variable scontext, integer */ static void -write_one_nondefault_variable(FILE *fp, struct config_generic * gconf) +write_one_nondefault_variable(FILE *fp, struct config_generic *gconf) { if (gconf->source == PGC_S_DEFAULT) return; @@ -8977,7 +8977,7 @@ read_nondefault_variables(void) * never sends these, and RestoreGUCState() never changes them. */ static bool -can_skip_gucvar(struct config_generic * gconf) +can_skip_gucvar(struct config_generic *gconf) { return gconf->context == PGC_POSTMASTER || gconf->context == PGC_INTERNAL || gconf->source == PGC_S_DEFAULT; @@ -8990,7 +8990,7 @@ can_skip_gucvar(struct config_generic * gconf) * It's OK to overestimate, but not to underestimate. */ static Size -estimate_variable_size(struct config_generic * gconf) +estimate_variable_size(struct config_generic *gconf) { Size size; Size valsize = 0; @@ -9162,7 +9162,7 @@ do_serialize_binary(char **destptr, Size *maxbytes, void *val, Size valsize) */ static void serialize_variable(char **destptr, Size *maxbytes, - struct config_generic * gconf) + struct config_generic *gconf) { if (can_skip_gucvar(gconf)) return; @@ -9783,7 +9783,7 @@ GUC_check_errcode(int sqlerrcode) */ static bool -call_bool_check_hook(struct config_bool * conf, bool *newval, void **extra, +call_bool_check_hook(struct config_bool *conf, bool *newval, void **extra, GucSource source, int elevel) { /* Quick success if no hook */ @@ -9817,7 +9817,7 @@ call_bool_check_hook(struct config_bool * conf, bool *newval, void **extra, } static bool -call_int_check_hook(struct config_int * conf, int *newval, void **extra, +call_int_check_hook(struct config_int *conf, int *newval, void **extra, GucSource source, int elevel) { /* Quick success if no hook */ @@ -9851,7 +9851,7 @@ call_int_check_hook(struct config_int * conf, int *newval, void **extra, } static bool -call_real_check_hook(struct config_real * conf, double *newval, void **extra, +call_real_check_hook(struct config_real *conf, double *newval, void **extra, GucSource source, int elevel) { /* Quick success if no hook */ @@ -9885,7 +9885,7 @@ call_real_check_hook(struct config_real * conf, double *newval, void **extra, } static bool -call_string_check_hook(struct config_string * conf, char **newval, void **extra, +call_string_check_hook(struct config_string *conf, char **newval, void **extra, GucSource source, int elevel) { /* Quick success if no hook */ @@ -9919,7 +9919,7 @@ call_string_check_hook(struct config_string * conf, char **newval, void **extra, } static bool -call_enum_check_hook(struct config_enum * conf, int *newval, void **extra, +call_enum_check_hook(struct config_enum *conf, int *newval, void **extra, GucSource source, int elevel) { /* Quick success if no hook */ diff --git a/src/backend/utils/mmgr/aset.c b/src/backend/utils/mmgr/aset.c index 45d793c1e8..9d8f02a179 100644 --- a/src/backend/utils/mmgr/aset.c +++ b/src/backend/utils/mmgr/aset.c @@ -152,7 +152,7 @@ typedef struct AllocBlockData AllocBlock next; /* next block in aset's blocks list, if any */ char *freeptr; /* start of free space in this block */ char *endptr; /* end of space in this block */ -} AllocBlockData; +} AllocBlockData; /* * AllocChunk @@ -176,7 +176,7 @@ typedef struct AllocChunkData void *aset; /* there must not be any padding to reach a MAXALIGN boundary here! */ -} AllocChunkData; +} AllocChunkData; /* * AllocPointerIsValid diff --git a/src/backend/utils/mmgr/slab.c b/src/backend/utils/mmgr/slab.c index e59154ddda..2cf58059d0 100644 --- a/src/backend/utils/mmgr/slab.c +++ b/src/backend/utils/mmgr/slab.c @@ -190,7 +190,7 @@ SlabContextCreate(MemoryContext parent, Size freelistSize; SlabContext *slab; - StaticAssertStmt(offsetof(SlabChunk, slab) +sizeof(MemoryContext) == + StaticAssertStmt(offsetof(SlabChunk, slab) + sizeof(MemoryContext) == MAXALIGN(sizeof(SlabChunk)), "padding calculation in SlabChunk is wrong"); @@ -221,7 +221,7 @@ SlabContextCreate(MemoryContext parent, /* Do the type-independent part of context creation */ slab = (SlabContext *) MemoryContextCreate(T_SlabContext, - (offsetof(SlabContext, freelist) +freelistSize), + (offsetof(SlabContext, freelist) + freelistSize), &SlabMethods, parent, name); diff --git a/src/backend/utils/resowner/resowner.c b/src/backend/utils/resowner/resowner.c index af46d78125..8f324cd580 100644 --- a/src/backend/utils/resowner/resowner.c +++ b/src/backend/utils/resowner/resowner.c @@ -128,7 +128,7 @@ typedef struct ResourceOwnerData /* We can remember up to MAX_RESOWNER_LOCKS references to local locks. */ int nlocks; /* number of owned locks */ LOCALLOCK *locks[MAX_RESOWNER_LOCKS]; /* list of owned locks */ -} ResourceOwnerData; +} ResourceOwnerData; /***************************************************************************** diff --git a/src/backend/utils/sort/tuplesort.c b/src/backend/utils/sort/tuplesort.c index 8a8db0fd33..5614d970bd 100644 --- a/src/backend/utils/sort/tuplesort.c +++ b/src/backend/utils/sort/tuplesort.c @@ -263,7 +263,7 @@ typedef enum #define RUN_SECOND 1 typedef int (*SortTupleComparator) (const SortTuple *a, const SortTuple *b, - Tuplesortstate *state); + Tuplesortstate *state); /* * Private state of a Tuplesort operation. @@ -314,7 +314,7 @@ struct Tuplesortstate * memory space thereby released. */ void (*writetup) (Tuplesortstate *state, int tapenum, - SortTuple *stup); + SortTuple *stup); /* * Function to read a stored tuple from tape back into memory. 'len' is @@ -322,7 +322,7 @@ struct Tuplesortstate * from the slab memory arena, or is palloc'd, see readtup_alloc(). */ void (*readtup) (Tuplesortstate *state, SortTuple *stup, - int tapenum, unsigned int len); + int tapenum, unsigned int len); /* * This array holds the tuples now in sort memory. If we are in state @@ -2391,7 +2391,7 @@ inittapes(Tuplesortstate *state) * case it's not important to account for tuple space, so we don't care if * LACKMEM becomes inaccurate.) */ - tapeSpace = (int64) maxTapes *TAPE_BUFFER_OVERHEAD; + tapeSpace = (int64) maxTapes * TAPE_BUFFER_OVERHEAD; if (tapeSpace + GetMemoryChunkSpace(state->memtuples) < state->allowedMem) USEMEM(state, tapeSpace); diff --git a/src/bin/initdb/findtimezone.c b/src/bin/initdb/findtimezone.c index 82089f47a0..edfeb52d54 100644 --- a/src/bin/initdb/findtimezone.c +++ b/src/bin/initdb/findtimezone.c @@ -151,7 +151,7 @@ struct tztry }; static void scan_available_timezones(char *tzdir, char *tzdirsub, - struct tztry * tt, + struct tztry *tt, int *bestscore, char *bestzonename); @@ -159,7 +159,7 @@ static void scan_available_timezones(char *tzdir, char *tzdirsub, * Get GMT offset from a system struct tm */ static int -get_timezone_offset(struct tm * tm) +get_timezone_offset(struct tm *tm) { #if defined(HAVE_STRUCT_TM_TM_ZONE) return tm->tm_gmtoff; @@ -190,7 +190,7 @@ build_time_t(int year, int month, int day) * Does a system tm value match one we computed ourselves? */ static bool -compare_tm(struct tm * s, struct pg_tm * p) +compare_tm(struct tm *s, struct pg_tm *p) { if (s->tm_sec != p->tm_sec || s->tm_min != p->tm_min || @@ -217,7 +217,7 @@ compare_tm(struct tm * s, struct pg_tm * p) * test time. */ static int -score_timezone(const char *tzname, struct tztry * tt) +score_timezone(const char *tzname, struct tztry *tt) { int i; pg_time_t pgtt; @@ -506,7 +506,7 @@ identify_system_timezone(void) * score. bestzonename must be a buffer of length TZ_STRLEN_MAX + 1. */ static void -scan_available_timezones(char *tzdir, char *tzdirsub, struct tztry * tt, +scan_available_timezones(char *tzdir, char *tzdirsub, struct tztry *tt, int *bestscore, char *bestzonename) { int tzdir_orig_len = strlen(tzdir); @@ -578,7 +578,7 @@ static const struct const char *stdname; /* Windows name of standard timezone */ const char *dstname; /* Windows name of daylight timezone */ const char *pgtzname; /* Name of pgsql timezone to map to */ -} win32_tzmap[] = +} win32_tzmap[] = { /* diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c index cd2f4b66d0..bc8a8706c1 100644 --- a/src/bin/initdb/initdb.c +++ b/src/bin/initdb/initdb.c @@ -1382,7 +1382,7 @@ bootstrap_template1(void) static void setup_auth(FILE *cmdfd) { - const char *const * line; + const char *const *line; static const char *const pg_authid_setup[] = { /* * The authid table shouldn't be readable except through views, to @@ -1469,7 +1469,7 @@ get_su_pwd(void) static void setup_depend(FILE *cmdfd) { - const char *const * line; + const char *const *line; static const char *const pg_depend_setup[] = { /* * Make PIN entries in pg_depend for all objects made so far in the @@ -1922,7 +1922,7 @@ vacuum_db(FILE *cmdfd) static void make_template0(FILE *cmdfd) { - const char *const * line; + const char *const *line; static const char *const template0_setup[] = { "CREATE DATABASE template0 IS_TEMPLATE = true ALLOW_CONNECTIONS = false;\n\n", @@ -1960,7 +1960,7 @@ make_template0(FILE *cmdfd) static void make_postgres(FILE *cmdfd) { - const char *const * line; + const char *const *line; static const char *const postgres_setup[] = { "CREATE DATABASE postgres;\n\n", "COMMENT ON DATABASE postgres IS 'default administrative connection database';\n\n", @@ -2030,7 +2030,7 @@ check_ok(void) /* Hack to suppress a warning about %x from some versions of gcc */ static inline size_t -my_strftime(char *s, size_t max, const char *fmt, const struct tm * tm) +my_strftime(char *s, size_t max, const char *fmt, const struct tm *tm) { return strftime(s, max, fmt, tm); } @@ -2305,9 +2305,9 @@ check_authmethod_unspecified(const char **authmethod) } static void -check_authmethod_valid(const char *authmethod, const char *const * valid_methods, const char *conntype) +check_authmethod_valid(const char *authmethod, const char *const *valid_methods, const char *conntype) { - const char *const * p; + const char *const *p; for (p = valid_methods; *p; p++) { diff --git a/src/bin/pg_dump/parallel.h b/src/bin/pg_dump/parallel.h index ad99735226..27ae2eda73 100644 --- a/src/bin/pg_dump/parallel.h +++ b/src/bin/pg_dump/parallel.h @@ -20,9 +20,9 @@ /* Function to call in master process on completion of a worker task */ typedef void (*ParallelCompletionPtr) (ArchiveHandle *AH, - TocEntry *te, - int status, - void *callback_data); + TocEntry *te, + int status, + void *callback_data); /* Wait options for WaitForWorkers */ typedef enum diff --git a/src/bin/pg_dump/pg_backup.h b/src/bin/pg_dump/pg_backup.h index 1b47baa2af..77da43c08a 100644 --- a/src/bin/pg_dump/pg_backup.h +++ b/src/bin/pg_dump/pg_backup.h @@ -65,8 +65,8 @@ typedef struct _restoreOptions int noTablespace; /* Don't issue tablespace-related commands */ int disable_triggers; /* disable triggers during data-only * restore */ - int use_setsessauth;/* Use SET SESSION AUTHORIZATION commands - * instead of OWNER TO */ + int use_setsessauth; /* Use SET SESSION AUTHORIZATION commands + * instead of OWNER TO */ char *superuser; /* Username to use as superuser */ char *use_role; /* Issue SET ROLE to this */ int dropSchema; diff --git a/src/bin/pg_dump/pg_backup_custom.c b/src/bin/pg_dump/pg_backup_custom.c index a1f4cb1fea..810ff6b180 100644 --- a/src/bin/pg_dump/pg_backup_custom.c +++ b/src/bin/pg_dump/pg_backup_custom.c @@ -478,7 +478,7 @@ _PrintTocData(ArchiveHandle *AH, TocEntry *te) "possibly due to out-of-order restore request, " "which cannot be handled due to non-seekable input file\n", te->dumpId); - else /* huh, the dataPos led us to EOF? */ + else /* huh, the dataPos led us to EOF? */ exit_horribly(modulename, "could not find block ID %d in archive -- " "possibly corrupt archive\n", te->dumpId); diff --git a/src/bin/pg_dump/pg_backup_utils.c b/src/bin/pg_dump/pg_backup_utils.c index d7907fde95..1e5967e5cc 100644 --- a/src/bin/pg_dump/pg_backup_utils.c +++ b/src/bin/pg_dump/pg_backup_utils.c @@ -25,7 +25,7 @@ static struct { on_exit_nicely_callback function; void *arg; -} on_exit_nicely_list[MAX_ON_EXIT_NICELY]; +} on_exit_nicely_list[MAX_ON_EXIT_NICELY]; static int on_exit_nicely_index; diff --git a/src/bin/pg_dump/pg_dump_sort.c b/src/bin/pg_dump/pg_dump_sort.c index 5c19b05ca4..d29723c171 100644 --- a/src/bin/pg_dump/pg_dump_sort.c +++ b/src/bin/pg_dump/pg_dump_sort.c @@ -1181,7 +1181,7 @@ repairDependencyLoop(DumpableObject **loop, write_msg(NULL, "Consider using a full dump instead of a --data-only dump to avoid this problem.\n"); if (nLoop > 1) removeObjectDependency(loop[0], loop[1]->dumpId); - else /* must be a self-dependency */ + else /* must be a self-dependency */ removeObjectDependency(loop[0], loop[0]->dumpId); return; } @@ -1201,7 +1201,7 @@ repairDependencyLoop(DumpableObject **loop, if (nLoop > 1) removeObjectDependency(loop[0], loop[1]->dumpId); - else /* must be a self-dependency */ + else /* must be a self-dependency */ removeObjectDependency(loop[0], loop[0]->dumpId); } diff --git a/src/bin/pg_upgrade/check.c b/src/bin/pg_upgrade/check.c index f28359d379..fbe46d8795 100644 --- a/src/bin/pg_upgrade/check.c +++ b/src/bin/pg_upgrade/check.c @@ -919,16 +919,16 @@ check_for_reg_data_type_usage(ClusterInfo *cluster) "WHERE c.oid = a.attrelid AND " " NOT a.attisdropped AND " " a.atttypid IN ( " - " 'pg_catalog.regproc'::pg_catalog.regtype, " - " 'pg_catalog.regprocedure'::pg_catalog.regtype, " - " 'pg_catalog.regoper'::pg_catalog.regtype, " - " 'pg_catalog.regoperator'::pg_catalog.regtype, " + " 'pg_catalog.regproc'::pg_catalog.regtype, " + " 'pg_catalog.regprocedure'::pg_catalog.regtype, " + " 'pg_catalog.regoper'::pg_catalog.regtype, " + " 'pg_catalog.regoperator'::pg_catalog.regtype, " /* regclass.oid is preserved, so 'regclass' is OK */ /* regtype.oid is preserved, so 'regtype' is OK */ - " 'pg_catalog.regconfig'::pg_catalog.regtype, " - " 'pg_catalog.regdictionary'::pg_catalog.regtype) AND " + " 'pg_catalog.regconfig'::pg_catalog.regtype, " + " 'pg_catalog.regdictionary'::pg_catalog.regtype) AND " " c.relnamespace = n.oid AND " - " n.nspname NOT IN ('pg_catalog', 'information_schema')"); + " n.nspname NOT IN ('pg_catalog', 'information_schema')"); ntups = PQntuples(res); i_nspname = PQfnumber(res, "nspname"); @@ -1015,11 +1015,11 @@ check_for_jsonb_9_4_usage(ClusterInfo *cluster) " pg_catalog.pg_attribute a " "WHERE c.oid = a.attrelid AND " " NOT a.attisdropped AND " - " a.atttypid = 'pg_catalog.jsonb'::pg_catalog.regtype AND " + " a.atttypid = 'pg_catalog.jsonb'::pg_catalog.regtype AND " " c.relnamespace = n.oid AND " /* exclude possible orphaned temp tables */ " n.nspname !~ '^pg_temp_' AND " - " n.nspname NOT IN ('pg_catalog', 'information_schema')"); + " n.nspname NOT IN ('pg_catalog', 'information_schema')"); ntups = PQntuples(res); i_nspname = PQfnumber(res, "nspname"); diff --git a/src/bin/pg_upgrade/version.c b/src/bin/pg_upgrade/version.c index 814eaa522c..3150a29a5b 100644 --- a/src/bin/pg_upgrade/version.c +++ b/src/bin/pg_upgrade/version.c @@ -138,12 +138,12 @@ old_9_3_check_for_line_data_type_usage(ClusterInfo *cluster) " pg_catalog.pg_attribute a " "WHERE c.oid = a.attrelid AND " " NOT a.attisdropped AND " - " a.atttypid = 'pg_catalog.line'::pg_catalog.regtype AND " + " a.atttypid = 'pg_catalog.line'::pg_catalog.regtype AND " " c.relnamespace = n.oid AND " /* exclude possible orphaned temp tables */ " n.nspname !~ '^pg_temp_' AND " - " n.nspname !~ '^pg_toast_temp_' AND " - " n.nspname NOT IN ('pg_catalog', 'information_schema')"); + " n.nspname !~ '^pg_toast_temp_' AND " + " n.nspname NOT IN ('pg_catalog', 'information_schema')"); ntups = PQntuples(res); i_nspname = PQfnumber(res, "nspname"); @@ -235,7 +235,7 @@ old_9_6_check_for_unknown_data_type_usage(ClusterInfo *cluster) " pg_catalog.pg_attribute a " "WHERE c.oid = a.attrelid AND " " NOT a.attisdropped AND " - " a.atttypid = 'pg_catalog.unknown'::pg_catalog.regtype AND " + " a.atttypid = 'pg_catalog.unknown'::pg_catalog.regtype AND " " c.relkind IN (" CppAsString2(RELKIND_RELATION) ", " CppAsString2(RELKIND_COMPOSITE_TYPE) ", " @@ -243,8 +243,8 @@ old_9_6_check_for_unknown_data_type_usage(ClusterInfo *cluster) " c.relnamespace = n.oid AND " /* exclude possible orphaned temp tables */ " n.nspname !~ '^pg_temp_' AND " - " n.nspname !~ '^pg_toast_temp_' AND " - " n.nspname NOT IN ('pg_catalog', 'information_schema')"); + " n.nspname !~ '^pg_toast_temp_' AND " + " n.nspname NOT IN ('pg_catalog', 'information_schema')"); ntups = PQntuples(res); i_nspname = PQfnumber(res, "nspname"); diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c index 14aa587a27..e420b37e39 100644 --- a/src/bin/pgbench/pgbench.c +++ b/src/bin/pgbench/pgbench.c @@ -1002,7 +1002,7 @@ makeVariableNumeric(Variable *var) setIntValue(&var->num_value, strtoint64(var->value)); var->is_numeric = true; } - else /* type should be double */ + else /* type should be double */ { double dv; char xs; @@ -1357,7 +1357,7 @@ evalFunc(TState *thread, CState *st, Assert(0); } } - else /* we have integer operands, or % */ + else /* we have integer operands, or % */ { int64 li, ri; @@ -1595,7 +1595,7 @@ evalFunc(TState *thread, CState *st, Assert(nargs == 2); setIntValue(retval, getrand(thread, imin, imax)); } - else /* gaussian & exponential */ + else /* gaussian & exponential */ { double param; @@ -1617,7 +1617,7 @@ evalFunc(TState *thread, CState *st, setIntValue(retval, getGaussianRand(thread, imin, imax, param)); } - else /* exponential */ + else /* exponential */ { if (param <= 0.0) { @@ -1899,7 +1899,7 @@ sendCommand(CState *st, Command *command) r = PQsendQueryPrepared(st->con, name, command->argc - 1, params, NULL, NULL, 0); } - else /* unknown sql mode */ + else /* unknown sql mode */ r = 0; if (r == 0) @@ -3397,7 +3397,7 @@ findBuiltin(const char *name) /* error cases */ if (found == 0) fprintf(stderr, "no builtin script found for name \"%s\"\n", name); - else /* found > 1 */ + else /* found > 1 */ fprintf(stderr, "ambiguous builtin name: %d builtin scripts found for prefix \"%s\"\n", found, name); @@ -4290,7 +4290,7 @@ main(int argc, char **argv) /* compute when to stop */ if (duration > 0) end_time = INSTR_TIME_GET_MICROSEC(thread->start_time) + - (int64) 1000000 *duration; + (int64) 1000000 * duration; /* the first thread (i = 0) is executed by main thread */ if (i > 0) @@ -4313,7 +4313,7 @@ main(int argc, char **argv) /* compute when to stop */ if (duration > 0) end_time = INSTR_TIME_GET_MICROSEC(threads[0].start_time) + - (int64) 1000000 *duration; + (int64) 1000000 * duration; threads[0].thread = INVALID_THREAD; #endif /* ENABLE_THREAD_SAFETY */ @@ -4690,7 +4690,7 @@ threadRun(void *arg) */ do { - next_report += (int64) progress *1000000; + next_report += (int64) progress * 1000000; } while (now >= next_report); } } diff --git a/src/bin/pgevent/pgevent.c b/src/bin/pgevent/pgevent.c index f68f987c17..0b50a3cc6a 100644 --- a/src/bin/pgevent/pgevent.c +++ b/src/bin/pgevent/pgevent.c @@ -28,7 +28,7 @@ char event_source[256] = DEFAULT_EVENT_SOURCE; HRESULT DllInstall(BOOL bInstall, LPCWSTR pszCmdLine); STDAPI DllRegisterServer(void); STDAPI DllUnregisterServer(void); -BOOL WINAPI DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved); +BOOL WINAPI DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved); /* * DllInstall --- Passes the command line argument to DLL diff --git a/src/bin/psql/conditional.h b/src/bin/psql/conditional.h index 448db9b8bd..00fbe90ed0 100644 --- a/src/bin/psql/conditional.h +++ b/src/bin/psql/conditional.h @@ -51,7 +51,7 @@ typedef struct IfStackElem typedef struct ConditionalStackData { IfStackElem *head; -} ConditionalStackData; +} ConditionalStackData; typedef struct ConditionalStackData *ConditionalStack; diff --git a/src/bin/psql/copy.c b/src/bin/psql/copy.c index 7ed339ab6d..12a50d215c 100644 --- a/src/bin/psql/copy.c +++ b/src/bin/psql/copy.c @@ -63,7 +63,7 @@ struct copy_options static void -free_copy_options(struct copy_options * ptr) +free_copy_options(struct copy_options *ptr) { if (!ptr) return; diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c index 9137a4e895..83c133534c 100644 --- a/src/bin/psql/describe.c +++ b/src/bin/psql/describe.c @@ -1864,8 +1864,8 @@ describeOneTableDetails(const char *schemaname, if (verbose) printfPQExpBuffer(&buf, "SELECT inhparent::pg_catalog.regclass," - " pg_get_expr(c.relpartbound, inhrelid)," - " pg_get_partition_constraintdef(inhrelid)" + " pg_get_expr(c.relpartbound, inhrelid)," + " pg_get_partition_constraintdef(inhrelid)" " FROM pg_catalog.pg_class c" " JOIN pg_catalog.pg_inherits" " ON c.oid = inhrelid" diff --git a/src/bin/psql/mainloop.c b/src/bin/psql/mainloop.c index 2bc2f43b4e..67e922fa94 100644 --- a/src/bin/psql/mainloop.c +++ b/src/bin/psql/mainloop.c @@ -517,4 +517,4 @@ MainLoop(FILE *source) pset.lineno = prev_lineno; return successResult; -} /* MainLoop() */ +} /* MainLoop() */ diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c index 8068a28b4e..751ef913f0 100644 --- a/src/bin/psql/startup.c +++ b/src/bin/psql/startup.c @@ -79,7 +79,7 @@ struct adhoc_opts }; static void parse_psql_options(int argc, char *argv[], - struct adhoc_opts * options); + struct adhoc_opts *options); static void simple_action_list_append(SimpleActionList *list, enum _actions action, const char *val); static void process_psqlrc(char *argv0); @@ -411,7 +411,7 @@ error: */ static void -parse_psql_options(int argc, char *argv[], struct adhoc_opts * options) +parse_psql_options(int argc, char *argv[], struct adhoc_opts *options) { static struct option long_options[] = { diff --git a/src/bin/psql/stringutils.c b/src/bin/psql/stringutils.c index 145069ae13..959381d085 100644 --- a/src/bin/psql/stringutils.c +++ b/src/bin/psql/stringutils.c @@ -58,8 +58,8 @@ strtokx(const char *s, bool del_quotes, int encoding) { - static char *storage = NULL;/* store the local copy of the users string - * here */ + static char *storage = NULL; /* store the local copy of the users + * string here */ static char *string = NULL; /* pointer into storage where to continue on * next call */ diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c index 92cc8aa97a..4ef8ed4735 100644 --- a/src/bin/psql/tab-complete.c +++ b/src/bin/psql/tab-complete.c @@ -130,7 +130,7 @@ static int completion_max_records; * the completion callback functions. Ugly but there is no better way. */ static const char *completion_charp; /* to pass a string */ -static const char *const * completion_charpp; /* to pass a list of strings */ +static const char *const *completion_charpp; /* to pass a list of strings */ static const char *completion_info_charp; /* to pass a second string */ static const char *completion_info_charp2; /* to pass a third string */ static const SchemaQuery *completion_squery; /* to pass a SchemaQuery */ diff --git a/src/common/exec.c b/src/common/exec.c index bd01c2d9a2..617feff861 100644 --- a/src/common/exec.c +++ b/src/common/exec.c @@ -187,7 +187,7 @@ find_my_exec(const char *argv0, char *retpath) switch (validate_exec(retpath)) { - case 0: /* found ok */ + case 0: /* found ok */ return resolve_symlinks(retpath); case -1: /* wasn't even a candidate, keep looking */ break; @@ -683,7 +683,7 @@ AddUserToTokenDacl(HANDLE hToken) /* Figure out the size of the new ACL */ dwNewAclSize = asi.AclBytesInUse + sizeof(ACCESS_ALLOWED_ACE) + - GetLengthSid(pTokenUser->User.Sid) -sizeof(DWORD); + GetLengthSid(pTokenUser->User.Sid) - sizeof(DWORD); /* Allocate the ACL buffer & initialize it */ pacl = (PACL) LocalAlloc(LPTR, dwNewAclSize); diff --git a/src/common/ip.c b/src/common/ip.c index 80711dbb98..b71160066c 100644 --- a/src/common/ip.c +++ b/src/common/ip.c @@ -40,10 +40,10 @@ #ifdef HAVE_UNIX_SOCKETS static int getaddrinfo_unix(const char *path, - const struct addrinfo * hintsp, - struct addrinfo ** result); + const struct addrinfo *hintsp, + struct addrinfo **result); -static int getnameinfo_unix(const struct sockaddr_un * sa, int salen, +static int getnameinfo_unix(const struct sockaddr_un *sa, int salen, char *node, int nodelen, char *service, int servicelen, int flags); @@ -55,7 +55,7 @@ static int getnameinfo_unix(const struct sockaddr_un * sa, int salen, */ int pg_getaddrinfo_all(const char *hostname, const char *servname, - const struct addrinfo * hintp, struct addrinfo ** result) + const struct addrinfo *hintp, struct addrinfo **result) { int rc; @@ -85,7 +85,7 @@ pg_getaddrinfo_all(const char *hostname, const char *servname, * not safe to look at ai_family in the addrinfo itself. */ void -pg_freeaddrinfo_all(int hint_ai_family, struct addrinfo * ai) +pg_freeaddrinfo_all(int hint_ai_family, struct addrinfo *ai) { #ifdef HAVE_UNIX_SOCKETS if (hint_ai_family == AF_UNIX) @@ -119,7 +119,7 @@ pg_freeaddrinfo_all(int hint_ai_family, struct addrinfo * ai) * guaranteed to be filled with something even on failure return. */ int -pg_getnameinfo_all(const struct sockaddr_storage * addr, int salen, +pg_getnameinfo_all(const struct sockaddr_storage *addr, int salen, char *node, int nodelen, char *service, int servicelen, int flags) @@ -162,8 +162,8 @@ pg_getnameinfo_all(const struct sockaddr_storage * addr, int salen, * ------- */ static int -getaddrinfo_unix(const char *path, const struct addrinfo * hintsp, - struct addrinfo ** result) +getaddrinfo_unix(const char *path, const struct addrinfo *hintsp, + struct addrinfo **result) { struct addrinfo hints; struct addrinfo *aip; @@ -228,7 +228,7 @@ getaddrinfo_unix(const char *path, const struct addrinfo * hintsp, * Convert an address to a hostname. */ static int -getnameinfo_unix(const struct sockaddr_un * sa, int salen, +getnameinfo_unix(const struct sockaddr_un *sa, int salen, char *node, int nodelen, char *service, int servicelen, int flags) diff --git a/src/common/unicode/norm_test.c b/src/common/unicode/norm_test.c index 10a370cffa..f1bd99fce4 100644 --- a/src/common/unicode/norm_test.c +++ b/src/common/unicode/norm_test.c @@ -56,7 +56,7 @@ pg_wcscmp(const pg_wchar *s1, const pg_wchar *s2) int main(int argc, char **argv) { - const pg_unicode_test *test; + const pg_unicode_test *test; for (test = UnicodeNormalizationTests; test->input[0] != 0; test++) { diff --git a/src/fe_utils/mbprint.c b/src/fe_utils/mbprint.c index d186fc4c91..364baa6a1b 100644 --- a/src/fe_utils/mbprint.c +++ b/src/fe_utils/mbprint.c @@ -253,7 +253,7 @@ pg_wcssize(const unsigned char *pwcs, size_t len, int encoding, linewidth += 4; format_size += 4; } - else /* Output it as-is */ + else /* Output it as-is */ { linewidth += w; format_size += 1; @@ -264,7 +264,7 @@ pg_wcssize(const unsigned char *pwcs, size_t len, int encoding, linewidth += 6; /* \u0000 */ format_size += 6; } - else /* All other chars */ + else /* All other chars */ { linewidth += w; format_size += chlen; @@ -292,7 +292,7 @@ pg_wcssize(const unsigned char *pwcs, size_t len, int encoding, */ void pg_wcsformat(const unsigned char *pwcs, size_t len, int encoding, - struct lineptr * lines, int count) + struct lineptr *lines, int count) { int w, chlen = 0; @@ -341,7 +341,7 @@ pg_wcsformat(const unsigned char *pwcs, size_t len, int encoding, linewidth += 4; ptr += 4; } - else /* Output it as-is */ + else /* Output it as-is */ { linewidth += w; *ptr++ = *pwcs; @@ -363,7 +363,7 @@ pg_wcsformat(const unsigned char *pwcs, size_t len, int encoding, ptr += 6; linewidth += 6; } - else /* All other chars */ + else /* All other chars */ { int i; diff --git a/src/fe_utils/print.c b/src/fe_utils/print.c index 9180b90004..4c320b215c 100644 --- a/src/fe_utils/print.c +++ b/src/fe_utils/print.c @@ -370,7 +370,7 @@ print_unaligned_text(const printTableContent *cont, FILE *fout) { bool opt_tuples_only = cont->opt->tuples_only; unsigned int i; - const char *const * ptr; + const char *const *ptr; bool need_recordsep = false; if (cancel_pressed) @@ -461,7 +461,7 @@ print_unaligned_vertical(const printTableContent *cont, FILE *fout) { bool opt_tuples_only = cont->opt->tuples_only; unsigned int i; - const char *const * ptr; + const char *const *ptr; bool need_recordsep = false; if (cancel_pressed) @@ -606,7 +606,7 @@ print_aligned_text(const printTableContent *cont, FILE *fout, bool is_pager) unsigned int extra_row_output_lines = 0; unsigned int extra_output_lines = 0; - const char *const * ptr; + const char *const *ptr; struct lineptr **col_lineptrs; /* pointers to line pointer per column */ @@ -1049,7 +1049,7 @@ print_aligned_text(const printTableContent *cont, FILE *fout, bool is_pager) (char *) (this_line->ptr + bytes_output[j]), bytes_to_output); } - else /* Left aligned cell */ + else /* Left aligned cell */ { /* spaces second */ fputnbytes(fout, @@ -1236,7 +1236,7 @@ print_aligned_vertical(const printTableContent *cont, const printTextLineFormat *dformat = &format->lrule[PRINT_RULE_DATA]; int encoding = cont->opt->encoding; unsigned long record = cont->opt->prior_records + 1; - const char *const * ptr; + const char *const *ptr; unsigned int i, hwidth = 0, dwidth = 0, @@ -1789,7 +1789,7 @@ print_html_text(const printTableContent *cont, FILE *fout) unsigned short opt_border = cont->opt->border; const char *opt_table_attr = cont->opt->tableAttr; unsigned int i; - const char *const * ptr; + const char *const *ptr; if (cancel_pressed) return; @@ -1879,7 +1879,7 @@ print_html_vertical(const printTableContent *cont, FILE *fout) const char *opt_table_attr = cont->opt->tableAttr; unsigned long record = cont->opt->prior_records + 1; unsigned int i; - const char *const * ptr; + const char *const *ptr; if (cancel_pressed) return; @@ -1980,7 +1980,7 @@ print_asciidoc_text(const printTableContent *cont, FILE *fout) bool opt_tuples_only = cont->opt->tuples_only; unsigned short opt_border = cont->opt->border; unsigned int i; - const char *const * ptr; + const char *const *ptr; if (cancel_pressed) return; @@ -2091,7 +2091,7 @@ print_asciidoc_vertical(const printTableContent *cont, FILE *fout) unsigned short opt_border = cont->opt->border; unsigned long record = cont->opt->prior_records + 1; unsigned int i; - const char *const * ptr; + const char *const *ptr; if (cancel_pressed) return; @@ -2223,7 +2223,7 @@ print_latex_text(const printTableContent *cont, FILE *fout) bool opt_tuples_only = cont->opt->tuples_only; unsigned short opt_border = cont->opt->border; unsigned int i; - const char *const * ptr; + const char *const *ptr; if (cancel_pressed) return; @@ -2328,7 +2328,7 @@ print_latex_longtable_text(const printTableContent *cont, FILE *fout) const char *opt_table_attr = cont->opt->tableAttr; const char *next_opt_table_attr_char = opt_table_attr; const char *last_opt_table_attr_char = NULL; - const char *const * ptr; + const char *const *ptr; if (cancel_pressed) return; @@ -2482,7 +2482,7 @@ print_latex_vertical(const printTableContent *cont, FILE *fout) unsigned short opt_border = cont->opt->border; unsigned long record = cont->opt->prior_records + 1; unsigned int i; - const char *const * ptr; + const char *const *ptr; if (cancel_pressed) return; @@ -2591,7 +2591,7 @@ print_troff_ms_text(const printTableContent *cont, FILE *fout) bool opt_tuples_only = cont->opt->tuples_only; unsigned short opt_border = cont->opt->border; unsigned int i; - const char *const * ptr; + const char *const *ptr; if (cancel_pressed) return; @@ -2684,7 +2684,7 @@ print_troff_ms_vertical(const printTableContent *cont, FILE *fout) unsigned short opt_border = cont->opt->border; unsigned long record = cont->opt->prior_records + 1; unsigned int i; - const char *const * ptr; + const char *const *ptr; unsigned short current_format = 0; /* 0=none, 1=header, 2=body */ if (cancel_pressed) diff --git a/src/fe_utils/simple_list.c b/src/fe_utils/simple_list.c index 1be8ca7598..21a2e57297 100644 --- a/src/fe_utils/simple_list.c +++ b/src/fe_utils/simple_list.c @@ -65,7 +65,7 @@ simple_string_list_append(SimpleStringList *list, const char *val) SimpleStringListCell *cell; cell = (SimpleStringListCell *) - pg_malloc(offsetof(SimpleStringListCell, val) +strlen(val) + 1); + pg_malloc(offsetof(SimpleStringListCell, val) + strlen(val) + 1); cell->next = NULL; cell->touched = false; diff --git a/src/fe_utils/string_utils.c b/src/fe_utils/string_utils.c index dc84d32a09..45a08c7ee1 100644 --- a/src/fe_utils/string_utils.c +++ b/src/fe_utils/string_utils.c @@ -596,7 +596,7 @@ void appendPsqlMetaConnect(PQExpBuffer buf, const char *dbname) { const char *s; - bool complex; + bool complex; /* * If the name is plain ASCII characters, emit a trivial "\connect "foo"". @@ -604,6 +604,7 @@ appendPsqlMetaConnect(PQExpBuffer buf, const char *dbname) * general case. No database has a zero-length name. */ complex = false; + for (s = dbname; *s; s++) { if (*s == '\n' || *s == '\r') diff --git a/src/include/access/amapi.h b/src/include/access/amapi.h index f919cf8b87..37bd51f85b 100644 --- a/src/include/access/amapi.h +++ b/src/include/access/amapi.h @@ -60,20 +60,20 @@ typedef enum IndexAMProperty /* build new index */ typedef IndexBuildResult *(*ambuild_function) (Relation heapRelation, - Relation indexRelation, - struct IndexInfo *indexInfo); + Relation indexRelation, + struct IndexInfo *indexInfo); /* build empty index */ typedef void (*ambuildempty_function) (Relation indexRelation); /* insert this tuple */ typedef bool (*aminsert_function) (Relation indexRelation, - Datum *values, - bool *isnull, - ItemPointer heap_tid, - Relation heapRelation, - IndexUniqueCheck checkUnique, - struct IndexInfo *indexInfo); + Datum *values, + bool *isnull, + ItemPointer heap_tid, + Relation heapRelation, + IndexUniqueCheck checkUnique, + struct IndexInfo *indexInfo); /* bulk delete */ typedef IndexBulkDeleteResult *(*ambulkdelete_function) (IndexVacuumInfo *info, @@ -90,45 +90,45 @@ typedef bool (*amcanreturn_function) (Relation indexRelation, int attno); /* estimate cost of an indexscan */ typedef void (*amcostestimate_function) (struct PlannerInfo *root, - struct IndexPath *path, - double loop_count, - Cost *indexStartupCost, - Cost *indexTotalCost, - Selectivity *indexSelectivity, - double *indexCorrelation, - double *indexPages); + struct IndexPath *path, + double loop_count, + Cost *indexStartupCost, + Cost *indexTotalCost, + Selectivity *indexSelectivity, + double *indexCorrelation, + double *indexPages); /* parse index reloptions */ typedef bytea *(*amoptions_function) (Datum reloptions, - bool validate); + bool validate); /* report AM, index, or index column property */ typedef bool (*amproperty_function) (Oid index_oid, int attno, IndexAMProperty prop, const char *propname, - bool *res, bool *isnull); + bool *res, bool *isnull); /* validate definition of an opclass for this AM */ typedef bool (*amvalidate_function) (Oid opclassoid); /* prepare for index scan */ typedef IndexScanDesc (*ambeginscan_function) (Relation indexRelation, - int nkeys, - int norderbys); + int nkeys, + int norderbys); /* (re)start index scan */ typedef void (*amrescan_function) (IndexScanDesc scan, - ScanKey keys, - int nkeys, - ScanKey orderbys, - int norderbys); + ScanKey keys, + int nkeys, + ScanKey orderbys, + int norderbys); /* next valid tuple */ typedef bool (*amgettuple_function) (IndexScanDesc scan, - ScanDirection direction); + ScanDirection direction); /* fetch all valid tuples */ typedef int64 (*amgetbitmap_function) (IndexScanDesc scan, - TIDBitmap *tbm); + TIDBitmap *tbm); /* end index scan */ typedef void (*amendscan_function) (IndexScanDesc scan); diff --git a/src/include/access/gin_private.h b/src/include/access/gin_private.h index 986fe6e041..45616f9c4d 100644 --- a/src/include/access/gin_private.h +++ b/src/include/access/gin_private.h @@ -309,7 +309,7 @@ typedef struct GinScanKeyData bool curItemMatches; bool recheckCurItem; bool isFinished; -} GinScanKeyData; +} GinScanKeyData; typedef struct GinScanEntryData { @@ -342,7 +342,7 @@ typedef struct GinScanEntryData bool reduceResult; uint32 predictNumberResult; GinBtreeData btree; -} GinScanEntryData; +} GinScanEntryData; typedef struct GinScanOpaqueData { diff --git a/src/include/access/ginxlog.h b/src/include/access/ginxlog.h index 8decc42cdb..641ae252fa 100644 --- a/src/include/access/ginxlog.h +++ b/src/include/access/ginxlog.h @@ -87,7 +87,7 @@ typedef struct * added, followed by the items themselves as ItemPointers. DELETE actions * have no further data. */ -} ginxlogSegmentAction; +} ginxlogSegmentAction; /* Action types */ #define GIN_SEGMENT_UNMODIFIED 0 /* no action (not used in WAL records) */ diff --git a/src/include/access/hash.h b/src/include/access/hash.h index 3a210a876b..9e8c44bfd3 100644 --- a/src/include/access/hash.h +++ b/src/include/access/hash.h @@ -213,8 +213,8 @@ 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 - * allocated */ + uint32 hashm_ovflpoint; /* splitpoint from which ovflpgs being + * allocated */ uint32 hashm_firstfree; /* lowest-number free ovflpage (bit#) */ uint32 hashm_nmaps; /* number of bitmap pages */ RegProcedure hashm_procid; /* hash procedure id from pg_proc */ diff --git a/src/include/access/hash_xlog.h b/src/include/access/hash_xlog.h index d4a6a71ca7..b78672f4dc 100644 --- a/src/include/access/hash_xlog.h +++ b/src/include/access/hash_xlog.h @@ -63,7 +63,7 @@ typedef struct xl_hash_createidx double num_tuples; RegProcedure procid; uint16 ffactor; -} xl_hash_createidx; +} xl_hash_createidx; #define SizeOfHashCreateIdx (offsetof(xl_hash_createidx, ffactor) + sizeof(uint16)) /* diff --git a/src/include/access/hio.h b/src/include/access/hio.h index 2824f23218..6dfa8d5891 100644 --- a/src/include/access/hio.h +++ b/src/include/access/hio.h @@ -32,7 +32,7 @@ typedef struct BulkInsertStateData { BufferAccessStrategy strategy; /* our BULKWRITE strategy object */ Buffer current_buf; /* current insertion target page */ -} BulkInsertStateData; +} BulkInsertStateData; extern void RelationPutHeapTuple(Relation relation, Buffer buffer, diff --git a/src/include/access/itup.h b/src/include/access/itup.h index e9ec8e27e2..ecd7c5c208 100644 --- a/src/include/access/itup.h +++ b/src/include/access/itup.h @@ -55,9 +55,9 @@ typedef IndexTupleData *IndexTuple; typedef struct IndexAttributeBitMapData { bits8 bits[(INDEX_MAX_KEYS + 8 - 1) / 8]; -} IndexAttributeBitMapData; +} IndexAttributeBitMapData; -typedef IndexAttributeBitMapData *IndexAttributeBitMap; +typedef IndexAttributeBitMapData * IndexAttributeBitMap; /* * t_info manipulation macros diff --git a/src/include/access/relscan.h b/src/include/access/relscan.h index f4d4f1ee71..5247692d35 100644 --- a/src/include/access/relscan.h +++ b/src/include/access/relscan.h @@ -39,7 +39,7 @@ typedef struct ParallelHeapScanDescData BlockNumber phs_startblock; /* starting block number */ BlockNumber phs_cblock; /* current block number */ char phs_snapshot_data[FLEXIBLE_ARRAY_MEMBER]; -} ParallelHeapScanDescData; +} ParallelHeapScanDescData; typedef struct HeapScanDescData { @@ -75,7 +75,7 @@ typedef struct HeapScanDescData int rs_cindex; /* current tuple's index in vistuples */ int rs_ntuples; /* number of visible tuples on page */ OffsetNumber rs_vistuples[MaxHeapTuplesPerPage]; /* their offsets */ -} HeapScanDescData; +} HeapScanDescData; /* * We use the same IndexScanDescData structure for both amgettuple-based @@ -137,7 +137,7 @@ typedef struct IndexScanDescData /* parallel index scan information, in shared memory */ ParallelIndexScanDesc parallel_scan; -} IndexScanDescData; +} IndexScanDescData; /* Generic structure for parallel scans */ typedef struct ParallelIndexScanDescData @@ -146,7 +146,7 @@ typedef struct ParallelIndexScanDescData Oid ps_indexid; Size ps_offset; /* Offset in bytes of am specific structure */ char ps_snapshot_data[FLEXIBLE_ARRAY_MEMBER]; -} ParallelIndexScanDescData; +} ParallelIndexScanDescData; /* Struct for heap-or-index scans of system tables */ typedef struct SysScanDescData @@ -156,6 +156,6 @@ typedef struct SysScanDescData HeapScanDesc scan; /* only valid in heap-scan case */ IndexScanDesc iscan; /* only valid in index-scan case */ Snapshot snapshot; /* snapshot to unregister at end of scan */ -} SysScanDescData; +} SysScanDescData; #endif /* RELSCAN_H */ diff --git a/src/include/access/slru.h b/src/include/access/slru.h index 722867d5d2..42d0bb72ed 100644 --- a/src/include/access/slru.h +++ b/src/include/access/slru.h @@ -155,7 +155,7 @@ extern void SimpleLruTruncate(SlruCtl ctl, int cutoffPage); extern bool SimpleLruDoesPhysicalPageExist(SlruCtl ctl, int pageno); typedef bool (*SlruScanCallback) (SlruCtl ctl, char *filename, int segpage, - void *data); + void *data); extern bool SlruScanDirectory(SlruCtl ctl, SlruScanCallback callback, void *data); extern void SlruDeleteSegment(SlruCtl ctl, int segno); diff --git a/src/include/access/tsmapi.h b/src/include/access/tsmapi.h index d07b3f25a9..8ba750299f 100644 --- a/src/include/access/tsmapi.h +++ b/src/include/access/tsmapi.h @@ -21,24 +21,24 @@ */ typedef void (*SampleScanGetSampleSize_function) (PlannerInfo *root, - RelOptInfo *baserel, - List *paramexprs, - BlockNumber *pages, - double *tuples); + RelOptInfo *baserel, + List *paramexprs, + BlockNumber *pages, + double *tuples); typedef void (*InitSampleScan_function) (SampleScanState *node, - int eflags); + int eflags); typedef void (*BeginSampleScan_function) (SampleScanState *node, - Datum *params, - int nparams, - uint32 seed); + Datum *params, + int nparams, + uint32 seed); typedef BlockNumber (*NextSampleBlock_function) (SampleScanState *node); typedef OffsetNumber (*NextSampleTuple_function) (SampleScanState *node, - BlockNumber blockno, - OffsetNumber maxoffset); + BlockNumber blockno, + OffsetNumber maxoffset); typedef void (*EndSampleScan_function) (SampleScanState *node); diff --git a/src/include/access/tupdesc.h b/src/include/access/tupdesc.h index b48f839028..0d1e263013 100644 --- a/src/include/access/tupdesc.h +++ b/src/include/access/tupdesc.h @@ -78,7 +78,7 @@ typedef struct tupleDesc int32 tdtypmod; /* typmod for tuple type */ bool tdhasoid; /* tuple has oid attribute in its header */ int tdrefcount; /* reference count, or -1 if not counting */ -} *TupleDesc; +} *TupleDesc; extern TupleDesc CreateTemplateTupleDesc(int natts, bool hasoid); diff --git a/src/include/access/tuptoaster.h b/src/include/access/tuptoaster.h index c7abeed812..6a5880e238 100644 --- a/src/include/access/tuptoaster.h +++ b/src/include/access/tuptoaster.h @@ -152,7 +152,7 @@ extern void toast_delete(Relation rel, HeapTuple oldtup, bool is_speculative); * in compressed format. * ---------- */ -extern struct varlena *heap_tuple_fetch_attr(struct varlena * attr); +extern struct varlena *heap_tuple_fetch_attr(struct varlena *attr); /* ---------- * heap_tuple_untoast_attr() - @@ -161,7 +161,7 @@ extern struct varlena *heap_tuple_fetch_attr(struct varlena * attr); * it as needed. * ---------- */ -extern struct varlena *heap_tuple_untoast_attr(struct varlena * attr); +extern struct varlena *heap_tuple_untoast_attr(struct varlena *attr); /* ---------- * heap_tuple_untoast_attr_slice() - @@ -170,7 +170,7 @@ extern struct varlena *heap_tuple_untoast_attr(struct varlena * attr); * (Handles all cases for attribute storage) * ---------- */ -extern struct varlena *heap_tuple_untoast_attr_slice(struct varlena * attr, +extern struct varlena *heap_tuple_untoast_attr_slice(struct varlena *attr, int32 sliceoffset, int32 slicelength); diff --git a/src/include/access/twophase_rmgr.h b/src/include/access/twophase_rmgr.h index 32b6475dd9..ed2067b7fb 100644 --- a/src/include/access/twophase_rmgr.h +++ b/src/include/access/twophase_rmgr.h @@ -15,7 +15,7 @@ #define TWOPHASE_RMGR_H typedef void (*TwoPhaseCallback) (TransactionId xid, uint16 info, - void *recdata, uint32 len); + void *recdata, uint32 len); typedef uint8 TwoPhaseRmgrId; /* diff --git a/src/include/access/xact.h b/src/include/access/xact.h index 7eb85b72df..50bace80de 100644 --- a/src/include/access/xact.h +++ b/src/include/access/xact.h @@ -63,7 +63,7 @@ typedef enum SYNCHRONOUS_COMMIT_REMOTE_FLUSH, /* wait for local and remote flush */ SYNCHRONOUS_COMMIT_REMOTE_APPLY /* wait for local flush and remote * apply */ -} SyncCommitLevel; +} SyncCommitLevel; /* Define the default setting for synchronous_commit */ #define SYNCHRONOUS_COMMIT_ON SYNCHRONOUS_COMMIT_REMOTE_FLUSH @@ -119,7 +119,7 @@ typedef enum } SubXactEvent; typedef void (*SubXactCallback) (SubXactEvent event, SubTransactionId mySubid, - SubTransactionId parentSubid, void *arg); + SubTransactionId parentSubid, void *arg); /* ---------------- diff --git a/src/include/access/xloginsert.h b/src/include/access/xloginsert.h index d30786fa0d..d0d005a557 100644 --- a/src/include/access/xloginsert.h +++ b/src/include/access/xloginsert.h @@ -32,11 +32,11 @@ #define REGBUF_WILL_INIT (0x04 | 0x02) /* page will be re-initialized * at replay (implies * NO_IMAGE) */ -#define REGBUF_STANDARD 0x08/* page follows "standard" page layout, (data - * between pd_lower and pd_upper will be - * skipped) */ -#define REGBUF_KEEP_DATA 0x10/* include data even if a full-page image is - * taken */ +#define REGBUF_STANDARD 0x08 /* page follows "standard" page layout, + * (data between pd_lower and pd_upper + * will be skipped) */ +#define REGBUF_KEEP_DATA 0x10 /* include data even if a full-page image + * is taken */ /* prototypes for public functions in xloginsert.c: */ extern void XLogBeginInsert(void); diff --git a/src/include/access/xlogreader.h b/src/include/access/xlogreader.h index 956c9bd3a8..51843a2807 100644 --- a/src/include/access/xlogreader.h +++ b/src/include/access/xlogreader.h @@ -31,11 +31,11 @@ typedef struct XLogReaderState XLogReaderState; /* Function type definition for the read_page callback */ typedef int (*XLogPageReadCB) (XLogReaderState *xlogreader, - XLogRecPtr targetPagePtr, - int reqLen, - XLogRecPtr targetRecPtr, - char *readBuf, - TimeLineID *pageTLI); + XLogRecPtr targetPagePtr, + int reqLen, + XLogRecPtr targetRecPtr, + char *readBuf, + TimeLineID *pageTLI); typedef struct { diff --git a/src/include/access/xlogrecord.h b/src/include/access/xlogrecord.h index eeb6a30c1c..1a8dcf2cce 100644 --- a/src/include/access/xlogrecord.h +++ b/src/include/access/xlogrecord.h @@ -146,7 +146,8 @@ typedef struct XLogRecordBlockImageHeader /* Information stored in bimg_info */ #define BKPIMAGE_HAS_HOLE 0x01 /* page image has "hole" */ #define BKPIMAGE_IS_COMPRESSED 0x02 /* page image is compressed */ -#define BKPIMAGE_APPLY 0x04 /* page image should be restored during replay */ +#define BKPIMAGE_APPLY 0x04 /* page image should be restored during + * replay */ /* * Extra header information used when page image has "hole" and @@ -195,7 +196,7 @@ typedef struct XLogRecordDataHeaderShort { uint8 id; /* XLR_BLOCK_ID_DATA_SHORT */ uint8 data_length; /* number of payload bytes */ -} XLogRecordDataHeaderShort; +} XLogRecordDataHeaderShort; #define SizeOfXLogRecordDataHeaderShort (sizeof(uint8) * 2) @@ -203,7 +204,7 @@ typedef struct XLogRecordDataHeaderLong { uint8 id; /* XLR_BLOCK_ID_DATA_LONG */ /* followed by uint32 data_length, unaligned */ -} XLogRecordDataHeaderLong; +} XLogRecordDataHeaderLong; #define SizeOfXLogRecordDataHeaderLong (sizeof(uint8) + sizeof(uint32)) diff --git a/src/include/c.h b/src/include/c.h index 10953b3172..c8e761d277 100644 --- a/src/include/c.h +++ b/src/include/c.h @@ -420,7 +420,7 @@ typedef uint32 CommandId; typedef struct { int indx[MAXDIM]; -} IntArray; +} IntArray; /* ---------------- * Variable-length datatypes all share the 'struct varlena' header. diff --git a/src/include/catalog/index.h b/src/include/catalog/index.h index 20bec90b9d..47c059cae4 100644 --- a/src/include/catalog/index.h +++ b/src/include/catalog/index.h @@ -22,11 +22,11 @@ /* Typedef for callback function for IndexBuildHeapScan */ typedef void (*IndexBuildCallback) (Relation index, - HeapTuple htup, - Datum *values, - bool *isnull, - bool tupleIsAlive, - void *state); + HeapTuple htup, + Datum *values, + bool *isnull, + bool tupleIsAlive, + void *state); /* Action code for index_set_state_flags */ typedef enum diff --git a/src/include/catalog/namespace.h b/src/include/catalog/namespace.h index 5294a52984..9bec5d5685 100644 --- a/src/include/catalog/namespace.h +++ b/src/include/catalog/namespace.h @@ -35,7 +35,7 @@ typedef struct _FuncCandidateList int ndargs; /* number of defaulted args */ int *argnumbers; /* args' positional indexes, if named call */ Oid args[FLEXIBLE_ARRAY_MEMBER]; /* arg types */ -} *FuncCandidateList; +} *FuncCandidateList; /* * Structure for xxxOverrideSearchPath functions @@ -48,7 +48,7 @@ typedef struct OverrideSearchPath } OverrideSearchPath; typedef void (*RangeVarGetRelidCallback) (const RangeVar *relation, Oid relId, - Oid oldRelId, void *callback_arg); + Oid oldRelId, void *callback_arg); #define RangeVarGetRelid(relation, lockmode, missing_ok) \ RangeVarGetRelidExtended(relation, lockmode, missing_ok, false, NULL, NULL) diff --git a/src/include/catalog/objectaccess.h b/src/include/catalog/objectaccess.h index 3a6dd596ce..a53528bba0 100644 --- a/src/include/catalog/objectaccess.h +++ b/src/include/catalog/objectaccess.h @@ -118,10 +118,10 @@ typedef struct /* Plugin provides a hook function matching this signature. */ typedef void (*object_access_hook_type) (ObjectAccessType access, - Oid classId, - Oid objectId, - int subId, - void *arg); + Oid classId, + Oid objectId, + int subId, + void *arg); /* Plugin sets this variable to a suitable hook function. */ extern PGDLLIMPORT object_access_hook_type object_access_hook; diff --git a/src/include/catalog/pg_db_role_setting.h b/src/include/catalog/pg_db_role_setting.h index 311258fd7b..f09b5d7832 100644 --- a/src/include/catalog/pg_db_role_setting.h +++ b/src/include/catalog/pg_db_role_setting.h @@ -42,7 +42,7 @@ CATALOG(pg_db_role_setting,2964) BKI_SHARED_RELATION BKI_WITHOUT_OIDS #endif } FormData_pg_db_role_setting; -typedef FormData_pg_db_role_setting *Form_pg_db_role_setting; +typedef FormData_pg_db_role_setting * Form_pg_db_role_setting; /* ---------------- * compiler constants for pg_db_role_setting diff --git a/src/include/catalog/pg_description.h b/src/include/catalog/pg_description.h index 2f51ac33f3..9e834fca1a 100644 --- a/src/include/catalog/pg_description.h +++ b/src/include/catalog/pg_description.h @@ -52,7 +52,7 @@ CATALOG(pg_description,2609) BKI_WITHOUT_OIDS int32 objsubid; /* column number, or 0 if not used */ #ifdef CATALOG_VARLEN /* variable-length fields start here */ - text description BKI_FORCE_NOT_NULL; /* description of object */ + text description BKI_FORCE_NOT_NULL; /* description of object */ #endif } FormData_pg_description; @@ -61,7 +61,7 @@ CATALOG(pg_description,2609) BKI_WITHOUT_OIDS * the format of pg_description relation. * ---------------- */ -typedef FormData_pg_description *Form_pg_description; +typedef FormData_pg_description * Form_pg_description; /* ---------------- * compiler constants for pg_description diff --git a/src/include/catalog/pg_extension.h b/src/include/catalog/pg_extension.h index 41b087d8b9..56d117a78a 100644 --- a/src/include/catalog/pg_extension.h +++ b/src/include/catalog/pg_extension.h @@ -37,7 +37,7 @@ CATALOG(pg_extension,3079) #ifdef CATALOG_VARLEN /* variable-length fields start here */ /* extversion may never be null, but the others can be. */ - text extversion BKI_FORCE_NOT_NULL; /* extension version name */ + text extversion BKI_FORCE_NOT_NULL; /* extension version name */ Oid extconfig[1]; /* dumpable configuration tables */ text extcondition[1]; /* WHERE clauses for config tables */ #endif diff --git a/src/include/catalog/pg_init_privs.h b/src/include/catalog/pg_init_privs.h index 0d241b8a40..b60c3f961c 100644 --- a/src/include/catalog/pg_init_privs.h +++ b/src/include/catalog/pg_init_privs.h @@ -59,7 +59,7 @@ CATALOG(pg_init_privs,3394) BKI_WITHOUT_OIDS * the format of pg_init_privs relation. * ---------------- */ -typedef FormData_pg_init_privs *Form_pg_init_privs; +typedef FormData_pg_init_privs * Form_pg_init_privs; /* ---------------- * compiler constants for pg_init_privs diff --git a/src/include/catalog/pg_largeobject.h b/src/include/catalog/pg_largeobject.h index 93c8c6af6e..2bdcf96be3 100644 --- a/src/include/catalog/pg_largeobject.h +++ b/src/include/catalog/pg_largeobject.h @@ -34,7 +34,8 @@ CATALOG(pg_largeobject,2613) BKI_WITHOUT_OIDS int32 pageno; /* Page number (starting from 0) */ /* data has variable length, but we allow direct access; see inv_api.c */ - bytea data BKI_FORCE_NOT_NULL; /* Data for page (may be zero-length) */ + bytea data BKI_FORCE_NOT_NULL; /* Data for page (may be + * zero-length) */ } FormData_pg_largeobject; /* ---------------- diff --git a/src/include/catalog/pg_pltemplate.h b/src/include/catalog/pg_pltemplate.h index 6d770fbb3c..236291f28e 100644 --- a/src/include/catalog/pg_pltemplate.h +++ b/src/include/catalog/pg_pltemplate.h @@ -35,11 +35,11 @@ CATALOG(pg_pltemplate,1136) BKI_SHARED_RELATION BKI_WITHOUT_OIDS bool tmpldbacreate; /* PL is installable by db owner? */ #ifdef CATALOG_VARLEN /* variable-length fields start here */ - text tmplhandler BKI_FORCE_NOT_NULL; /* name of call handler + text tmplhandler BKI_FORCE_NOT_NULL; /* name of call handler * function */ text tmplinline; /* name of anonymous-block handler, or NULL */ text tmplvalidator; /* name of validator function, or NULL */ - text tmpllibrary BKI_FORCE_NOT_NULL; /* path of shared library */ + text tmpllibrary BKI_FORCE_NOT_NULL; /* path of shared library */ aclitem tmplacl[1]; /* access privileges for template */ #endif } FormData_pg_pltemplate; diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h index 9c12ea5525..9eb7b377af 100644 --- a/src/include/catalog/pg_proc.h +++ b/src/include/catalog/pg_proc.h @@ -65,10 +65,10 @@ CATALOG(pg_proc,1255) BKI_BOOTSTRAP BKI_ROWTYPE_OID(81) BKI_SCHEMA_MACRO Oid proallargtypes[1]; /* all param types (NULL if IN only) */ char proargmodes[1]; /* parameter modes (NULL if IN only) */ text proargnames[1]; /* parameter names (NULL if no names) */ - pg_node_tree proargdefaults;/* list of expression trees for argument - * defaults (NULL if none) */ + pg_node_tree proargdefaults; /* list of expression trees for argument + * defaults (NULL if none) */ Oid protrftypes[1]; /* types for which to apply transforms */ - text prosrc BKI_FORCE_NOT_NULL; /* procedure source text */ + text prosrc BKI_FORCE_NOT_NULL; /* procedure source text */ text probin; /* secondary procedure info (can be NULL) */ text proconfig[1]; /* procedure-local GUC settings */ aclitem proacl[1]; /* access permissions */ diff --git a/src/include/catalog/pg_replication_origin.h b/src/include/catalog/pg_replication_origin.h index c22831f517..f95725873b 100644 --- a/src/include/catalog/pg_replication_origin.h +++ b/src/include/catalog/pg_replication_origin.h @@ -46,7 +46,7 @@ CATALOG(pg_replication_origin,6000) BKI_SHARED_RELATION BKI_WITHOUT_OIDS */ /* external, free-format, name */ - text roname BKI_FORCE_NOT_NULL; + text roname BKI_FORCE_NOT_NULL; #ifdef CATALOG_VARLEN /* further variable-length fields */ #endif diff --git a/src/include/catalog/pg_seclabel.h b/src/include/catalog/pg_seclabel.h index 01e14e77c0..60eec1d5c8 100644 --- a/src/include/catalog/pg_seclabel.h +++ b/src/include/catalog/pg_seclabel.h @@ -27,8 +27,9 @@ CATALOG(pg_seclabel,3596) BKI_WITHOUT_OIDS int32 objsubid; /* column number, or 0 if not used */ #ifdef CATALOG_VARLEN /* variable-length fields start here */ - text provider BKI_FORCE_NOT_NULL; /* name of label provider */ - text label BKI_FORCE_NOT_NULL; /* security label of the object */ + text provider BKI_FORCE_NOT_NULL; /* name of label provider */ + text label BKI_FORCE_NOT_NULL; /* security label of the + * object */ #endif } FormData_pg_seclabel; diff --git a/src/include/catalog/pg_shdescription.h b/src/include/catalog/pg_shdescription.h index 21086447fa..728b0d2b07 100644 --- a/src/include/catalog/pg_shdescription.h +++ b/src/include/catalog/pg_shdescription.h @@ -44,7 +44,7 @@ CATALOG(pg_shdescription,2396) BKI_SHARED_RELATION BKI_WITHOUT_OIDS Oid classoid; /* OID of table containing object */ #ifdef CATALOG_VARLEN /* variable-length fields start here */ - text description BKI_FORCE_NOT_NULL; /* description of object */ + text description BKI_FORCE_NOT_NULL; /* description of object */ #endif } FormData_pg_shdescription; @@ -53,7 +53,7 @@ CATALOG(pg_shdescription,2396) BKI_SHARED_RELATION BKI_WITHOUT_OIDS * the format of pg_shdescription relation. * ---------------- */ -typedef FormData_pg_shdescription *Form_pg_shdescription; +typedef FormData_pg_shdescription * Form_pg_shdescription; /* ---------------- * compiler constants for pg_shdescription diff --git a/src/include/catalog/pg_shseclabel.h b/src/include/catalog/pg_shseclabel.h index a88f65c169..e559b40935 100644 --- a/src/include/catalog/pg_shseclabel.h +++ b/src/include/catalog/pg_shseclabel.h @@ -27,12 +27,13 @@ CATALOG(pg_shseclabel,3592) BKI_SHARED_RELATION BKI_ROWTYPE_OID(4066) BKI_WITHOU Oid classoid; /* OID of table containing the shared object */ #ifdef CATALOG_VARLEN /* variable-length fields start here */ - text provider BKI_FORCE_NOT_NULL; /* name of label provider */ - text label BKI_FORCE_NOT_NULL; /* security label of the object */ + text provider BKI_FORCE_NOT_NULL; /* name of label provider */ + text label BKI_FORCE_NOT_NULL; /* security label of the + * object */ #endif } FormData_pg_shseclabel; -typedef FormData_pg_shseclabel *Form_pg_shseclabel; +typedef FormData_pg_shseclabel * Form_pg_shseclabel; /* ---------------- * compiler constants for pg_shseclabel diff --git a/src/include/catalog/pg_subscription.h b/src/include/catalog/pg_subscription.h index b2cebd4a4b..75963431a4 100644 --- a/src/include/catalog/pg_subscription.h +++ b/src/include/catalog/pg_subscription.h @@ -42,13 +42,13 @@ CATALOG(pg_subscription,6100) BKI_SHARED_RELATION BKI_ROWTYPE_OID(6101) BKI_SCHE #ifdef CATALOG_VARLEN /* variable-length fields start here */ /* Connection string to the publisher */ - text subconninfo BKI_FORCE_NOT_NULL; + text subconninfo BKI_FORCE_NOT_NULL; /* Slot name on publisher */ NameData subslotname; /* Synchronous commit setting for worker */ - text subsynccommit BKI_FORCE_NOT_NULL; + text subsynccommit BKI_FORCE_NOT_NULL; /* List of publications subscribed to */ text subpublications[1] BKI_FORCE_NOT_NULL; diff --git a/src/include/catalog/pg_trigger.h b/src/include/catalog/pg_trigger.h index 547332fe65..356bc48bf6 100644 --- a/src/include/catalog/pg_trigger.h +++ b/src/include/catalog/pg_trigger.h @@ -57,7 +57,7 @@ CATALOG(pg_trigger,2620) int2vector tgattr; /* column numbers, if trigger is on columns */ #ifdef CATALOG_VARLEN - bytea tgargs BKI_FORCE_NOT_NULL; /* first\000second\000tgnargs\000 */ + bytea tgargs BKI_FORCE_NOT_NULL; /* first\000second\000tgnargs\000 */ pg_node_tree tgqual; /* WHEN expression, or NULL if none */ NameData tgoldtable; /* old transition table, or NULL if none */ NameData tgnewtable; /* new transition table, or NULL if none */ diff --git a/src/include/commands/explain.h b/src/include/commands/explain.h index e2a0ee0d8c..358bfd8482 100644 --- a/src/include/commands/explain.h +++ b/src/include/commands/explain.h @@ -49,11 +49,11 @@ typedef struct ExplainState /* Hook for plugins to get control in ExplainOneQuery() */ typedef void (*ExplainOneQuery_hook_type) (Query *query, - int cursorOptions, - IntoClause *into, - ExplainState *es, - const char *queryString, - ParamListInfo params); + int cursorOptions, + IntoClause *into, + ExplainState *es, + const char *queryString, + ParamListInfo params); extern PGDLLIMPORT ExplainOneQuery_hook_type ExplainOneQuery_hook; /* Hook for plugins to get control in explain_get_index_name() */ diff --git a/src/include/commands/seclabel.h b/src/include/commands/seclabel.h index d317f39485..2e24801fc1 100644 --- a/src/include/commands/seclabel.h +++ b/src/include/commands/seclabel.h @@ -27,7 +27,7 @@ extern void DeleteSharedSecurityLabel(Oid objectId, Oid classId); extern ObjectAddress ExecSecLabelStmt(SecLabelStmt *stmt); typedef void (*check_object_relabel_type) (const ObjectAddress *object, - const char *seclabel); + const char *seclabel); extern void register_label_provider(const char *provider, check_object_relabel_type hook); diff --git a/src/include/commands/vacuum.h b/src/include/commands/vacuum.h index 541c2fa3cf..0fa585b091 100644 --- a/src/include/commands/vacuum.h +++ b/src/include/commands/vacuum.h @@ -59,12 +59,12 @@ typedef struct VacAttrStats *VacAttrStatsP; typedef Datum (*AnalyzeAttrFetchFunc) (VacAttrStatsP stats, int rownum, - bool *isNull); + bool *isNull); typedef void (*AnalyzeAttrComputeStatsFunc) (VacAttrStatsP stats, - AnalyzeAttrFetchFunc fetchfunc, - int samplerows, - double totalrows); + AnalyzeAttrFetchFunc fetchfunc, + int samplerows, + double totalrows); typedef struct VacAttrStats { diff --git a/src/include/common/int128.h b/src/include/common/int128.h index 4c46e26f40..046f5b4903 100644 --- a/src/include/common/int128.h +++ b/src/include/common/int128.h @@ -61,7 +61,7 @@ int128_add_int64(INT128 *i128, int64 v) static inline void int128_add_int64_mul_int64(INT128 *i128, int64 x, int64 y) { - *i128 += (int128) x *(int128) y; + *i128 += (int128) x * (int128) y; } /* diff --git a/src/include/common/ip.h b/src/include/common/ip.h index 815e6ccad3..41d1be86ad 100644 --- a/src/include/common/ip.h +++ b/src/include/common/ip.h @@ -25,11 +25,11 @@ #endif extern int pg_getaddrinfo_all(const char *hostname, const char *servname, - const struct addrinfo * hintp, - struct addrinfo ** result); -extern void pg_freeaddrinfo_all(int hint_ai_family, struct addrinfo * ai); + const struct addrinfo *hintp, + struct addrinfo **result); +extern void pg_freeaddrinfo_all(int hint_ai_family, struct addrinfo *ai); -extern int pg_getnameinfo_all(const struct sockaddr_storage * addr, int salen, +extern int pg_getnameinfo_all(const struct sockaddr_storage *addr, int salen, char *node, int nodelen, char *service, int servicelen, int flags); diff --git a/src/include/common/unicode_norm_table.h b/src/include/common/unicode_norm_table.h index 3bcf05e5ee..095481ab7f 100644 --- a/src/include/common/unicode_norm_table.h +++ b/src/include/common/unicode_norm_table.h @@ -26,7 +26,8 @@ typedef struct } pg_unicode_decomposition; #define DECOMP_NO_COMPOSE 0x80 /* don't use for re-composition */ -#define DECOMP_INLINE 0x40 /* decomposition is stored inline in dec_index */ +#define DECOMP_INLINE 0x40 /* decomposition is stored inline in + * dec_index */ #define DECOMPOSITION_SIZE(x) ((x)->dec_size_flags & 0x3F) #define DECOMPOSITION_NO_COMPOSE(x) (((x)->dec_size_flags & DECOMP_NO_COMPOSE) != 0) diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h index 8cc5f3a413..6544be9602 100644 --- a/src/include/executor/executor.h +++ b/src/include/executor/executor.h @@ -71,9 +71,9 @@ extern PGDLLIMPORT ExecutorStart_hook_type ExecutorStart_hook; /* Hook for plugins to get control in ExecutorRun() */ typedef void (*ExecutorRun_hook_type) (QueryDesc *queryDesc, - ScanDirection direction, - uint64 count, - bool execute_once); + ScanDirection direction, + uint64 count, + bool execute_once); extern PGDLLIMPORT ExecutorRun_hook_type ExecutorRun_hook; /* Hook for plugins to get control in ExecutorFinish() */ diff --git a/src/include/executor/hashjoin.h b/src/include/executor/hashjoin.h index ac840533ee..addcd09049 100644 --- a/src/include/executor/hashjoin.h +++ b/src/include/executor/hashjoin.h @@ -66,7 +66,7 @@ typedef struct HashJoinTupleData struct HashJoinTupleData *next; /* link to next tuple in same bucket */ uint32 hashvalue; /* tuple's hash code */ /* Tuple data, in MinimalTuple format, follows on a MAXALIGN boundary */ -} HashJoinTupleData; +} HashJoinTupleData; #define HJTUPLE_OVERHEAD MAXALIGN(sizeof(HashJoinTupleData)) #define HJTUPLE_MINTUPLE(hjtup) \ @@ -116,7 +116,7 @@ typedef struct HashMemoryChunkData * list) */ char data[FLEXIBLE_ARRAY_MEMBER]; /* buffer allocated at the end */ -} HashMemoryChunkData; +} HashMemoryChunkData; typedef struct HashMemoryChunkData *HashMemoryChunk; @@ -186,6 +186,6 @@ typedef struct HashJoinTableData /* used for dense allocation of tuples (into linked chunks) */ HashMemoryChunk chunks; /* one list for the whole batch */ -} HashJoinTableData; +} HashJoinTableData; #endif /* HASHJOIN_H */ diff --git a/src/include/executor/tablefunc.h b/src/include/executor/tablefunc.h index 22ca916eb2..9c7b4808a8 100644 --- a/src/include/executor/tablefunc.h +++ b/src/include/executor/tablefunc.h @@ -54,13 +54,13 @@ typedef struct TableFuncRoutine void (*InitOpaque) (struct TableFuncScanState *state, int natts); void (*SetDocument) (struct TableFuncScanState *state, Datum value); void (*SetNamespace) (struct TableFuncScanState *state, char *name, - char *uri); + char *uri); void (*SetRowFilter) (struct TableFuncScanState *state, char *path); void (*SetColumnFilter) (struct TableFuncScanState *state, - char *path, int colnum); + char *path, int colnum); bool (*FetchRow) (struct TableFuncScanState *state); Datum (*GetValue) (struct TableFuncScanState *state, int colnum, - Oid typid, int32 typmod, bool *isnull); + Oid typid, int32 typmod, bool *isnull); void (*DestroyOpaque) (struct TableFuncScanState *state); } TableFuncRoutine; diff --git a/src/include/fe_utils/mbprint.h b/src/include/fe_utils/mbprint.h index 56626f631b..b5145726c5 100644 --- a/src/include/fe_utils/mbprint.h +++ b/src/include/fe_utils/mbprint.h @@ -22,7 +22,7 @@ struct lineptr extern unsigned char *mbvalidate(unsigned char *pwcs, int encoding); extern int pg_wcswidth(const char *pwcs, size_t len, int encoding); extern void pg_wcsformat(const unsigned char *pwcs, size_t len, int encoding, - struct lineptr * lines, int count); + struct lineptr *lines, int count); extern void pg_wcssize(const unsigned char *pwcs, size_t len, int encoding, int *width, int *height, int *format_size); diff --git a/src/include/fe_utils/print.h b/src/include/fe_utils/print.h index d89b6febcb..ce4d86ec54 100644 --- a/src/include/fe_utils/print.h +++ b/src/include/fe_utils/print.h @@ -96,14 +96,14 @@ struct separator typedef struct printTableOpt { enum printFormat format; /* see enum above */ - unsigned short int expanded;/* expanded/vertical output (if supported by - * output format); 0=no, 1=yes, 2=auto */ + unsigned short int expanded; /* expanded/vertical output (if supported + * by output format); 0=no, 1=yes, 2=auto */ unsigned short int border; /* Print a border around the table. 0=none, * 1=dividing lines, 2=full */ unsigned short int pager; /* use pager for output (if to stdout and * stdout is a tty) 0=off 1=on 2=always */ - int pager_min_lines;/* don't use pager unless there are at least - * this many lines */ + int pager_min_lines; /* don't use pager unless there are at + * least this many lines */ bool tuples_only; /* don't output headers, row counts, etc. */ bool start_table; /* print start decoration, eg <table> */ bool stop_table; /* print stop decoration, eg </table> */ diff --git a/src/include/fe_utils/psqlscan.h b/src/include/fe_utils/psqlscan.h index e9c8143925..1eadf0b9c3 100644 --- a/src/include/fe_utils/psqlscan.h +++ b/src/include/fe_utils/psqlscan.h @@ -63,7 +63,7 @@ typedef struct PsqlScanCallbacks /* Fetch value of a variable, as a free'able string; NULL if unknown */ /* This pointer can be NULL if no variable substitution is wanted */ char *(*get_variable) (const char *varname, PsqlScanQuoteType quote, - void *passthrough); + void *passthrough); /* Print an error message someplace appropriate */ /* (very old gcc versions don't support attributes on function pointers) */ #if defined(__GNUC__) && __GNUC__ < 4 diff --git a/src/include/fmgr.h b/src/include/fmgr.h index cfb7b7774d..45e09c8c53 100644 --- a/src/include/fmgr.h +++ b/src/include/fmgr.h @@ -196,11 +196,11 @@ extern void fmgr_info_copy(FmgrInfo *dstinfo, FmgrInfo *srcinfo, * Note: it'd be nice if these could be macros, but I see no way to do that * without evaluating the arguments multiple times, which is NOT acceptable. */ -extern struct varlena *pg_detoast_datum(struct varlena * datum); -extern struct varlena *pg_detoast_datum_copy(struct varlena * datum); -extern struct varlena *pg_detoast_datum_slice(struct varlena * datum, +extern struct varlena *pg_detoast_datum(struct varlena *datum); +extern struct varlena *pg_detoast_datum_copy(struct varlena *datum); +extern struct varlena *pg_detoast_datum_slice(struct varlena *datum, int32 first, int32 count); -extern struct varlena *pg_detoast_datum_packed(struct varlena * datum); +extern struct varlena *pg_detoast_datum_packed(struct varlena *datum); #define PG_DETOAST_DATUM(datum) \ pg_detoast_datum((struct varlena *) DatumGetPointer(datum)) @@ -720,7 +720,7 @@ typedef enum FmgrHookEventType typedef bool (*needs_fmgr_hook_type) (Oid fn_oid); typedef void (*fmgr_hook_type) (FmgrHookEventType event, - FmgrInfo *flinfo, Datum *arg); + FmgrInfo *flinfo, Datum *arg); extern PGDLLIMPORT needs_fmgr_hook_type needs_fmgr_hook; extern PGDLLIMPORT fmgr_hook_type fmgr_hook; diff --git a/src/include/foreign/fdwapi.h b/src/include/foreign/fdwapi.h index 6ca44f734f..2ed7049a14 100644 --- a/src/include/foreign/fdwapi.h +++ b/src/include/foreign/fdwapi.h @@ -25,87 +25,87 @@ struct ExplainState; */ typedef void (*GetForeignRelSize_function) (PlannerInfo *root, - RelOptInfo *baserel, - Oid foreigntableid); + RelOptInfo *baserel, + Oid foreigntableid); typedef void (*GetForeignPaths_function) (PlannerInfo *root, - RelOptInfo *baserel, - Oid foreigntableid); + RelOptInfo *baserel, + Oid foreigntableid); typedef ForeignScan *(*GetForeignPlan_function) (PlannerInfo *root, - RelOptInfo *baserel, - Oid foreigntableid, - ForeignPath *best_path, - List *tlist, - List *scan_clauses, - Plan *outer_plan); + RelOptInfo *baserel, + Oid foreigntableid, + ForeignPath *best_path, + List *tlist, + List *scan_clauses, + Plan *outer_plan); typedef void (*BeginForeignScan_function) (ForeignScanState *node, - int eflags); + int eflags); typedef TupleTableSlot *(*IterateForeignScan_function) (ForeignScanState *node); typedef bool (*RecheckForeignScan_function) (ForeignScanState *node, - TupleTableSlot *slot); + TupleTableSlot *slot); typedef void (*ReScanForeignScan_function) (ForeignScanState *node); typedef void (*EndForeignScan_function) (ForeignScanState *node); typedef void (*GetForeignJoinPaths_function) (PlannerInfo *root, - RelOptInfo *joinrel, - RelOptInfo *outerrel, - RelOptInfo *innerrel, - JoinType jointype, - JoinPathExtraData *extra); + RelOptInfo *joinrel, + RelOptInfo *outerrel, + RelOptInfo *innerrel, + JoinType jointype, + JoinPathExtraData *extra); typedef void (*GetForeignUpperPaths_function) (PlannerInfo *root, - UpperRelationKind stage, - RelOptInfo *input_rel, - RelOptInfo *output_rel); + UpperRelationKind stage, + RelOptInfo *input_rel, + RelOptInfo *output_rel); typedef void (*AddForeignUpdateTargets_function) (Query *parsetree, - RangeTblEntry *target_rte, - Relation target_relation); + RangeTblEntry *target_rte, + Relation target_relation); typedef List *(*PlanForeignModify_function) (PlannerInfo *root, - ModifyTable *plan, - Index resultRelation, - int subplan_index); + ModifyTable *plan, + Index resultRelation, + int subplan_index); typedef void (*BeginForeignModify_function) (ModifyTableState *mtstate, - ResultRelInfo *rinfo, - List *fdw_private, - int subplan_index, - int eflags); + ResultRelInfo *rinfo, + List *fdw_private, + int subplan_index, + int eflags); typedef TupleTableSlot *(*ExecForeignInsert_function) (EState *estate, - ResultRelInfo *rinfo, - TupleTableSlot *slot, + ResultRelInfo *rinfo, + TupleTableSlot *slot, TupleTableSlot *planSlot); typedef TupleTableSlot *(*ExecForeignUpdate_function) (EState *estate, - ResultRelInfo *rinfo, - TupleTableSlot *slot, + ResultRelInfo *rinfo, + TupleTableSlot *slot, TupleTableSlot *planSlot); typedef TupleTableSlot *(*ExecForeignDelete_function) (EState *estate, - ResultRelInfo *rinfo, - TupleTableSlot *slot, + ResultRelInfo *rinfo, + TupleTableSlot *slot, TupleTableSlot *planSlot); typedef void (*EndForeignModify_function) (EState *estate, - ResultRelInfo *rinfo); + ResultRelInfo *rinfo); typedef int (*IsForeignRelUpdatable_function) (Relation rel); typedef bool (*PlanDirectModify_function) (PlannerInfo *root, - ModifyTable *plan, - Index resultRelation, - int subplan_index); + ModifyTable *plan, + Index resultRelation, + int subplan_index); typedef void (*BeginDirectModify_function) (ForeignScanState *node, - int eflags); + int eflags); typedef TupleTableSlot *(*IterateDirectModify_function) (ForeignScanState *node); @@ -115,46 +115,46 @@ typedef RowMarkType (*GetForeignRowMarkType_function) (RangeTblEntry *rte, LockClauseStrength strength); typedef HeapTuple (*RefetchForeignRow_function) (EState *estate, - ExecRowMark *erm, - Datum rowid, - bool *updated); + ExecRowMark *erm, + Datum rowid, + bool *updated); typedef void (*ExplainForeignScan_function) (ForeignScanState *node, - struct ExplainState *es); + struct ExplainState *es); typedef void (*ExplainForeignModify_function) (ModifyTableState *mtstate, - ResultRelInfo *rinfo, - List *fdw_private, - int subplan_index, - struct ExplainState *es); + ResultRelInfo *rinfo, + List *fdw_private, + int subplan_index, + struct ExplainState *es); typedef void (*ExplainDirectModify_function) (ForeignScanState *node, - struct ExplainState *es); + struct ExplainState *es); typedef int (*AcquireSampleRowsFunc) (Relation relation, int elevel, - HeapTuple *rows, int targrows, - double *totalrows, - double *totaldeadrows); + HeapTuple *rows, int targrows, + double *totalrows, + double *totaldeadrows); typedef bool (*AnalyzeForeignTable_function) (Relation relation, - AcquireSampleRowsFunc *func, - BlockNumber *totalpages); + AcquireSampleRowsFunc *func, + BlockNumber *totalpages); typedef List *(*ImportForeignSchema_function) (ImportForeignSchemaStmt *stmt, - Oid serverOid); + Oid serverOid); typedef Size (*EstimateDSMForeignScan_function) (ForeignScanState *node, - ParallelContext *pcxt); + ParallelContext *pcxt); typedef void (*InitializeDSMForeignScan_function) (ForeignScanState *node, - ParallelContext *pcxt, - void *coordinate); + ParallelContext *pcxt, + void *coordinate); typedef void (*InitializeWorkerForeignScan_function) (ForeignScanState *node, - shm_toc *toc, - void *coordinate); + shm_toc *toc, + void *coordinate); typedef void (*ShutdownForeignScan_function) (ForeignScanState *node); typedef bool (*IsForeignScanParallelSafe_function) (PlannerInfo *root, - RelOptInfo *rel, - RangeTblEntry *rte); + RelOptInfo *rel, + RangeTblEntry *rte); /* * FdwRoutine is the struct returned by a foreign-data wrapper's handler diff --git a/src/include/getaddrinfo.h b/src/include/getaddrinfo.h index c5595142a5..e91128a339 100644 --- a/src/include/getaddrinfo.h +++ b/src/include/getaddrinfo.h @@ -151,10 +151,10 @@ struct addrinfo #define getnameinfo pg_getnameinfo extern int getaddrinfo(const char *node, const char *service, - const struct addrinfo * hints, struct addrinfo ** res); -extern void freeaddrinfo(struct addrinfo * res); + const struct addrinfo *hints, struct addrinfo **res); +extern void freeaddrinfo(struct addrinfo *res); extern const char *gai_strerror(int errcode); -extern int getnameinfo(const struct sockaddr * sa, int salen, +extern int getnameinfo(const struct sockaddr *sa, int salen, char *node, int nodelen, char *service, int servicelen, int flags); #endif /* HAVE_GETADDRINFO */ diff --git a/src/include/getopt_long.h b/src/include/getopt_long.h index a16c5f9b14..00692bb616 100644 --- a/src/include/getopt_long.h +++ b/src/include/getopt_long.h @@ -30,7 +30,7 @@ struct option extern int getopt_long(int argc, char *const argv[], const char *optstring, - const struct option * longopts, int *longindex); + const struct option *longopts, int *longindex); #endif #endif /* GETOPT_LONG_H */ diff --git a/src/include/lib/pairingheap.h b/src/include/lib/pairingheap.h index 9ee90befe5..0b03a24fa1 100644 --- a/src/include/lib/pairingheap.h +++ b/src/include/lib/pairingheap.h @@ -58,8 +58,8 @@ typedef struct pairingheap_node * and >0 iff a > b. For a min-heap, the conditions are reversed. */ typedef int (*pairingheap_comparator) (const pairingheap_node *a, - const pairingheap_node *b, - void *arg); + const pairingheap_node *b, + void *arg); /* * A pairing heap. diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index 56b261d8ea..061d9c373f 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -121,7 +121,7 @@ typedef struct SH_TYPE /* user defined data, useful for callbacks */ void *private_data; -} SH_TYPE; +} SH_TYPE; typedef enum SH_STATUS { @@ -134,19 +134,19 @@ typedef struct SH_ITERATOR uint32 cur; /* current element */ uint32 end; bool done; /* iterator exhausted? */ -} SH_ITERATOR; +} SH_ITERATOR; /* externally visible function prototypes */ -SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, +SH_SCOPE SH_TYPE *SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data); SH_SCOPE void SH_DESTROY(SH_TYPE * tb); SH_SCOPE void SH_GROW(SH_TYPE * tb, uint32 newsize); -SH_SCOPE SH_ELEMENT_TYPE *SH_INSERT(SH_TYPE * tb, SH_KEY_TYPE key, bool *found); -SH_SCOPE SH_ELEMENT_TYPE *SH_LOOKUP(SH_TYPE * tb, SH_KEY_TYPE key); +SH_SCOPE SH_ELEMENT_TYPE *SH_INSERT(SH_TYPE * tb, SH_KEY_TYPE key, bool *found); +SH_SCOPE SH_ELEMENT_TYPE *SH_LOOKUP(SH_TYPE * tb, SH_KEY_TYPE key); SH_SCOPE bool SH_DELETE(SH_TYPE * tb, SH_KEY_TYPE key); SH_SCOPE void SH_START_ITERATE(SH_TYPE * tb, SH_ITERATOR * iter); SH_SCOPE void SH_START_ITERATE_AT(SH_TYPE * tb, SH_ITERATOR * iter, uint32 at); -SH_SCOPE SH_ELEMENT_TYPE *SH_ITERATE(SH_TYPE * tb, SH_ITERATOR * iter); +SH_SCOPE SH_ELEMENT_TYPE *SH_ITERATE(SH_TYPE * tb, SH_ITERATOR * iter); SH_SCOPE void SH_STAT(SH_TYPE * tb); #endif /* SH_DECLARE */ @@ -324,7 +324,7 @@ SH_FREE(SH_TYPE * type, void *pointer) * Memory other than for the array of elements will still be allocated from * the passed-in context. */ -SH_SCOPE SH_TYPE * +SH_SCOPE SH_TYPE * SH_CREATE(MemoryContext ctx, uint32 nelements, void *private_data) { SH_TYPE *tb; @@ -470,7 +470,7 @@ SH_GROW(SH_TYPE * tb, uint32 newsize) * already exists, false otherwise. Returns the hash-table entry in either * case. */ -SH_SCOPE SH_ELEMENT_TYPE * +SH_SCOPE SH_ELEMENT_TYPE * SH_INSERT(SH_TYPE * tb, SH_KEY_TYPE key, bool *found) { uint32 hash = SH_HASH_KEY(tb, key); @@ -634,7 +634,7 @@ restart: /* * Lookup up entry in hash table. Returns NULL if key not present. */ -SH_SCOPE SH_ELEMENT_TYPE * +SH_SCOPE SH_ELEMENT_TYPE * SH_LOOKUP(SH_TYPE * tb, SH_KEY_TYPE key) { uint32 hash = SH_HASH_KEY(tb, key); @@ -803,7 +803,7 @@ SH_START_ITERATE_AT(SH_TYPE * tb, SH_ITERATOR * iter, uint32 at) * deletions), but if so, there's neither a guarantee that all nodes are * visited at least once, nor a guarantee that a node is visited at most once. */ -SH_SCOPE SH_ELEMENT_TYPE * +SH_SCOPE SH_ELEMENT_TYPE * SH_ITERATE(SH_TYPE * tb, SH_ITERATOR * iter) { while (!iter->done) diff --git a/src/include/libpq/ifaddr.h b/src/include/libpq/ifaddr.h index 5f6f48598f..f11bb4a073 100644 --- a/src/include/libpq/ifaddr.h +++ b/src/include/libpq/ifaddr.h @@ -14,15 +14,15 @@ #include "libpq/pqcomm.h" /* pgrminclude ignore */ -typedef void (*PgIfAddrCallback) (struct sockaddr * addr, - struct sockaddr * netmask, - void *cb_data); +typedef void (*PgIfAddrCallback) (struct sockaddr *addr, + struct sockaddr *netmask, + void *cb_data); -extern int pg_range_sockaddr(const struct sockaddr_storage * addr, - const struct sockaddr_storage * netaddr, - const struct sockaddr_storage * netmask); +extern int pg_range_sockaddr(const struct sockaddr_storage *addr, + const struct sockaddr_storage *netaddr, + const struct sockaddr_storage *netmask); -extern int pg_sockaddr_cidr_mask(struct sockaddr_storage * mask, +extern int pg_sockaddr_cidr_mask(struct sockaddr_storage *mask, char *numbits, int family); extern int pg_foreach_ifaddr(PgIfAddrCallback callback, void *cb_data); diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h index 0669b924cf..5774a6df3f 100644 --- a/src/include/libpq/libpq-be.h +++ b/src/include/libpq/libpq-be.h @@ -121,8 +121,8 @@ typedef struct Port SockAddr laddr; /* local addr (postmaster) */ SockAddr raddr; /* remote addr (client) */ char *remote_host; /* name (or ip addr) of remote host */ - char *remote_hostname;/* name (not ip addr) of remote host, if - * available */ + char *remote_hostname; /* name (not ip addr) of remote host, if + * available */ int remote_hostname_resolv; /* see above */ int remote_hostname_errcode; /* see above */ char *remote_port; /* text rep of remote port */ diff --git a/src/include/mb/pg_wchar.h b/src/include/mb/pg_wchar.h index 737ab1c713..33f2c3018e 100644 --- a/src/include/mb/pg_wchar.h +++ b/src/include/mb/pg_wchar.h @@ -133,10 +133,12 @@ typedef unsigned int pg_wchar; #define LC_JISX0212 0x94 /* Japanese Kanji (JIS X 0212) */ #define LC_CNS11643_1 0x95 /* CNS 11643-1992 Plane 1 */ #define LC_CNS11643_2 0x96 /* CNS 11643-1992 Plane 2 */ -#define LC_JISX0213_1 0x97/* Japanese Kanji (JIS X 0213 Plane 1) (not - * supported) */ -#define LC_BIG5_1 0x98 /* Plane 1 Chinese traditional (not supported) */ -#define LC_BIG5_2 0x99 /* Plane 1 Chinese traditional (not supported) */ +#define LC_JISX0213_1 0x97 /* Japanese Kanji (JIS X 0213 Plane 1) + * (not supported) */ +#define LC_BIG5_1 0x98 /* Plane 1 Chinese traditional (not + * supported) */ +#define LC_BIG5_2 0x99 /* Plane 1 Chinese traditional (not + * supported) */ /* Is a leading byte for "official" multibyte encodings? */ #define IS_LC2(c) ((unsigned char)(c) >= 0x90 && (unsigned char)(c) <= 0x99) @@ -168,44 +170,44 @@ typedef unsigned int pg_wchar; /* * Charset IDs for private single byte encodings (0xa0-0xef) */ -#define LC_SISHENG 0xa0/* Chinese SiSheng characters for - * PinYin/ZhuYin (not supported) */ -#define LC_IPA 0xa1/* IPA (International Phonetic Association) - * (not supported) */ -#define LC_VISCII_LOWER 0xa2/* Vietnamese VISCII1.1 lower-case (not - * supported) */ -#define LC_VISCII_UPPER 0xa3/* Vietnamese VISCII1.1 upper-case (not - * supported) */ +#define LC_SISHENG 0xa0 /* Chinese SiSheng characters for + * PinYin/ZhuYin (not supported) */ +#define LC_IPA 0xa1 /* IPA (International Phonetic + * Association) (not supported) */ +#define LC_VISCII_LOWER 0xa2 /* Vietnamese VISCII1.1 lower-case (not + * supported) */ +#define LC_VISCII_UPPER 0xa3 /* Vietnamese VISCII1.1 upper-case (not + * supported) */ #define LC_ARABIC_DIGIT 0xa4 /* Arabic digit (not supported) */ #define LC_ARABIC_1_COLUMN 0xa5 /* Arabic 1-column (not supported) */ #define LC_ASCII_RIGHT_TO_LEFT 0xa6 /* ASCII (left half of ISO8859-1) with * right-to-left direction (not * supported) */ -#define LC_LAO 0xa7/* Lao characters (ISO10646 0E80..0EDF) (not - * supported) */ +#define LC_LAO 0xa7 /* Lao characters (ISO10646 0E80..0EDF) + * (not supported) */ #define LC_ARABIC_2_COLUMN 0xa8 /* Arabic 1-column (not supported) */ /* * Charset IDs for private multibyte encodings (0xf0-0xff) */ -#define LC_INDIAN_1_COLUMN 0xf0/* Indian charset for 1-column width glyphs - * (not supported) */ -#define LC_TIBETAN_1_COLUMN 0xf1/* Tibetan 1-column width glyphs (not - * supported) */ -#define LC_UNICODE_SUBSET_2 0xf2/* Unicode characters of the range - * U+2500..U+33FF. (not supported) */ -#define LC_UNICODE_SUBSET_3 0xf3/* Unicode characters of the range - * U+E000..U+FFFF. (not supported) */ -#define LC_UNICODE_SUBSET 0xf4/* Unicode characters of the range - * U+0100..U+24FF. (not supported) */ +#define LC_INDIAN_1_COLUMN 0xf0 /* Indian charset for 1-column width + * glyphs (not supported) */ +#define LC_TIBETAN_1_COLUMN 0xf1 /* Tibetan 1-column width glyphs (not + * supported) */ +#define LC_UNICODE_SUBSET_2 0xf2 /* Unicode characters of the range + * U+2500..U+33FF. (not supported) */ +#define LC_UNICODE_SUBSET_3 0xf3 /* Unicode characters of the range + * U+E000..U+FFFF. (not supported) */ +#define LC_UNICODE_SUBSET 0xf4 /* Unicode characters of the range + * U+0100..U+24FF. (not supported) */ #define LC_ETHIOPIC 0xf5 /* Ethiopic characters (not supported) */ #define LC_CNS11643_3 0xf6 /* CNS 11643-1992 Plane 3 */ #define LC_CNS11643_4 0xf7 /* CNS 11643-1992 Plane 4 */ #define LC_CNS11643_5 0xf8 /* CNS 11643-1992 Plane 5 */ #define LC_CNS11643_6 0xf9 /* CNS 11643-1992 Plane 6 */ #define LC_CNS11643_7 0xfa /* CNS 11643-1992 Plane 7 */ -#define LC_INDIAN_2_COLUMN 0xfb/* Indian charset for 2-column width glyphs - * (not supported) */ +#define LC_INDIAN_2_COLUMN 0xfb /* Indian charset for 2-column width + * glyphs (not supported) */ #define LC_TIBETAN 0xfc /* Tibetan (not supported) */ /* #define FREE 0xfd free (unused) */ /* #define FREE 0xfe free (unused) */ @@ -342,12 +344,12 @@ extern const char *get_encoding_name_for_icu(int encoding); * pg_wchar stuff */ typedef int (*mb2wchar_with_len_converter) (const unsigned char *from, - pg_wchar *to, - int len); + pg_wchar *to, + int len); typedef int (*wchar2mb_with_len_converter) (const pg_wchar *from, - unsigned char *to, - int len); + unsigned char *to, + int len); typedef int (*mblen_converter) (const unsigned char *mbstr); diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h index 9c0852853a..7cb3fc922c 100644 --- a/src/include/nodes/execnodes.h +++ b/src/include/nodes/execnodes.h @@ -43,8 +43,8 @@ struct ExprContext; struct ExprEvalStep; /* avoid including execExpr.h everywhere */ typedef Datum (*ExprStateEvalFunc) (struct ExprState *expression, - struct ExprContext *econtext, - bool *isNull); + struct ExprContext *econtext, + bool *isNull); /* Bits in ExprState->flags (see also execExpr.h for private flag bits): */ /* expression is for use with ExecQual() */ @@ -593,7 +593,7 @@ typedef struct TupleHashTableData FmgrInfo *in_hash_funcs; /* hash functions for input datatype(s) */ FmgrInfo *cur_eq_funcs; /* equality functions for input vs. table */ uint32 hash_iv; /* hash-function IV */ -} TupleHashTableData; +} TupleHashTableData; typedef tuplehash_iterator TupleHashIterator; @@ -1831,12 +1831,12 @@ typedef struct WindowAggState bool partition_spooled; /* true if all tuples in current * partition have been spooled into * tuplestore */ - bool more_partitions;/* true if there's more partitions after this - * one */ - bool framehead_valid;/* true if frameheadpos is known up to date - * for current row */ - bool frametail_valid;/* true if frametailpos is known up to date - * for current row */ + bool more_partitions; /* true if there's more partitions after + * this one */ + bool framehead_valid; /* true if frameheadpos is known up to + * date for current row */ + bool frametail_valid; /* true if frametailpos is known up to + * date for current row */ TupleTableSlot *first_part_slot; /* first tuple of current or next * partition */ diff --git a/src/include/nodes/extensible.h b/src/include/nodes/extensible.h index 0b02cc18e9..6ba7ad27a2 100644 --- a/src/include/nodes/extensible.h +++ b/src/include/nodes/extensible.h @@ -62,11 +62,11 @@ typedef struct ExtensibleNodeMethods const char *extnodename; Size node_size; void (*nodeCopy) (struct ExtensibleNode *newnode, - const struct ExtensibleNode *oldnode); + const struct ExtensibleNode *oldnode); bool (*nodeEqual) (const struct ExtensibleNode *a, - const struct ExtensibleNode *b); + const struct ExtensibleNode *b); void (*nodeOut) (struct StringInfoData *str, - const struct ExtensibleNode *node); + const struct ExtensibleNode *node); void (*nodeRead) (struct ExtensibleNode *node); } ExtensibleNodeMethods; @@ -91,12 +91,12 @@ typedef struct CustomPathMethods /* Convert Path to a Plan */ struct Plan *(*PlanCustomPath) (PlannerInfo *root, - RelOptInfo *rel, - struct CustomPath *best_path, - List *tlist, - List *clauses, - List *custom_plans); -} CustomPathMethods; + RelOptInfo *rel, + struct CustomPath *best_path, + List *tlist, + List *clauses, + List *custom_plans); +} CustomPathMethods; /* * Custom scan. Here again, there's not much to do: we need to be able to @@ -120,8 +120,8 @@ typedef struct CustomExecMethods /* Required executor methods */ void (*BeginCustomScan) (CustomScanState *node, - EState *estate, - int eflags); + EState *estate, + int eflags); TupleTableSlot *(*ExecCustomScan) (CustomScanState *node); void (*EndCustomScan) (CustomScanState *node); void (*ReScanCustomScan) (CustomScanState *node); @@ -132,19 +132,19 @@ typedef struct CustomExecMethods /* Optional methods: needed if parallel execution is supported */ Size (*EstimateDSMCustomScan) (CustomScanState *node, - ParallelContext *pcxt); + ParallelContext *pcxt); void (*InitializeDSMCustomScan) (CustomScanState *node, - ParallelContext *pcxt, - void *coordinate); + ParallelContext *pcxt, + void *coordinate); void (*InitializeWorkerCustomScan) (CustomScanState *node, - shm_toc *toc, - void *coordinate); + shm_toc *toc, + void *coordinate); void (*ShutdownCustomScan) (CustomScanState *node); /* Optional: print additional information in EXPLAIN */ void (*ExplainCustomScan) (CustomScanState *node, - List *ancestors, - ExplainState *es); + List *ancestors, + ExplainState *es); } CustomExecMethods; extern void RegisterCustomScanMethods(const CustomScanMethods *methods); diff --git a/src/include/nodes/memnodes.h b/src/include/nodes/memnodes.h index fe6bc903b3..bcf81304fd 100644 --- a/src/include/nodes/memnodes.h +++ b/src/include/nodes/memnodes.h @@ -63,7 +63,7 @@ typedef struct MemoryContextMethods Size (*get_chunk_space) (MemoryContext context, void *pointer); bool (*is_empty) (MemoryContext context); void (*stats) (MemoryContext context, int level, bool print, - MemoryContextCounters *totals); + MemoryContextCounters *totals); #ifdef MEMORY_CONTEXT_CHECKING void (*check) (MemoryContext context); #endif diff --git a/src/include/nodes/nodeFuncs.h b/src/include/nodes/nodeFuncs.h index b6c9b48ee6..cda925397b 100644 --- a/src/include/nodes/nodeFuncs.h +++ b/src/include/nodes/nodeFuncs.h @@ -51,30 +51,30 @@ extern bool check_functions_in_node(Node *node, check_function_callback checker, void *context); extern bool expression_tree_walker(Node *node, bool (*walker) (), - void *context); + void *context); extern Node *expression_tree_mutator(Node *node, Node *(*mutator) (), - void *context); + void *context); extern bool query_tree_walker(Query *query, bool (*walker) (), - void *context, int flags); + void *context, int flags); extern Query *query_tree_mutator(Query *query, Node *(*mutator) (), - void *context, int flags); + void *context, int flags); extern bool range_table_walker(List *rtable, bool (*walker) (), - void *context, int flags); + void *context, int flags); extern List *range_table_mutator(List *rtable, Node *(*mutator) (), - void *context, int flags); + void *context, int flags); extern bool query_or_expression_tree_walker(Node *node, bool (*walker) (), - void *context, int flags); + void *context, int flags); extern Node *query_or_expression_tree_mutator(Node *node, Node *(*mutator) (), - void *context, int flags); + void *context, int flags); extern bool raw_expression_tree_walker(Node *node, bool (*walker) (), - void *context); + void *context); struct PlanState; extern bool planstate_tree_walker(struct PlanState *planstate, bool (*walker) (), - void *context); + void *context); #endif /* NODEFUNCS_H */ diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h index 15de936355..35c3c7db2a 100644 --- a/src/include/nodes/nodes.h +++ b/src/include/nodes/nodes.h @@ -614,6 +614,7 @@ extern int16 *readAttrNumberCols(int numCols); * nodes/copyfuncs.c */ extern void *copyObjectImpl(const void *obj); + /* cast result back to argument type, if supported by compiler */ #ifdef HAVE_TYPEOF #define copyObject(obj) ((typeof(obj)) copyObjectImpl(obj)) diff --git a/src/include/nodes/params.h b/src/include/nodes/params.h index e19ac24582..bb1618c753 100644 --- a/src/include/nodes/params.h +++ b/src/include/nodes/params.h @@ -74,7 +74,7 @@ typedef struct ParamListInfoData int numParams; /* number of ParamExternDatas following */ struct Bitmapset *paramMask; /* if non-NULL, can ignore omitted params */ ParamExternData params[FLEXIBLE_ARRAY_MEMBER]; -} ParamListInfoData; +} ParamListInfoData; /* ---------------- diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index 48ea547887..3864635f4c 100644 --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.h @@ -2099,7 +2099,8 @@ typedef struct Constraint char fk_upd_action; /* ON UPDATE action */ char fk_del_action; /* ON DELETE action */ List *old_conpfeqop; /* pg_constraint.conpfeqop of my former self */ - Oid old_pktable_oid; /* pg_constraint.confrelid of my former self */ + Oid old_pktable_oid; /* pg_constraint.confrelid of my former + * self */ /* Fields used for constraints that allow a NOT VALID specification */ bool skip_validation; /* skip validation of existing rows? */ diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h index 86ec82eaaa..edca5d2816 100644 --- a/src/include/nodes/primnodes.h +++ b/src/include/nodes/primnodes.h @@ -400,10 +400,11 @@ typedef struct ArrayRef Oid refelemtype; /* type of the array elements */ int32 reftypmod; /* typmod of the array (and elements too) */ Oid refcollid; /* OID of collation, or InvalidOid if none */ - List *refupperindexpr;/* expressions that evaluate to upper array - * indexes */ - List *reflowerindexpr;/* expressions that evaluate to lower array - * indexes, or NIL for single array element */ + List *refupperindexpr; /* expressions that evaluate to upper + * array indexes */ + List *reflowerindexpr; /* expressions that evaluate to lower + * array indexes, or NIL for single array + * element */ Expr *refexpr; /* the expression that evaluates to an array * value */ Expr *refassgnexpr; /* expression for the source value, or NULL if @@ -1367,8 +1368,8 @@ typedef struct TargetEntry Expr *expr; /* expression to evaluate */ AttrNumber resno; /* attribute number (see notes above) */ char *resname; /* name of the column (could be NULL) */ - Index ressortgroupref;/* nonzero if referenced by a sort/group - * clause */ + Index ressortgroupref; /* nonzero if referenced by a sort/group + * clause */ Oid resorigtbl; /* OID of column's source table */ AttrNumber resorigcol; /* column's number in source table */ bool resjunk; /* set to true to eliminate the attribute from diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h index 902e9faf12..077e1ceedd 100644 --- a/src/include/nodes/relation.h +++ b/src/include/nodes/relation.h @@ -577,7 +577,8 @@ typedef struct RelOptInfo void *fdw_private; /* cache space for remembering if we have proven this relation unique */ - List *unique_for_rels; /* known unique for these other relid set(s) */ + List *unique_for_rels; /* known unique for these other relid + * set(s) */ List *non_unique_for_rels; /* known not unique for these set(s) */ /* used by various scans and joins: */ @@ -655,10 +656,11 @@ typedef struct IndexOptInfo List *indextlist; /* targetlist representing index columns */ - List *indrestrictinfo;/* parent relation's baserestrictinfo list, - * less any conditions implied by the index's - * predicate (unless it's a target rel, see - * comments in check_index_predicates()) */ + List *indrestrictinfo; /* parent relation's baserestrictinfo + * list, less any conditions implied by + * the index's predicate (unless it's a + * target rel, see comments in + * check_index_predicates()) */ bool predOK; /* true if index predicate matches query */ bool unique; /* true if a unique index */ diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h index 3cf681e91b..a8cedb8f78 100644 --- a/src/include/optimizer/cost.h +++ b/src/include/optimizer/cost.h @@ -36,7 +36,7 @@ typedef enum CONSTRAINT_EXCLUSION_OFF, /* do not use c_e */ CONSTRAINT_EXCLUSION_ON, /* apply c_e to all rels */ CONSTRAINT_EXCLUSION_PARTITION /* apply c_e to otherrels only */ -} ConstraintExclusionType; +} ConstraintExclusionType; /* diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h index a216f9e912..807729c74a 100644 --- a/src/include/optimizer/paths.h +++ b/src/include/optimizer/paths.h @@ -27,24 +27,24 @@ extern int min_parallel_index_scan_size; /* Hook for plugins to get control in set_rel_pathlist() */ typedef void (*set_rel_pathlist_hook_type) (PlannerInfo *root, - RelOptInfo *rel, - Index rti, - RangeTblEntry *rte); + RelOptInfo *rel, + Index rti, + RangeTblEntry *rte); extern PGDLLIMPORT set_rel_pathlist_hook_type set_rel_pathlist_hook; /* Hook for plugins to get control in add_paths_to_joinrel() */ typedef void (*set_join_pathlist_hook_type) (PlannerInfo *root, - RelOptInfo *joinrel, - RelOptInfo *outerrel, - RelOptInfo *innerrel, - JoinType jointype, - JoinPathExtraData *extra); + RelOptInfo *joinrel, + RelOptInfo *outerrel, + RelOptInfo *innerrel, + JoinType jointype, + JoinPathExtraData *extra); extern PGDLLIMPORT set_join_pathlist_hook_type set_join_pathlist_hook; /* Hook for plugins to replace standard_join_search() */ typedef RelOptInfo *(*join_search_hook_type) (PlannerInfo *root, - int levels_needed, - List *initial_rels); + int levels_needed, + List *initial_rels); extern PGDLLIMPORT join_search_hook_type join_search_hook; @@ -117,10 +117,10 @@ extern bool have_dangerous_phv(PlannerInfo *root, * routines for managing EquivalenceClasses */ typedef bool (*ec_matches_callback_type) (PlannerInfo *root, - RelOptInfo *rel, - EquivalenceClass *ec, - EquivalenceMember *em, - void *arg); + RelOptInfo *rel, + EquivalenceClass *ec, + EquivalenceMember *em, + void *arg); extern bool process_equivalence(PlannerInfo *root, RestrictInfo *restrictinfo, bool below_outer_join); diff --git a/src/include/optimizer/plancat.h b/src/include/optimizer/plancat.h index 68fd713b09..16960c2859 100644 --- a/src/include/optimizer/plancat.h +++ b/src/include/optimizer/plancat.h @@ -19,9 +19,9 @@ /* Hook for plugins to get control in get_relation_info() */ typedef void (*get_relation_info_hook_type) (PlannerInfo *root, - Oid relationObjectId, - bool inhparent, - RelOptInfo *rel); + Oid relationObjectId, + bool inhparent, + RelOptInfo *rel); extern PGDLLIMPORT get_relation_info_hook_type get_relation_info_hook; diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h index e773c0f7ed..e3cde2595b 100644 --- a/src/include/optimizer/planmain.h +++ b/src/include/optimizer/planmain.h @@ -23,7 +23,7 @@ typedef enum FORCE_PARALLEL_OFF, FORCE_PARALLEL_ON, FORCE_PARALLEL_REGRESS -} ForceParallelMode; +} ForceParallelMode; /* GUC parameters */ #define DEFAULT_CURSOR_TUPLE_FRACTION 0.1 diff --git a/src/include/optimizer/planner.h b/src/include/optimizer/planner.h index f3aaa23975..41667f2c41 100644 --- a/src/include/optimizer/planner.h +++ b/src/include/optimizer/planner.h @@ -20,15 +20,15 @@ /* Hook for plugins to get control in planner() */ typedef PlannedStmt *(*planner_hook_type) (Query *parse, - int cursorOptions, - ParamListInfo boundParams); + int cursorOptions, + ParamListInfo boundParams); extern PGDLLIMPORT planner_hook_type planner_hook; /* Hook for plugins to get control when grouping_planner() plans upper rels */ typedef void (*create_upper_paths_hook_type) (PlannerInfo *root, - UpperRelationKind stage, - RelOptInfo *input_rel, - RelOptInfo *output_rel); + UpperRelationKind stage, + RelOptInfo *input_rel, + RelOptInfo *output_rel); extern PGDLLIMPORT create_upper_paths_hook_type create_upper_paths_hook; diff --git a/src/include/parser/analyze.h b/src/include/parser/analyze.h index 9b33ba5dfd..4d7d06a162 100644 --- a/src/include/parser/analyze.h +++ b/src/include/parser/analyze.h @@ -18,7 +18,7 @@ /* Hook for plugins to get control at end of parse analysis */ typedef void (*post_parse_analyze_hook_type) (ParseState *pstate, - Query *query); + Query *query); extern PGDLLIMPORT post_parse_analyze_hook_type post_parse_analyze_hook; diff --git a/src/include/parser/parse_node.h b/src/include/parser/parse_node.h index 6a3507f3b1..cc424ece03 100644 --- a/src/include/parser/parse_node.h +++ b/src/include/parser/parse_node.h @@ -80,8 +80,8 @@ typedef Node *(*PreParseColumnRefHook) (ParseState *pstate, ColumnRef *cref); typedef Node *(*PostParseColumnRefHook) (ParseState *pstate, ColumnRef *cref, Node *var); typedef Node *(*ParseParamRefHook) (ParseState *pstate, ParamRef *pref); typedef Node *(*CoerceParamHook) (ParseState *pstate, Param *param, - Oid targetTypeId, int32 targetTypeMod, - int location); + Oid targetTypeId, int32 targetTypeMod, + int location); /* diff --git a/src/include/parser/parser.h b/src/include/parser/parser.h index c8ad710dac..3895e03c6c 100644 --- a/src/include/parser/parser.h +++ b/src/include/parser/parser.h @@ -23,7 +23,7 @@ typedef enum BACKSLASH_QUOTE_OFF, BACKSLASH_QUOTE_ON, BACKSLASH_QUOTE_SAFE_ENCODING -} BackslashQuoteType; +} BackslashQuoteType; /* GUC variables in scan.l (every one of these is a bad idea :-() */ extern int backslash_quote; diff --git a/src/include/pg_getopt.h b/src/include/pg_getopt.h index 2e25576499..c356ba197e 100644 --- a/src/include/pg_getopt.h +++ b/src/include/pg_getopt.h @@ -40,7 +40,7 @@ extern int optreset; #endif #ifndef HAVE_GETOPT -extern int getopt(int nargc, char *const * nargv, const char *ostr); +extern int getopt(int nargc, char *const *nargv, const char *ostr); #endif #endif /* PG_GETOPT_H */ diff --git a/src/include/pgstat.h b/src/include/pgstat.h index 5e029c0f4e..bcf20ced59 100644 --- a/src/include/pgstat.h +++ b/src/include/pgstat.h @@ -39,7 +39,7 @@ typedef enum TrackFunctionsLevel TRACK_FUNC_OFF, TRACK_FUNC_PL, TRACK_FUNC_ALL -} TrackFunctionsLevel; +} TrackFunctionsLevel; /* ---------- * The types of backend -> collector messages diff --git a/src/include/pgtime.h b/src/include/pgtime.h index 52b54b920a..3624dbdf42 100644 --- a/src/include/pgtime.h +++ b/src/include/pgtime.h @@ -66,7 +66,7 @@ extern bool pg_tz_acceptable(pg_tz *tz); /* these functions are in strftime.c */ extern size_t pg_strftime(char *s, size_t max, const char *format, - const struct pg_tm * tm); + const struct pg_tm *tm); /* these functions and variables are in pgtz.c */ diff --git a/src/include/port.h b/src/include/port.h index 52910ed203..0fa030ea81 100644 --- a/src/include/port.h +++ b/src/include/port.h @@ -271,7 +271,7 @@ extern bool rmtree(const char *path, bool rmtopdir); */ #if defined(WIN32) && !defined(__CYGWIN__) && !defined(UNSAFE_STAT_OK) #include <sys/stat.h> -extern int pgwin32_safestat(const char *path, struct stat * buf); +extern int pgwin32_safestat(const char *path, struct stat *buf); #define stat(a,b) pgwin32_safestat(a,b) #endif @@ -317,7 +317,7 @@ extern FILE *pgwin32_popen(const char *command, const char *type); /* New versions of MingW have gettimeofday, old mingw and msvc don't */ #ifndef HAVE_GETTIMEOFDAY /* Last parameter not used */ -extern int gettimeofday(struct timeval * tp, struct timezone * tzp); +extern int gettimeofday(struct timeval *tp, struct timezone *tzp); #endif #else /* !WIN32 */ @@ -392,7 +392,7 @@ extern double rint(double x); #ifndef HAVE_INET_ATON #include <netinet/in.h> #include <arpa/inet.h> -extern int inet_aton(const char *cp, struct in_addr * addr); +extern int inet_aton(const char *cp, struct in_addr *addr); #endif #if !HAVE_DECL_STRLCAT @@ -423,14 +423,14 @@ extern void srandom(unsigned int seed); extern char *pqStrerror(int errnum, char *strerrbuf, size_t buflen); #ifndef WIN32 -extern int pqGetpwuid(uid_t uid, struct passwd * resultbuf, char *buffer, - size_t buflen, struct passwd ** result); +extern int pqGetpwuid(uid_t uid, struct passwd *resultbuf, char *buffer, + size_t buflen, struct passwd **result); #endif extern int pqGethostbyname(const char *name, - struct hostent * resultbuf, + struct hostent *resultbuf, char *buffer, size_t buflen, - struct hostent ** result, + struct hostent **result, int *herrno); extern void pg_qsort(void *base, size_t nel, size_t elsize, diff --git a/src/include/port/win32.h b/src/include/port/win32.h index 0debb3b3f4..43505f23e0 100644 --- a/src/include/port/win32.h +++ b/src/include/port/win32.h @@ -222,7 +222,7 @@ struct itimerval struct timeval it_value; }; -int setitimer(int which, const struct itimerval * value, struct itimerval * ovalue); +int setitimer(int which, const struct itimerval *value, struct itimerval *ovalue); /* * WIN32 does not provide 64-bit off_t, but does provide the functions operating @@ -376,11 +376,11 @@ void pg_queue_signal(int signum); #define send(s, buf, len, flags) pgwin32_send(s, buf, len, flags) SOCKET pgwin32_socket(int af, int type, int protocol); -int pgwin32_bind(SOCKET s, struct sockaddr * addr, int addrlen); +int pgwin32_bind(SOCKET s, struct sockaddr *addr, int addrlen); int pgwin32_listen(SOCKET s, int backlog); -SOCKET pgwin32_accept(SOCKET s, struct sockaddr * addr, int *addrlen); -int pgwin32_connect(SOCKET s, const struct sockaddr * name, int namelen); -int pgwin32_select(int nfds, fd_set *readfs, fd_set *writefds, fd_set *exceptfds, const struct timeval * timeout); +SOCKET pgwin32_accept(SOCKET s, struct sockaddr *addr, int *addrlen); +int pgwin32_connect(SOCKET s, const struct sockaddr *name, int namelen); +int pgwin32_select(int nfds, fd_set *readfs, fd_set *writefds, fd_set *exceptfds, const struct timeval *timeout); int pgwin32_recv(SOCKET s, char *buf, int len, int flags); int pgwin32_send(SOCKET s, const void *buf, int len, int flags); diff --git a/src/include/postgres.h b/src/include/postgres.h index 009337d268..70ffdc6e17 100644 --- a/src/include/postgres.h +++ b/src/include/postgres.h @@ -71,7 +71,7 @@ typedef struct varatt_external int32 va_extsize; /* External saved size (doesn't) */ Oid va_valueid; /* Unique ID of value within TOAST table */ Oid va_toastrelid; /* RelID of TOAST table containing it */ -} varatt_external; +} varatt_external; /* * struct varatt_indirect is a "TOAST pointer" representing an out-of-line @@ -85,7 +85,7 @@ typedef struct varatt_external typedef struct varatt_indirect { struct varlena *pointer; /* Pointer to in-memory varlena */ -} varatt_indirect; +} varatt_indirect; /* * struct varatt_expanded is a "TOAST pointer" representing an out-of-line diff --git a/src/include/postmaster/bgworker.h b/src/include/postmaster/bgworker.h index 51a5978ea8..be4d3d27da 100644 --- a/src/include/postmaster/bgworker.h +++ b/src/include/postmaster/bgworker.h @@ -119,9 +119,7 @@ extern bool RegisterDynamicBackgroundWorker(BackgroundWorker *worker, /* Query the status of a bgworker */ extern BgwHandleStatus GetBackgroundWorkerPid(BackgroundWorkerHandle *handle, pid_t *pidp); -extern BgwHandleStatus -WaitForBackgroundWorkerStartup(BackgroundWorkerHandle * - handle, pid_t *pid); +extern BgwHandleStatus WaitForBackgroundWorkerStartup(BackgroundWorkerHandle *handle, pid_t *pid); extern BgwHandleStatus WaitForBackgroundWorkerShutdown(BackgroundWorkerHandle *); diff --git a/src/include/regex/regguts.h b/src/include/regex/regguts.h index 69816f1449..8d3221e4a4 100644 --- a/src/include/regex/regguts.h +++ b/src/include/regex/regguts.h @@ -479,4 +479,4 @@ struct guts /* prototypes for functions that are exported from regcomp.c to regexec.c */ extern void pg_set_regex_collation(Oid collation); -extern color pg_reg_getcolor(struct colormap * cm, chr c); +extern color pg_reg_getcolor(struct colormap *cm, chr c); diff --git a/src/include/replication/logical.h b/src/include/replication/logical.h index 159da7f23f..9e640be984 100644 --- a/src/include/replication/logical.h +++ b/src/include/replication/logical.h @@ -19,17 +19,17 @@ struct LogicalDecodingContext; typedef void (*LogicalOutputPluginWriterWrite) ( struct LogicalDecodingContext *lr, - XLogRecPtr Ptr, - TransactionId xid, - bool last_write + XLogRecPtr Ptr, + TransactionId xid, + bool last_write ); typedef LogicalOutputPluginWriterWrite LogicalOutputPluginWriterPrepareWrite; typedef void (*LogicalOutputPluginWriterUpdateProgress) ( struct LogicalDecodingContext *lr, - XLogRecPtr Ptr, - TransactionId xid + XLogRecPtr Ptr, + TransactionId xid ); typedef struct LogicalDecodingContext diff --git a/src/include/replication/output_plugin.h b/src/include/replication/output_plugin.h index 2435e2be2d..511216a295 100644 --- a/src/include/replication/output_plugin.h +++ b/src/include/replication/output_plugin.h @@ -42,47 +42,47 @@ typedef void (*LogicalOutputPluginInit) (struct OutputPluginCallbacks *cb); * the same slot is used from there one, it will be "false". */ typedef void (*LogicalDecodeStartupCB) (struct LogicalDecodingContext *ctx, - OutputPluginOptions *options, - bool is_init); + OutputPluginOptions *options, + bool is_init); /* * Callback called for every (explicit or implicit) BEGIN of a successful * transaction. */ typedef void (*LogicalDecodeBeginCB) (struct LogicalDecodingContext *ctx, - ReorderBufferTXN *txn); + ReorderBufferTXN *txn); /* * Callback for every individual change in a successful transaction. */ typedef void (*LogicalDecodeChangeCB) (struct LogicalDecodingContext *ctx, - ReorderBufferTXN *txn, - Relation relation, - ReorderBufferChange *change); + ReorderBufferTXN *txn, + Relation relation, + ReorderBufferChange *change); /* * Called for every (explicit or implicit) COMMIT of a successful transaction. */ typedef void (*LogicalDecodeCommitCB) (struct LogicalDecodingContext *ctx, - ReorderBufferTXN *txn, - XLogRecPtr commit_lsn); + ReorderBufferTXN *txn, + XLogRecPtr commit_lsn); /* * Called for the generic logical decoding messages. */ typedef void (*LogicalDecodeMessageCB) (struct LogicalDecodingContext *ctx, - ReorderBufferTXN *txn, - XLogRecPtr message_lsn, - bool transactional, - const char *prefix, - Size message_size, - const char *message); + ReorderBufferTXN *txn, + XLogRecPtr message_lsn, + bool transactional, + const char *prefix, + Size message_size, + const char *message); /* * Filter changes by origin. */ typedef bool (*LogicalDecodeFilterByOriginCB) (struct LogicalDecodingContext *ctx, - RepOriginId origin_id); + RepOriginId origin_id); /* * Called to shutdown an output plugin. diff --git a/src/include/replication/reorderbuffer.h b/src/include/replication/reorderbuffer.h index 1d9a1d343e..e722f4dcf5 100644 --- a/src/include/replication/reorderbuffer.h +++ b/src/include/replication/reorderbuffer.h @@ -276,30 +276,30 @@ typedef struct ReorderBuffer ReorderBuffer; /* change callback signature */ typedef void (*ReorderBufferApplyChangeCB) ( - ReorderBuffer *rb, - ReorderBufferTXN *txn, - Relation relation, - ReorderBufferChange *change); + ReorderBuffer *rb, + ReorderBufferTXN *txn, + Relation relation, + ReorderBufferChange *change); /* begin callback signature */ typedef void (*ReorderBufferBeginCB) ( - ReorderBuffer *rb, - ReorderBufferTXN *txn); + ReorderBuffer *rb, + ReorderBufferTXN *txn); /* commit callback signature */ typedef void (*ReorderBufferCommitCB) ( - ReorderBuffer *rb, - ReorderBufferTXN *txn, - XLogRecPtr commit_lsn); + ReorderBuffer *rb, + ReorderBufferTXN *txn, + XLogRecPtr commit_lsn); /* message callback signature */ typedef void (*ReorderBufferMessageCB) ( - ReorderBuffer *rb, - ReorderBufferTXN *txn, - XLogRecPtr message_lsn, - bool transactional, - const char *prefix, Size sz, - const char *message); + ReorderBuffer *rb, + ReorderBufferTXN *txn, + XLogRecPtr message_lsn, + bool transactional, + const char *prefix, Size sz, + const char *message); struct ReorderBuffer { diff --git a/src/include/replication/walreceiver.h b/src/include/replication/walreceiver.h index 31d090c99d..68a813895b 100644 --- a/src/include/replication/walreceiver.h +++ b/src/include/replication/walreceiver.h @@ -192,33 +192,33 @@ typedef struct WalRcvExecResult /* libpqwalreceiver hooks */ typedef WalReceiverConn *(*walrcv_connect_fn) (const char *conninfo, bool logical, - const char *appname, - char **err); + const char *appname, + char **err); typedef void (*walrcv_check_conninfo_fn) (const char *conninfo); typedef char *(*walrcv_get_conninfo_fn) (WalReceiverConn *conn); typedef char *(*walrcv_identify_system_fn) (WalReceiverConn *conn, - TimeLineID *primary_tli, - int *server_version); + TimeLineID *primary_tli, + int *server_version); typedef void (*walrcv_readtimelinehistoryfile_fn) (WalReceiverConn *conn, - TimeLineID tli, - char **filename, - char **content, int *size); + TimeLineID tli, + char **filename, + char **content, int *size); typedef bool (*walrcv_startstreaming_fn) (WalReceiverConn *conn, - const WalRcvStreamOptions *options); + const WalRcvStreamOptions *options); typedef void (*walrcv_endstreaming_fn) (WalReceiverConn *conn, - TimeLineID *next_tli); + TimeLineID *next_tli); typedef int (*walrcv_receive_fn) (WalReceiverConn *conn, char **buffer, - pgsocket *wait_fd); + pgsocket *wait_fd); typedef void (*walrcv_send_fn) (WalReceiverConn *conn, const char *buffer, - int nbytes); + int nbytes); typedef char *(*walrcv_create_slot_fn) (WalReceiverConn *conn, const char *slotname, bool temporary, - CRSSnapshotAction snapshot_action, - XLogRecPtr *lsn); + CRSSnapshotAction snapshot_action, + XLogRecPtr *lsn); typedef WalRcvExecResult *(*walrcv_exec_fn) (WalReceiverConn *conn, - const char *query, - const int nRetTypes, - const Oid *retTypes); + const char *query, + const int nRetTypes, + const Oid *retTypes); typedef void (*walrcv_disconnect_fn) (WalReceiverConn *conn); typedef struct WalReceiverFunctionsType diff --git a/src/include/rewrite/rowsecurity.h b/src/include/rewrite/rowsecurity.h index 0e739fd334..260a79c3d2 100644 --- a/src/include/rewrite/rowsecurity.h +++ b/src/include/rewrite/rowsecurity.h @@ -35,7 +35,7 @@ typedef struct RowSecurityDesc } RowSecurityDesc; typedef List *(*row_security_policy_hook_type) (CmdType cmdtype, - Relation relation); + Relation relation); extern PGDLLIMPORT row_security_policy_hook_type row_security_policy_hook_permissive; diff --git a/src/include/rusagestub.h b/src/include/rusagestub.h index 0e366cab10..9027b89bf0 100644 --- a/src/include/rusagestub.h +++ b/src/include/rusagestub.h @@ -29,6 +29,6 @@ struct rusage struct timeval ru_stime; /* system time used */ }; -extern int getrusage(int who, struct rusage * rusage); +extern int getrusage(int who, struct rusage *rusage); #endif /* RUSAGESTUB_H */ diff --git a/src/include/statistics/statistics.h b/src/include/statistics/statistics.h index 58e1a624b5..87bf3d82ca 100644 --- a/src/include/statistics/statistics.h +++ b/src/include/statistics/statistics.h @@ -28,6 +28,7 @@ typedef struct MVNDistinctItem double ndistinct; /* ndistinct value for this combination */ Bitmapset *attrs; /* attr numbers of items */ } MVNDistinctItem; + /* size of the struct, excluding attribute list */ #define SizeOfMVNDistinctItem \ (offsetof(MVNDistinctItem, ndistinct) + sizeof(double)) diff --git a/src/include/storage/itemptr.h b/src/include/storage/itemptr.h index c21d2adfcb..74b2f3cbf2 100644 --- a/src/include/storage/itemptr.h +++ b/src/include/storage/itemptr.h @@ -38,6 +38,7 @@ typedef struct ItemPointerData BlockIdData ip_blkid; OffsetNumber ip_posid; } + /* If compiler understands packed and aligned pragmas, use those */ #if defined(pg_attribute_packed) && defined(pg_attribute_aligned) pg_attribute_packed() diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h index 7a9c105519..ad257be950 100644 --- a/src/include/storage/lock.h +++ b/src/include/storage/lock.h @@ -113,7 +113,7 @@ typedef struct LockMethodData { int numLockModes; const LOCKMASK *conflictTab; - const char *const * lockModeNames; + const char *const *lockModeNames; const bool *trace_flag; } LockMethodData; diff --git a/src/include/storage/lwlock.h b/src/include/storage/lwlock.h index 0cd45bb6d8..c53488800c 100644 --- a/src/include/storage/lwlock.h +++ b/src/include/storage/lwlock.h @@ -214,7 +214,7 @@ typedef enum BuiltinTrancheIds LWTRANCHE_PARALLEL_QUERY_DSA, LWTRANCHE_TBM, LWTRANCHE_FIRST_USER_DEFINED -} BuiltinTrancheIds; +} BuiltinTrancheIds; /* * Prior to PostgreSQL 9.4, we used an enum type called LWLockId to refer diff --git a/src/include/storage/pg_shmem.h b/src/include/storage/pg_shmem.h index a329c81899..7a76c08787 100644 --- a/src/include/storage/pg_shmem.h +++ b/src/include/storage/pg_shmem.h @@ -50,7 +50,7 @@ typedef enum HUGE_PAGES_OFF, HUGE_PAGES_ON, HUGE_PAGES_TRY -} HugePagesType; +} HugePagesType; #ifndef WIN32 extern unsigned long UsedShmemSegID; diff --git a/src/include/storage/predicate_internals.h b/src/include/storage/predicate_internals.h index 3cb0ab9bb0..48e6471ddc 100644 --- a/src/include/storage/predicate_internals.h +++ b/src/include/storage/predicate_internals.h @@ -135,7 +135,7 @@ typedef struct PredXactListElementData { SHM_QUEUE link; SERIALIZABLEXACT sxact; -} PredXactListElementData; +} PredXactListElementData; typedef struct PredXactListElementData *PredXactListElement; @@ -174,7 +174,7 @@ typedef struct PredXactListData SERIALIZABLEXACT *OldCommittedSxact; /* shared copy of dummy sxact */ PredXactListElement element; -} PredXactListData; +} PredXactListData; typedef struct PredXactListData *PredXactList; @@ -198,7 +198,7 @@ typedef struct RWConflictData SHM_QUEUE inLink; /* link for list of conflicts in to a sxact */ SERIALIZABLEXACT *sxactOut; SERIALIZABLEXACT *sxactIn; -} RWConflictData; +} RWConflictData; typedef struct RWConflictData *RWConflict; @@ -209,7 +209,7 @@ typedef struct RWConflictPoolHeaderData { SHM_QUEUE availableList; RWConflict element; -} RWConflictPoolHeaderData; +} RWConflictPoolHeaderData; typedef struct RWConflictPoolHeaderData *RWConflictPoolHeader; diff --git a/src/include/tcop/dest.h b/src/include/tcop/dest.h index c459af2e13..a11cd92c01 100644 --- a/src/include/tcop/dest.h +++ b/src/include/tcop/dest.h @@ -116,11 +116,11 @@ struct _DestReceiver { /* Called for each tuple to be output: */ bool (*receiveSlot) (TupleTableSlot *slot, - DestReceiver *self); + DestReceiver *self); /* Per-executor-run initialization and shutdown: */ void (*rStartup) (DestReceiver *self, - int operation, - TupleDesc typeinfo); + int operation, + TupleDesc typeinfo); void (*rShutdown) (DestReceiver *self); /* Destroy the receiver object itself (if dynamically allocated) */ void (*rDestroy) (DestReceiver *self); diff --git a/src/include/tcop/utility.h b/src/include/tcop/utility.h index 14f65c34d6..850d09b9f0 100644 --- a/src/include/tcop/utility.h +++ b/src/include/tcop/utility.h @@ -26,8 +26,8 @@ typedef enum /* Hook for plugins to get control in ProcessUtility() */ typedef void (*ProcessUtility_hook_type) (PlannedStmt *pstmt, const char *queryString, ProcessUtilityContext context, - ParamListInfo params, - QueryEnvironment *queryEnv, + ParamListInfo params, + QueryEnvironment *queryEnv, DestReceiver *dest, char *completionTag); extern PGDLLIMPORT ProcessUtility_hook_type ProcessUtility_hook; diff --git a/src/include/tsearch/ts_utils.h b/src/include/tsearch/ts_utils.h index 20d90b12fd..f44f683f27 100644 --- a/src/include/tsearch/ts_utils.h +++ b/src/include/tsearch/ts_utils.h @@ -41,11 +41,11 @@ struct TSQueryParserStateData; /* private in backend/utils/adt/tsquery.c */ typedef struct TSQueryParserStateData *TSQueryParserState; typedef void (*PushFunction) (Datum opaque, TSQueryParserState state, - char *token, int tokenlen, - int16 tokenweights, /* bitmap as described - * in QueryOperand - * struct */ - bool prefix); + char *token, int tokenlen, + int16 tokenweights, /* bitmap as described + * in QueryOperand + * struct */ + bool prefix); extern TSQuery parse_tsquery(char *buf, PushFunction pushval, @@ -152,7 +152,7 @@ typedef struct ExecPhraseData * it as zeroes if position data is not available. */ typedef bool (*TSExecuteCallback) (void *arg, QueryOperand *val, - ExecPhraseData *data); + ExecPhraseData *data); /* * Flag bits for TS_execute diff --git a/src/include/utils/bytea.h b/src/include/utils/bytea.h index 818e65707f..0cc5438328 100644 --- a/src/include/utils/bytea.h +++ b/src/include/utils/bytea.h @@ -21,7 +21,7 @@ typedef enum { BYTEA_OUTPUT_ESCAPE, BYTEA_OUTPUT_HEX -} ByteaOutputType; +} ByteaOutputType; extern int bytea_output; /* ByteaOutputType, but int for GUC enum */ diff --git a/src/include/utils/datetime.h b/src/include/utils/datetime.h index fb7885bf34..15b558c639 100644 --- a/src/include/utils/datetime.h +++ b/src/include/utils/datetime.h @@ -286,8 +286,8 @@ extern const int day_tab[2][13]; #define DTERR_TZDISP_OVERFLOW (-5) -extern void GetCurrentDateTime(struct pg_tm * tm); -extern void GetCurrentTimeUsec(struct pg_tm * tm, fsec_t *fsec, int *tzp); +extern void GetCurrentDateTime(struct pg_tm *tm); +extern void GetCurrentTimeUsec(struct pg_tm *tm, fsec_t *fsec, int *tzp); extern void j2date(int jd, int *year, int *month, int *day); extern int date2j(int year, int month, int day); @@ -296,32 +296,32 @@ extern int ParseDateTime(const char *timestr, char *workbuf, size_t buflen, int maxfields, int *numfields); extern int DecodeDateTime(char **field, int *ftype, int nf, int *dtype, - struct pg_tm * tm, fsec_t *fsec, int *tzp); + struct pg_tm *tm, fsec_t *fsec, int *tzp); extern int DecodeTimezone(char *str, int *tzp); extern int DecodeTimeOnly(char **field, int *ftype, int nf, int *dtype, - struct pg_tm * tm, fsec_t *fsec, int *tzp); + struct pg_tm *tm, fsec_t *fsec, int *tzp); extern int DecodeInterval(char **field, int *ftype, int nf, int range, - int *dtype, struct pg_tm * tm, fsec_t *fsec); + int *dtype, struct pg_tm *tm, fsec_t *fsec); extern int DecodeISO8601Interval(char *str, - int *dtype, struct pg_tm * tm, fsec_t *fsec); + int *dtype, struct pg_tm *tm, fsec_t *fsec); extern void DateTimeParseError(int dterr, const char *str, const char *datatype) pg_attribute_noreturn(); -extern int DetermineTimeZoneOffset(struct pg_tm * tm, pg_tz *tzp); -extern int DetermineTimeZoneAbbrevOffset(struct pg_tm * tm, const char *abbr, pg_tz *tzp); +extern int DetermineTimeZoneOffset(struct pg_tm *tm, pg_tz *tzp); +extern int DetermineTimeZoneAbbrevOffset(struct pg_tm *tm, const char *abbr, pg_tz *tzp); extern int DetermineTimeZoneAbbrevOffsetTS(TimestampTz ts, const char *abbr, pg_tz *tzp, int *isdst); -extern void EncodeDateOnly(struct pg_tm * tm, int style, char *str); -extern void EncodeTimeOnly(struct pg_tm * tm, fsec_t fsec, bool print_tz, int tz, int style, char *str); -extern void EncodeDateTime(struct pg_tm * tm, fsec_t fsec, bool print_tz, int tz, const char *tzn, int style, char *str); -extern void EncodeInterval(struct pg_tm * tm, fsec_t fsec, int style, char *str); +extern void EncodeDateOnly(struct pg_tm *tm, int style, char *str); +extern void EncodeTimeOnly(struct pg_tm *tm, fsec_t fsec, bool print_tz, int tz, int style, char *str); +extern void EncodeDateTime(struct pg_tm *tm, fsec_t fsec, bool print_tz, int tz, const char *tzn, int style, char *str); +extern void EncodeInterval(struct pg_tm *tm, fsec_t fsec, int style, char *str); extern void EncodeSpecialTimestamp(Timestamp dt, char *str); extern int ValidateDate(int fmask, bool isjulian, bool is2digits, bool bc, - struct pg_tm * tm); + struct pg_tm *tm); extern int DecodeTimezoneAbbrev(int field, char *lowtoken, int *offset, pg_tz **tz); diff --git a/src/include/utils/elog.h b/src/include/utils/elog.h index 9b469b9bfc..58dc92ee5d 100644 --- a/src/include/utils/elog.h +++ b/src/include/utils/elog.h @@ -382,7 +382,7 @@ typedef enum PGERROR_TERSE, /* single-line error messages */ PGERROR_DEFAULT, /* recommended style */ PGERROR_VERBOSE /* all the facts, ma'am */ -} PGErrorVerbosity; +} PGErrorVerbosity; extern int Log_error_verbosity; extern char *Log_line_prefix; diff --git a/src/include/utils/expandeddatum.h b/src/include/utils/expandeddatum.h index f853a13e6e..d9b598591a 100644 --- a/src/include/utils/expandeddatum.h +++ b/src/include/utils/expandeddatum.h @@ -66,7 +66,7 @@ */ typedef Size (*EOM_get_flat_size_method) (ExpandedObjectHeader *eohptr); typedef void (*EOM_flatten_into_method) (ExpandedObjectHeader *eohptr, - void *result, Size allocated_size); + void *result, Size allocated_size); /* Struct of function pointers for an expanded object's methods */ typedef struct ExpandedObjectMethods diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h index 87d0741084..ea11c83700 100644 --- a/src/include/utils/guc.h +++ b/src/include/utils/guc.h @@ -335,7 +335,7 @@ extern void DefineCustomEnumVariable( const char *long_desc, int *valueAddr, int bootValue, - const struct config_enum_entry * options, + const struct config_enum_entry *options, GucContext context, int flags, GucEnumCheckHook check_hook, diff --git a/src/include/utils/guc_tables.h b/src/include/utils/guc_tables.h index 91c6000ec6..f28578b335 100644 --- a/src/include/utils/guc_tables.h +++ b/src/include/utils/guc_tables.h @@ -261,8 +261,8 @@ extern struct config_generic **get_guc_variables(void); extern void build_guc_variables(void); /* search in enum options */ -extern const char *config_enum_lookup_by_value(struct config_enum * record, int val); -extern bool config_enum_lookup_by_name(struct config_enum * record, +extern const char *config_enum_lookup_by_value(struct config_enum *record, int val); +extern bool config_enum_lookup_by_name(struct config_enum *record, const char *value, int *retval); #endif /* GUC_TABLES_H */ diff --git a/src/include/utils/hsearch.h b/src/include/utils/hsearch.h index 7964087161..9b4bd7c02b 100644 --- a/src/include/utils/hsearch.h +++ b/src/include/utils/hsearch.h @@ -27,7 +27,7 @@ typedef uint32 (*HashValueFunc) (const void *key, Size keysize); * as key comparison functions.) */ typedef int (*HashCompareFunc) (const void *key1, const void *key2, - Size keysize); + Size keysize); /* * Key copying functions must have this signature. The return value is not diff --git a/src/include/utils/nabstime.h b/src/include/utils/nabstime.h index 4b0706a316..994b197af0 100644 --- a/src/include/utils/nabstime.h +++ b/src/include/utils/nabstime.h @@ -98,6 +98,6 @@ typedef TimeIntervalData *TimeInterval; /* non-fmgr-callable support routines */ extern AbsoluteTime GetCurrentAbsoluteTime(void); -extern void abstime2tm(AbsoluteTime time, int *tzp, struct pg_tm * tm, char **tzn); +extern void abstime2tm(AbsoluteTime time, int *tzp, struct pg_tm *tm, char **tzn); #endif /* NABSTIME_H */ diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h index ef3898c98c..887e599032 100644 --- a/src/include/utils/portal.h +++ b/src/include/utils/portal.h @@ -190,7 +190,7 @@ typedef struct PortalData /* Presentation data, primarily used by the pg_cursors system view */ TimestampTz creation_time; /* time at which this portal was defined */ bool visible; /* include this portal in pg_cursors? */ -} PortalData; +} PortalData; /* * PortalIsValid diff --git a/src/include/utils/rangetypes.h b/src/include/utils/rangetypes.h index abb2223ec5..fcc014adc2 100644 --- a/src/include/utils/rangetypes.h +++ b/src/include/utils/rangetypes.h @@ -40,8 +40,8 @@ typedef struct #define RANGE_UB_INF 0x10 /* upper bound is +infinity */ #define RANGE_LB_NULL 0x20 /* lower bound is null (NOT USED) */ #define RANGE_UB_NULL 0x40 /* upper bound is null (NOT USED) */ -#define RANGE_CONTAIN_EMPTY 0x80/* marks a GiST internal-page entry whose - * subtree contains some empty ranges */ +#define RANGE_CONTAIN_EMPTY 0x80 /* marks a GiST internal-page entry whose + * subtree contains some empty ranges */ #define RANGE_HAS_LBOUND(flags) (!((flags) & (RANGE_EMPTY | \ RANGE_LB_NULL | \ diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h index 84768969d3..895232e16e 100644 --- a/src/include/utils/rel.h +++ b/src/include/utils/rel.h @@ -72,7 +72,7 @@ typedef struct PartitionKeyData bool *parttypbyval; char *parttypalign; Oid *parttypcoll; -} PartitionKeyData; +} PartitionKeyData; typedef struct PartitionKeyData *PartitionKey; diff --git a/src/include/utils/resowner.h b/src/include/utils/resowner.h index ff785e3a3e..bd9adb71d1 100644 --- a/src/include/utils/resowner.h +++ b/src/include/utils/resowner.h @@ -54,9 +54,9 @@ typedef enum * by providing a callback of this form. */ typedef void (*ResourceReleaseCallback) (ResourceReleasePhase phase, - bool isCommit, - bool isTopLevel, - void *arg); + bool isCommit, + bool isTopLevel, + void *arg); /* diff --git a/src/include/utils/selfuncs.h b/src/include/utils/selfuncs.h index 958bdba455..d89a6e0e90 100644 --- a/src/include/utils/selfuncs.h +++ b/src/include/utils/selfuncs.h @@ -140,14 +140,14 @@ typedef struct /* Hooks for plugins to get control when we ask for stats */ typedef bool (*get_relation_stats_hook_type) (PlannerInfo *root, - RangeTblEntry *rte, - AttrNumber attnum, - VariableStatData *vardata); + RangeTblEntry *rte, + AttrNumber attnum, + VariableStatData *vardata); extern PGDLLIMPORT get_relation_stats_hook_type get_relation_stats_hook; typedef bool (*get_index_stats_hook_type) (PlannerInfo *root, - Oid indexOid, - AttrNumber indexattnum, - VariableStatData *vardata); + Oid indexOid, + AttrNumber indexattnum, + VariableStatData *vardata); extern PGDLLIMPORT get_index_stats_hook_type get_index_stats_hook; /* Functions in selfuncs.c */ diff --git a/src/include/utils/snapshot.h b/src/include/utils/snapshot.h index 2bcaa42277..d996049d11 100644 --- a/src/include/utils/snapshot.h +++ b/src/include/utils/snapshot.h @@ -31,7 +31,7 @@ typedef struct SnapshotData *Snapshot; * function. */ typedef bool (*SnapshotSatisfiesFunc) (HeapTuple htup, - Snapshot snapshot, Buffer buffer); + Snapshot snapshot, Buffer buffer); /* * Struct representing all kind of possible snapshots. diff --git a/src/include/utils/timestamp.h b/src/include/utils/timestamp.h index 7fd1c7692f..c15850445e 100644 --- a/src/include/utils/timestamp.h +++ b/src/include/utils/timestamp.h @@ -81,16 +81,16 @@ extern pg_time_t timestamptz_to_time_t(TimestampTz t); extern const char *timestamptz_to_str(TimestampTz t); -extern int tm2timestamp(struct pg_tm * tm, fsec_t fsec, int *tzp, Timestamp *dt); -extern int timestamp2tm(Timestamp dt, int *tzp, struct pg_tm * tm, +extern int tm2timestamp(struct pg_tm *tm, fsec_t fsec, int *tzp, Timestamp *dt); +extern int timestamp2tm(Timestamp dt, int *tzp, struct pg_tm *tm, fsec_t *fsec, const char **tzn, pg_tz *attimezone); extern void dt2time(Timestamp dt, int *hour, int *min, int *sec, fsec_t *fsec); -extern int interval2tm(Interval span, struct pg_tm * tm, fsec_t *fsec); -extern int tm2interval(struct pg_tm * tm, fsec_t fsec, Interval *span); +extern int interval2tm(Interval span, struct pg_tm *tm, fsec_t *fsec); +extern int tm2interval(struct pg_tm *tm, fsec_t fsec, Interval *span); extern Timestamp SetEpochTimestamp(void); -extern void GetEpochTime(struct pg_tm * tm); +extern void GetEpochTime(struct pg_tm *tm); extern int timestamp_cmp_internal(Timestamp dt1, Timestamp dt2); diff --git a/src/include/utils/xml.h b/src/include/utils/xml.h index 195b9b3a97..fd3a3fba01 100644 --- a/src/include/utils/xml.h +++ b/src/include/utils/xml.h @@ -28,13 +28,13 @@ typedef enum XML_STANDALONE_NO, XML_STANDALONE_NO_VALUE, XML_STANDALONE_OMITTED -} XmlStandaloneType; +} XmlStandaloneType; typedef enum { XMLBINARY_BASE64, XMLBINARY_HEX -} XmlBinaryType; +} XmlBinaryType; typedef enum { diff --git a/src/interfaces/ecpg/compatlib/informix.c b/src/interfaces/ecpg/compatlib/informix.c index e50aa5ec65..2508ed9b8f 100644 --- a/src/interfaces/ecpg/compatlib/informix.c +++ b/src/interfaces/ecpg/compatlib/informix.c @@ -205,8 +205,8 @@ deccvasc(char *cp, int len, decimal *np) if (risnull(CSTRINGTYPE, cp)) return 0; - str = ecpg_strndup(cp, len);/* decimal_in always converts the complete - * string */ + str = ecpg_strndup(cp, len); /* decimal_in always converts the complete + * string */ if (!str) ret = ECPG_INFORMIX_NUM_UNDERFLOW; else @@ -692,7 +692,7 @@ static struct int remaining; char sign; char *val_string; -} value; +} value; /** * initialize the struct, which holds the different forms diff --git a/src/interfaces/ecpg/ecpglib/connect.c b/src/interfaces/ecpg/ecpglib/connect.c index c90f13dc6c..0716abdd7e 100644 --- a/src/interfaces/ecpg/ecpglib/connect.c +++ b/src/interfaces/ecpg/ecpglib/connect.c @@ -110,7 +110,7 @@ ecpg_get_connection(const char *connection_name) } static void -ecpg_finish(struct connection * act) +ecpg_finish(struct connection *act) { if (act != NULL) { diff --git a/src/interfaces/ecpg/ecpglib/descriptor.c b/src/interfaces/ecpg/ecpglib/descriptor.c index 15fd7a08a5..1baa3ed175 100644 --- a/src/interfaces/ecpg/ecpglib/descriptor.c +++ b/src/interfaces/ecpg/ecpglib/descriptor.c @@ -16,14 +16,14 @@ #include "sqlda.h" #include "sql3types.h" -static void descriptor_free(struct descriptor * desc); +static void descriptor_free(struct descriptor *desc); /* We manage descriptors separately for each thread. */ #ifdef ENABLE_THREAD_SAFETY static pthread_key_t descriptor_key; static pthread_once_t descriptor_once = PTHREAD_ONCE_INIT; -static void descriptor_deallocate_all(struct descriptor * list); +static void descriptor_deallocate_all(struct descriptor *list); static void descriptor_destructor(void *arg) @@ -45,7 +45,7 @@ get_descriptors(void) } static void -set_descriptors(struct descriptor * value) +set_descriptors(struct descriptor *value) { pthread_setspecific(descriptor_key, value); } @@ -689,7 +689,7 @@ ECPGset_desc(int lineno, const char *desc_name, int index,...) /* Free the descriptor and items in it. */ static void -descriptor_free(struct descriptor * desc) +descriptor_free(struct descriptor *desc) { struct descriptor_item *desc_item; @@ -743,7 +743,7 @@ ECPGdeallocate_desc(int line, const char *name) /* Deallocate all descriptors in the list */ static void -descriptor_deallocate_all(struct descriptor * list) +descriptor_deallocate_all(struct descriptor *list) { while (list) { diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c index bd9b86be49..3c4cc74c31 100644 --- a/src/interfaces/ecpg/ecpglib/execute.c +++ b/src/interfaces/ecpg/ecpglib/execute.c @@ -82,7 +82,7 @@ quote_postgres(char *arg, bool quote, int lineno) } static void -free_variable(struct variable * var) +free_variable(struct variable *var) { struct variable *var_next; @@ -95,7 +95,7 @@ free_variable(struct variable * var) } static void -free_statement(struct statement * stmt) +free_statement(struct statement *stmt) { if (stmt == NULL) return; @@ -145,7 +145,7 @@ next_insert(char *text, int pos, bool questionmarks) } static bool -ecpg_type_infocache_push(struct ECPGtype_information_cache ** cache, int oid, enum ARRAY_TYPE isarray, int lineno) +ecpg_type_infocache_push(struct ECPGtype_information_cache **cache, int oid, enum ARRAY_TYPE isarray, int lineno) { struct ECPGtype_information_cache *new_entry = (struct ECPGtype_information_cache *) ecpg_alloc(sizeof(struct ECPGtype_information_cache), lineno); @@ -161,7 +161,7 @@ ecpg_type_infocache_push(struct ECPGtype_information_cache ** cache, int oid, en } static enum ARRAY_TYPE -ecpg_is_type_an_array(int type, const struct statement * stmt, const struct variable * var) +ecpg_is_type_an_array(int type, const struct statement *stmt, const struct variable *var) { char *array_query; enum ARRAY_TYPE isarray = ECPG_ARRAY_NOT_SET; @@ -307,7 +307,7 @@ ecpg_is_type_an_array(int type, const struct statement * stmt, const struct vari bool ecpg_store_result(const PGresult *results, int act_field, - const struct statement * stmt, struct variable * var) + const struct statement *stmt, struct variable *var) { enum ARRAY_TYPE isarray; int act_tuple, @@ -491,7 +491,7 @@ sprintf_float_value(char *ptr, float value, const char *delim) } bool -ecpg_store_input(const int lineno, const bool force_indicator, const struct variable * var, +ecpg_store_input(const int lineno, const bool force_indicator, const struct variable *var, char **tobeinserted_p, bool quote) { char *mallocedval = NULL; @@ -1049,7 +1049,7 @@ ecpg_store_input(const int lineno, const bool force_indicator, const struct vari } void -ecpg_free_params(struct statement * stmt, bool print) +ecpg_free_params(struct statement *stmt, bool print) { int n; @@ -1065,7 +1065,7 @@ ecpg_free_params(struct statement * stmt, bool print) } static bool -insert_tobeinserted(int position, int ph_len, struct statement * stmt, char *tobeinserted) +insert_tobeinserted(int position, int ph_len, struct statement *stmt, char *tobeinserted) { char *newcopy; @@ -1104,7 +1104,7 @@ insert_tobeinserted(int position, int ph_len, struct statement * stmt, char *tob * in arrays which can be used by PQexecParams(). */ bool -ecpg_build_params(struct statement * stmt) +ecpg_build_params(struct statement *stmt) { struct variable *var; int desc_counter = 0; @@ -1402,7 +1402,7 @@ ecpg_build_params(struct statement * stmt) * If we are in non-autocommit mode, automatically start a transaction. */ bool -ecpg_autostart_transaction(struct statement * stmt) +ecpg_autostart_transaction(struct statement *stmt) { if (PQtransactionStatus(stmt->connection->connection) == PQTRANS_IDLE && !stmt->connection->autocommit) { @@ -1423,7 +1423,7 @@ ecpg_autostart_transaction(struct statement * stmt) * Execute the SQL statement. */ bool -ecpg_execute(struct statement * stmt) +ecpg_execute(struct statement *stmt) { ecpg_log("ecpg_execute on line %d: query: %s; with %d parameter(s) on connection %s\n", stmt->lineno, stmt->command, stmt->nparams, stmt->connection->name); if (stmt->statement_type == ECPGst_execute) @@ -1471,7 +1471,7 @@ ecpg_execute(struct statement * stmt) *------- */ bool -ecpg_process_output(struct statement * stmt, bool clear_result) +ecpg_process_output(struct statement *stmt, bool clear_result) { struct variable *var; bool status = false; @@ -1747,7 +1747,7 @@ bool ecpg_do_prologue(int lineno, const int compat, const int force_indicator, const char *connection_name, const bool questionmarks, enum ECPG_statement_type statement_type, const char *query, - va_list args, struct statement ** stmt_out) + va_list args, struct statement **stmt_out) { struct statement *stmt; struct connection *con; @@ -1976,7 +1976,7 @@ ecpg_do_prologue(int lineno, const int compat, const int force_indicator, * Restore the application locale and free the statement structure. */ void -ecpg_do_epilogue(struct statement * stmt) +ecpg_do_epilogue(struct statement *stmt) { if (stmt == NULL) return; diff --git a/src/interfaces/ecpg/ecpglib/extern.h b/src/interfaces/ecpg/ecpglib/extern.h index fb9b5aebbe..2040bc163e 100644 --- a/src/interfaces/ecpg/ecpglib/extern.h +++ b/src/interfaces/ecpg/ecpglib/extern.h @@ -166,15 +166,15 @@ struct prepared_statement *ecpg_find_prepared_statement(const char *, struct connection *, struct prepared_statement **); bool ecpg_store_result(const PGresult *results, int act_field, - const struct statement * stmt, struct variable * var); + const struct statement *stmt, struct variable *var); bool ecpg_store_input(const int, const bool, const struct variable *, char **, bool); -void ecpg_free_params(struct statement * stmt, bool print); +void ecpg_free_params(struct statement *stmt, bool print); bool ecpg_do_prologue(int, const int, const int, const char *, const bool, enum ECPG_statement_type, const char *, va_list, struct statement **); bool ecpg_build_params(struct statement *); -bool ecpg_autostart_transaction(struct statement * stmt); -bool ecpg_execute(struct statement * stmt); +bool ecpg_autostart_transaction(struct statement *stmt); +bool ecpg_execute(struct statement *stmt); bool ecpg_process_output(struct statement *, bool); void ecpg_do_epilogue(struct statement *); bool ecpg_do(const int, const int, const int, const char *, const bool, @@ -184,10 +184,10 @@ bool ecpg_check_PQresult(PGresult *, int, PGconn *, enum COMPAT_MODE); void ecpg_raise(int line, int code, const char *sqlstate, const char *str); void ecpg_raise_backend(int line, PGresult *result, PGconn *conn, int compat); char *ecpg_prepared(const char *, struct connection *); -bool ecpg_deallocate_all_conn(int lineno, enum COMPAT_MODE c, struct connection * conn); +bool ecpg_deallocate_all_conn(int lineno, enum COMPAT_MODE c, struct connection *conn); void ecpg_log(const char *format,...) pg_attribute_printf(1, 2); bool ecpg_auto_prepare(int, const char *, const int, char **, const char *); -void ecpg_init_sqlca(struct sqlca_t * sqlca); +void ecpg_init_sqlca(struct sqlca_t *sqlca); struct sqlda_compat *ecpg_build_compat_sqlda(int, PGresult *, int, enum COMPAT_MODE); void ecpg_set_compat_sqlda(int, struct sqlda_compat **, const PGresult *, int, enum COMPAT_MODE); diff --git a/src/interfaces/ecpg/ecpglib/memory.c b/src/interfaces/ecpg/ecpglib/memory.c index 9c1d20efc5..a7268bb0f6 100644 --- a/src/interfaces/ecpg/ecpglib/memory.c +++ b/src/interfaces/ecpg/ecpglib/memory.c @@ -93,7 +93,7 @@ get_auto_allocs(void) } static void -set_auto_allocs(struct auto_mem * am) +set_auto_allocs(struct auto_mem *am) { pthread_setspecific(auto_mem_key, am); } diff --git a/src/interfaces/ecpg/ecpglib/misc.c b/src/interfaces/ecpg/ecpglib/misc.c index 019ebe10f9..f8ad5d733c 100644 --- a/src/interfaces/ecpg/ecpglib/misc.c +++ b/src/interfaces/ecpg/ecpglib/misc.c @@ -96,13 +96,13 @@ static int simple_debug = 0; static FILE *debugstream = NULL; void -ecpg_init_sqlca(struct sqlca_t * sqlca) +ecpg_init_sqlca(struct sqlca_t *sqlca) { memcpy((char *) sqlca, (char *) &sqlca_init, sizeof(struct sqlca_t)); } bool -ecpg_init(const struct connection * con, const char *connection_name, const int lineno) +ecpg_init(const struct connection *con, const char *connection_name, const int lineno) { struct sqlca_t *sqlca = ECPGget_sqlca(); diff --git a/src/interfaces/ecpg/ecpglib/prepare.c b/src/interfaces/ecpg/ecpglib/prepare.c index 983b242d06..e26ab3532f 100644 --- a/src/interfaces/ecpg/ecpglib/prepare.c +++ b/src/interfaces/ecpg/ecpglib/prepare.c @@ -27,8 +27,8 @@ static const int stmtCacheNBuckets = 2039; /* # buckets - a prime # */ static const int stmtCacheEntPerBucket = 8; /* # entries/bucket */ static stmtCacheEntry stmtCacheEntries[16384] = {{0, {0}, 0, 0, 0}}; -static bool deallocate_one(int lineno, enum COMPAT_MODE c, struct connection * con, - struct prepared_statement * prev, struct prepared_statement * this); +static bool deallocate_one(int lineno, enum COMPAT_MODE c, struct connection *con, + struct prepared_statement *prev, struct prepared_statement *this); static bool isvarchar(unsigned char c) @@ -100,7 +100,7 @@ replace_variables(char **text, int lineno) } static bool -prepare_common(int lineno, struct connection * con, const char *name, const char *variable) +prepare_common(int lineno, struct connection *con, const char *name, const char *variable) { struct statement *stmt; struct prepared_statement *this; @@ -180,7 +180,7 @@ ECPGprepare(int lineno, const char *connection_name, const bool questionmarks, c struct prepared_statement * ecpg_find_prepared_statement(const char *name, - struct connection * con, struct prepared_statement ** prev_) + struct connection *con, struct prepared_statement **prev_) { struct prepared_statement *this, *prev; @@ -198,7 +198,7 @@ ecpg_find_prepared_statement(const char *name, } static bool -deallocate_one(int lineno, enum COMPAT_MODE c, struct connection * con, struct prepared_statement * prev, struct prepared_statement * this) +deallocate_one(int lineno, enum COMPAT_MODE c, struct connection *con, struct prepared_statement *prev, struct prepared_statement *this) { bool r = false; @@ -273,7 +273,7 @@ ECPGdeallocate(int lineno, int c, const char *connection_name, const char *name) } bool -ecpg_deallocate_all_conn(int lineno, enum COMPAT_MODE c, struct connection * con) +ecpg_deallocate_all_conn(int lineno, enum COMPAT_MODE c, struct connection *con) { /* deallocate all prepared statements */ while (con->prep_stmts) @@ -292,7 +292,7 @@ ECPGdeallocate_all(int lineno, int compat, const char *connection_name) } char * -ecpg_prepared(const char *name, struct connection * con) +ecpg_prepared(const char *name, struct connection *con) { struct prepared_statement *this; diff --git a/src/interfaces/ecpg/ecpglib/sqlda.c b/src/interfaces/ecpg/ecpglib/sqlda.c index bc94f2f859..c1ba989166 100644 --- a/src/interfaces/ecpg/ecpglib/sqlda.c +++ b/src/interfaces/ecpg/ecpglib/sqlda.c @@ -249,7 +249,7 @@ static int16 value_is_null = -1; static int16 value_is_not_null = 0; void -ecpg_set_compat_sqlda(int lineno, struct sqlda_compat ** _sqlda, const PGresult *res, int row, enum COMPAT_MODE compat) +ecpg_set_compat_sqlda(int lineno, struct sqlda_compat **_sqlda, const PGresult *res, int row, enum COMPAT_MODE compat) { struct sqlda_compat *sqlda = (*_sqlda); int i; @@ -438,7 +438,7 @@ ecpg_build_native_sqlda(int line, PGresult *res, int row, enum COMPAT_MODE compa } void -ecpg_set_native_sqlda(int lineno, struct sqlda_struct ** _sqlda, const PGresult *res, int row, enum COMPAT_MODE compat) +ecpg_set_native_sqlda(int lineno, struct sqlda_struct **_sqlda, const PGresult *res, int row, enum COMPAT_MODE compat) { struct sqlda_struct *sqlda = (*_sqlda); int i; diff --git a/src/interfaces/ecpg/include/ecpg_informix.h b/src/interfaces/ecpg/include/ecpg_informix.h index 3ffeb95b5a..c3c847d854 100644 --- a/src/interfaces/ecpg/include/ecpg_informix.h +++ b/src/interfaces/ecpg/include/ecpg_informix.h @@ -29,7 +29,7 @@ #define ECPG_INFORMIX_EXTRA_CHARS -1264 #ifdef __cplusplus -extern "C" +extern "C" { #endif diff --git a/src/interfaces/ecpg/include/ecpglib.h b/src/interfaces/ecpg/include/ecpglib.h index c32df6c5d5..755fdaaf0c 100644 --- a/src/interfaces/ecpg/include/ecpglib.h +++ b/src/interfaces/ecpg/include/ecpglib.h @@ -40,7 +40,7 @@ extern char *ecpg_gettext(const char *msgid) pg_attribute_format_arg(1); #endif /* FALSE */ #ifdef __cplusplus -extern "C" +extern "C" { #endif diff --git a/src/interfaces/ecpg/include/ecpgtype.h b/src/interfaces/ecpg/include/ecpgtype.h index 7cc47e91e3..236d028154 100644 --- a/src/interfaces/ecpg/include/ecpgtype.h +++ b/src/interfaces/ecpg/include/ecpgtype.h @@ -34,7 +34,7 @@ #define _ECPGTYPE_H #ifdef __cplusplus -extern "C" +extern "C" { #endif diff --git a/src/interfaces/ecpg/include/pgtypes_date.h b/src/interfaces/ecpg/include/pgtypes_date.h index b8990bb072..463cf769a7 100644 --- a/src/interfaces/ecpg/include/pgtypes_date.h +++ b/src/interfaces/ecpg/include/pgtypes_date.h @@ -8,11 +8,11 @@ typedef long date; #ifdef __cplusplus -extern "C" +extern "C" { #endif -extern date *PGTYPESdate_new(void); +extern date * PGTYPESdate_new(void); extern void PGTYPESdate_free(date *); extern date PGTYPESdate_from_asc(char *, char **); extern char *PGTYPESdate_to_asc(date); diff --git a/src/interfaces/ecpg/include/pgtypes_interval.h b/src/interfaces/ecpg/include/pgtypes_interval.h index d5b085deb4..e1b089d862 100644 --- a/src/interfaces/ecpg/include/pgtypes_interval.h +++ b/src/interfaces/ecpg/include/pgtypes_interval.h @@ -27,16 +27,16 @@ typedef struct { int64 time; /* all time units other than months and years */ long month; /* months and years, after time for alignment */ -} interval; +} interval; #ifdef __cplusplus -extern "C" +extern "C" { #endif -extern interval *PGTYPESinterval_new(void); +extern interval * PGTYPESinterval_new(void); extern void PGTYPESinterval_free(interval *); -extern interval *PGTYPESinterval_from_asc(char *, char **); +extern interval * PGTYPESinterval_from_asc(char *, char **); extern char *PGTYPESinterval_to_asc(interval *); extern int PGTYPESinterval_copy(interval *, interval *); diff --git a/src/interfaces/ecpg/include/pgtypes_numeric.h b/src/interfaces/ecpg/include/pgtypes_numeric.h index 1b9e4c35e4..38b8fdcc4b 100644 --- a/src/interfaces/ecpg/include/pgtypes_numeric.h +++ b/src/interfaces/ecpg/include/pgtypes_numeric.h @@ -35,7 +35,7 @@ typedef struct } decimal; #ifdef __cplusplus -extern "C" +extern "C" { #endif diff --git a/src/interfaces/ecpg/include/pgtypes_timestamp.h b/src/interfaces/ecpg/include/pgtypes_timestamp.h index 144e606f7f..9d185f21fe 100644 --- a/src/interfaces/ecpg/include/pgtypes_timestamp.h +++ b/src/interfaces/ecpg/include/pgtypes_timestamp.h @@ -10,7 +10,7 @@ typedef int64 timestamp; typedef int64 TimestampTz; #ifdef __cplusplus -extern "C" +extern "C" { #endif diff --git a/src/interfaces/ecpg/include/sqlca.h b/src/interfaces/ecpg/include/sqlca.h index 41e5b550af..b4ab93fa3b 100644 --- a/src/interfaces/ecpg/include/sqlca.h +++ b/src/interfaces/ecpg/include/sqlca.h @@ -12,7 +12,7 @@ #define SQLERRMC_LEN 150 #ifdef __cplusplus -extern "C" +extern "C" { #endif diff --git a/src/interfaces/ecpg/pgtypeslib/dt.h b/src/interfaces/ecpg/pgtypeslib/dt.h index dc711b914b..f70181380b 100644 --- a/src/interfaces/ecpg/pgtypeslib/dt.h +++ b/src/interfaces/ecpg/pgtypeslib/dt.h @@ -313,12 +313,12 @@ do { \ int DecodeInterval(char **, int *, int, int *, struct tm *, fsec_t *); int DecodeTime(char *, int *, struct tm *, fsec_t *); -int EncodeDateTime(struct tm * tm, fsec_t fsec, bool print_tz, int tz, const char *tzn, int style, char *str, bool EuroDates); -int EncodeInterval(struct tm * tm, fsec_t fsec, int style, char *str); +int EncodeDateTime(struct tm *tm, fsec_t fsec, bool print_tz, int tz, const char *tzn, int style, char *str, bool EuroDates); +int EncodeInterval(struct tm *tm, fsec_t fsec, int style, char *str); int tm2timestamp(struct tm *, fsec_t, int *, timestamp *); int DecodeUnits(int field, char *lowtoken, int *val); bool CheckDateTokenTables(void); -int EncodeDateOnly(struct tm * tm, int style, char *str, bool EuroDates); +int EncodeDateOnly(struct tm *tm, int style, char *str, bool EuroDates); int GetEpochTime(struct tm *); int ParseDateTime(char *, char *, char **, int *, int *, char **); int DecodeDateTime(char **, int *, int, int *, struct tm *, fsec_t *, bool); diff --git a/src/interfaces/ecpg/pgtypeslib/dt_common.c b/src/interfaces/ecpg/pgtypeslib/dt_common.c index 82939db58b..a88e1b94ab 100644 --- a/src/interfaces/ecpg/pgtypeslib/dt_common.c +++ b/src/interfaces/ecpg/pgtypeslib/dt_common.c @@ -561,7 +561,7 @@ DecodeUnits(int field, char *lowtoken, int *val) } return type; -} /* DecodeUnits() */ +} /* DecodeUnits() */ /* * Calendar time to Julian date conversions. @@ -604,7 +604,7 @@ date2j(int y, int m, int d) julian += 7834 * m / 256 + d; return julian; -} /* date2j() */ +} /* date2j() */ void j2date(int jd, int *year, int *month, int *day) @@ -630,7 +630,7 @@ j2date(int jd, int *year, int *month, int *day) *month = (quad + 10) % 12 + 1; return; -} /* j2date() */ +} /* j2date() */ /* DecodeSpecial() * Decode text string using lookup table. @@ -666,13 +666,13 @@ DecodeSpecial(int field, char *lowtoken, int *val) } return type; -} /* DecodeSpecial() */ +} /* DecodeSpecial() */ /* EncodeDateOnly() * Encode date as local time. */ int -EncodeDateOnly(struct tm * tm, int style, char *str, bool EuroDates) +EncodeDateOnly(struct tm *tm, int style, char *str, bool EuroDates) { if (tm->tm_mon < 1 || tm->tm_mon > MONTHS_PER_YEAR) return -1; @@ -725,7 +725,7 @@ EncodeDateOnly(struct tm * tm, int style, char *str, bool EuroDates) } return TRUE; -} /* EncodeDateOnly() */ +} /* EncodeDateOnly() */ void TrimTrailingZeros(char *str) @@ -759,7 +759,7 @@ TrimTrailingZeros(char *str) * European - dd/mm/yyyy */ int -EncodeDateTime(struct tm * tm, fsec_t fsec, bool print_tz, int tz, const char *tzn, int style, char *str, bool EuroDates) +EncodeDateTime(struct tm *tm, fsec_t fsec, bool print_tz, int tz, const char *tzn, int style, char *str, bool EuroDates) { int day, hour, @@ -953,10 +953,10 @@ EncodeDateTime(struct tm * tm, fsec_t fsec, bool print_tz, int tz, const char *t } return TRUE; -} /* EncodeDateTime() */ +} /* EncodeDateTime() */ int -GetEpochTime(struct tm * tm) +GetEpochTime(struct tm *tm) { struct tm *t0; time_t epoch = 0; @@ -976,10 +976,10 @@ GetEpochTime(struct tm * tm) } return -1; -} /* GetEpochTime() */ +} /* GetEpochTime() */ static void -abstime2tm(AbsoluteTime _time, int *tzp, struct tm * tm, char **tzn) +abstime2tm(AbsoluteTime _time, int *tzp, struct tm *tm, char **tzn) { time_t time = (time_t) _time; struct tm *tx; @@ -1064,7 +1064,7 @@ abstime2tm(AbsoluteTime _time, int *tzp, struct tm * tm, char **tzn) } void -GetCurrentDateTime(struct tm * tm) +GetCurrentDateTime(struct tm *tm) { int tz; @@ -1083,7 +1083,7 @@ dt2time(double jd, int *hour, int *min, int *sec, fsec_t *fsec) time -= (*min) * USECS_PER_MINUTE; *sec = time / USECS_PER_SEC; *fsec = time - (*sec * USECS_PER_SEC); -} /* dt2time() */ +} /* dt2time() */ @@ -1094,7 +1094,7 @@ dt2time(double jd, int *hour, int *min, int *sec, fsec_t *fsec) */ static int DecodeNumberField(int len, char *str, int fmask, - int *tmask, struct tm * tm, fsec_t *fsec, int *is2digits) + int *tmask, struct tm *tm, fsec_t *fsec, int *is2digits) { char *cp; @@ -1196,7 +1196,7 @@ DecodeNumberField(int len, char *str, int fmask, } return -1; -} /* DecodeNumberField() */ +} /* DecodeNumberField() */ /* DecodeNumber() @@ -1204,7 +1204,7 @@ DecodeNumberField(int len, char *str, int fmask, */ static int DecodeNumber(int flen, char *str, int fmask, - int *tmask, struct tm * tm, fsec_t *fsec, int *is2digits, bool EuroDates) + int *tmask, struct tm *tm, fsec_t *fsec, int *is2digits, bool EuroDates) { int val; char *cp; @@ -1305,14 +1305,14 @@ DecodeNumber(int flen, char *str, int fmask, return -1; return 0; -} /* DecodeNumber() */ +} /* DecodeNumber() */ /* DecodeDate() * Decode date string which includes delimiters. * Insist on a complete set of fields. */ static int -DecodeDate(char *str, int fmask, int *tmask, struct tm * tm, bool EuroDates) +DecodeDate(char *str, int fmask, int *tmask, struct tm *tm, bool EuroDates) { fsec_t fsec; @@ -1432,7 +1432,7 @@ DecodeDate(char *str, int fmask, int *tmask, struct tm * tm, bool EuroDates) } return 0; -} /* DecodeDate() */ +} /* DecodeDate() */ /* DecodeTime() @@ -1441,7 +1441,7 @@ DecodeDate(char *str, int fmask, int *tmask, struct tm * tm, bool EuroDates) * can be used to represent time spans. */ int -DecodeTime(char *str, int *tmask, struct tm * tm, fsec_t *fsec) +DecodeTime(char *str, int *tmask, struct tm *tm, fsec_t *fsec) { char *cp; @@ -1497,7 +1497,7 @@ DecodeTime(char *str, int *tmask, struct tm * tm, fsec_t *fsec) return -1; return 0; -} /* DecodeTime() */ +} /* DecodeTime() */ /* DecodeTimezone() * Interpret string as a numeric timezone. @@ -1541,7 +1541,7 @@ DecodeTimezone(char *str, int *tzp) *tzp = -tz; return *cp != '\0'; -} /* DecodeTimezone() */ +} /* DecodeTimezone() */ /* DecodePosixTimezone() @@ -1583,7 +1583,7 @@ DecodePosixTimezone(char *str, int *tzp) } return 0; -} /* DecodePosixTimezone() */ +} /* DecodePosixTimezone() */ /* ParseDateTime() * Break string into tokens based on a date/time context. @@ -1763,7 +1763,7 @@ ParseDateTime(char *timestr, char *lowstr, *numfields = nf; return 0; -} /* ParseDateTime() */ +} /* ParseDateTime() */ /* DecodeDateTime() @@ -1788,7 +1788,7 @@ ParseDateTime(char *timestr, char *lowstr, */ int DecodeDateTime(char **field, int *ftype, int nf, - int *dtype, struct tm * tm, fsec_t *fsec, bool EuroDates) + int *dtype, struct tm *tm, fsec_t *fsec, bool EuroDates) { int fmask = 0, tmask, @@ -2351,7 +2351,7 @@ DecodeDateTime(char **field, int *ftype, int nf, } return 0; -} /* DecodeDateTime() */ +} /* DecodeDateTime() */ /* Function works as follows: * @@ -2464,7 +2464,7 @@ find_end_token(char *str, char *fmt) } static int -pgtypes_defmt_scan(union un_fmt_comb * scan_val, int scan_type, char **pstr, char *pfmt) +pgtypes_defmt_scan(union un_fmt_comb *scan_val, int scan_type, char **pstr, char *pfmt) { /* * scan everything between pstr and pstr_end. This is not including the diff --git a/src/interfaces/ecpg/pgtypeslib/interval.c b/src/interfaces/ecpg/pgtypeslib/interval.c index 16fe70d29e..4a740d159d 100644 --- a/src/interfaces/ecpg/pgtypeslib/interval.c +++ b/src/interfaces/ecpg/pgtypeslib/interval.c @@ -32,7 +32,7 @@ strtoint(const char *nptr, char **endptr, int base) * and changesd struct pg_tm to struct tm */ static void -AdjustFractSeconds(double frac, struct /* pg_ */ tm * tm, fsec_t *fsec, int scale) +AdjustFractSeconds(double frac, struct /* pg_ */ tm *tm, fsec_t *fsec, int scale) { int sec; @@ -50,7 +50,7 @@ AdjustFractSeconds(double frac, struct /* pg_ */ tm * tm, fsec_t *fsec, int scal * and changesd struct pg_tm to struct tm */ static void -AdjustFractDays(double frac, struct /* pg_ */ tm * tm, fsec_t *fsec, int scale) +AdjustFractDays(double frac, struct /* pg_ */ tm *tm, fsec_t *fsec, int scale) { int extra_days; @@ -103,7 +103,7 @@ ISO8601IntegerWidth(char *fieldstart) * and changesd struct pg_tm to struct tm */ static inline void -ClearPgTm(struct /* pg_ */ tm * tm, fsec_t *fsec) +ClearPgTm(struct /* pg_ */ tm *tm, fsec_t *fsec) { tm->tm_year = 0; tm->tm_mon = 0; @@ -122,7 +122,7 @@ ClearPgTm(struct /* pg_ */ tm * tm, fsec_t *fsec) */ static int DecodeISO8601Interval(char *str, - int *dtype, struct /* pg_ */ tm * tm, fsec_t *fsec) + int *dtype, struct /* pg_ */ tm *tm, fsec_t *fsec) { bool datepart = true; bool havefield = false; @@ -336,7 +336,7 @@ DecodeISO8601Interval(char *str, */ int DecodeInterval(char **field, int *ftype, int nf, /* int range, */ - int *dtype, struct /* pg_ */ tm * tm, fsec_t *fsec) + int *dtype, struct /* pg_ */ tm *tm, fsec_t *fsec) { int IntervalStyle = INTSTYLE_POSTGRES_VERBOSE; int range = INTERVAL_FULL_RANGE; @@ -772,7 +772,7 @@ AppendSeconds(char *cp, int sec, fsec_t fsec, int precision, bool fillzeros) */ int -EncodeInterval(struct /* pg_ */ tm * tm, fsec_t fsec, int style, char *str) +EncodeInterval(struct /* pg_ */ tm *tm, fsec_t fsec, int style, char *str) { char *cp = str; int year = tm->tm_year; @@ -949,14 +949,14 @@ EncodeInterval(struct /* pg_ */ tm * tm, fsec_t fsec, int style, char *str) } return 0; -} /* EncodeInterval() */ +} /* EncodeInterval() */ /* interval2tm() * Convert an interval data type to a tm structure. */ static int -interval2tm(interval span, struct tm * tm, fsec_t *fsec) +interval2tm(interval span, struct tm *tm, fsec_t *fsec) { int64 time; @@ -984,10 +984,10 @@ interval2tm(interval span, struct tm * tm, fsec_t *fsec) *fsec = time - (tm->tm_sec * USECS_PER_SEC); return 0; -} /* interval2tm() */ +} /* interval2tm() */ static int -tm2interval(struct tm * tm, fsec_t fsec, interval * span) +tm2interval(struct tm *tm, fsec_t fsec, interval * span) { if ((double) tm->tm_year * MONTHS_PER_YEAR + tm->tm_mon > INT_MAX || (double) tm->tm_year * MONTHS_PER_YEAR + tm->tm_mon < INT_MIN) @@ -999,7 +999,7 @@ tm2interval(struct tm * tm, fsec_t fsec, interval * span) tm->tm_sec) * USECS_PER_SEC) + fsec; return 0; -} /* tm2interval() */ +} /* tm2interval() */ interval * PGTYPESinterval_new(void) diff --git a/src/interfaces/ecpg/pgtypeslib/timestamp.c b/src/interfaces/ecpg/pgtypeslib/timestamp.c index 49d7e1ced5..4b4df9dfc6 100644 --- a/src/interfaces/ecpg/pgtypeslib/timestamp.c +++ b/src/interfaces/ecpg/pgtypeslib/timestamp.c @@ -22,14 +22,14 @@ static int64 time2t(const int hour, const int min, const int sec, const fsec_t fsec) { return (((((hour * MINS_PER_HOUR) + min) * SECS_PER_MINUTE) + sec) * USECS_PER_SEC) + fsec; -} /* time2t() */ +} /* time2t() */ static timestamp dt2local(timestamp dt, int tz) { dt -= (tz * USECS_PER_SEC); return dt; -} /* dt2local() */ +} /* dt2local() */ /* tm2timestamp() * Convert a tm structure to a timestamp data type. @@ -39,7 +39,7 @@ dt2local(timestamp dt, int tz) * Returns -1 on failure (overflow). */ int -tm2timestamp(struct tm * tm, fsec_t fsec, int *tzp, timestamp * result) +tm2timestamp(struct tm *tm, fsec_t fsec, int *tzp, timestamp * result) { int dDate; int64 time; @@ -67,7 +67,7 @@ tm2timestamp(struct tm * tm, fsec_t fsec, int *tzp, timestamp * result) return -1; return 0; -} /* tm2timestamp() */ +} /* tm2timestamp() */ static timestamp SetEpochTimestamp(void) @@ -82,7 +82,7 @@ SetEpochTimestamp(void) tm2timestamp(tm, 0, NULL, &dt); return dt; -} /* SetEpochTimestamp() */ +} /* SetEpochTimestamp() */ /* timestamp2tm() * Convert timestamp data type to POSIX time structure. @@ -96,7 +96,7 @@ SetEpochTimestamp(void) * local time zone. If out of this range, leave as GMT. - tgl 97/05/27 */ static int -timestamp2tm(timestamp dt, int *tzp, struct tm * tm, fsec_t *fsec, const char **tzn) +timestamp2tm(timestamp dt, int *tzp, struct tm *tm, fsec_t *fsec, const char **tzn) { int64 dDate, date0; @@ -187,7 +187,7 @@ timestamp2tm(timestamp dt, int *tzp, struct tm * tm, fsec_t *fsec, const char ** tm->tm_yday = dDate - date2j(tm->tm_year, 1, 1) + 1; return 0; -} /* timestamp2tm() */ +} /* timestamp2tm() */ /* EncodeSpecialTimestamp() * * Convert reserved timestamp data type to string. @@ -203,7 +203,7 @@ EncodeSpecialTimestamp(timestamp dt, char *str) return FALSE; return TRUE; -} /* EncodeSpecialTimestamp() */ +} /* EncodeSpecialTimestamp() */ timestamp PGTYPEStimestamp_from_asc(char *str, char **endptr) @@ -309,7 +309,7 @@ PGTYPEStimestamp_current(timestamp * ts) } static int -dttofmtasc_replace(timestamp * ts, date dDate, int dow, struct tm * tm, +dttofmtasc_replace(timestamp * ts, date dDate, int dow, struct tm *tm, char *output, int *pstr_len, const char *fmtstr) { union un_fmt_comb replace_val; diff --git a/src/interfaces/ecpg/preproc/extern.h b/src/interfaces/ecpg/preproc/extern.h index 0ce3a6e424..07d8311806 100644 --- a/src/interfaces/ecpg/preproc/extern.h +++ b/src/interfaces/ecpg/preproc/extern.h @@ -94,7 +94,7 @@ extern struct variable *descriptor_variable(const char *name, int input); extern struct variable *sqlda_variable(const char *name); extern void add_variable_to_head(struct arguments **, struct variable *, struct variable *); extern void add_variable_to_tail(struct arguments **, struct variable *, struct variable *); -extern void remove_variable_from_list(struct arguments ** list, struct variable * var); +extern void remove_variable_from_list(struct arguments **list, struct variable *var); extern void dump_variables(struct arguments *, int); extern struct typedefs *get_typedef(char *); extern void adjust_array(enum ECPGttype, char **, char **, char *, char *, int, bool); diff --git a/src/interfaces/ecpg/preproc/output.c b/src/interfaces/ecpg/preproc/output.c index 59d5d30df4..7cdded53db 100644 --- a/src/interfaces/ecpg/preproc/output.c +++ b/src/interfaces/ecpg/preproc/output.c @@ -32,7 +32,7 @@ struct when when_error, when_warn; static void -print_action(struct when * w) +print_action(struct when *w) { switch (w->code) { @@ -96,7 +96,7 @@ hashline_number(void) ) { /* "* 2" here is for escaping '\' and '"' below */ - char *line = mm_alloc(strlen("\n#line %d \"%s\"\n") + sizeof(int) * CHAR_BIT * 10 / 3 + strlen(input_filename) *2); + char *line = mm_alloc(strlen("\n#line %d \"%s\"\n") + sizeof(int) * CHAR_BIT * 10 / 3 + strlen(input_filename) * 2); char *src, *dest; diff --git a/src/interfaces/ecpg/preproc/type.c b/src/interfaces/ecpg/preproc/type.c index 1bbdc64db8..4ed822b8bb 100644 --- a/src/interfaces/ecpg/preproc/type.c +++ b/src/interfaces/ecpg/preproc/type.c @@ -34,7 +34,7 @@ mm_strdup(const char *string) /* duplicate memberlist */ struct ECPGstruct_member * -ECPGstruct_member_dup(struct ECPGstruct_member * rm) +ECPGstruct_member_dup(struct ECPGstruct_member *rm) { struct ECPGstruct_member *new = NULL; @@ -74,7 +74,7 @@ ECPGstruct_member_dup(struct ECPGstruct_member * rm) /* The NAME argument is copied. The type argument is preserved as a pointer. */ void -ECPGmake_struct_member(char *name, struct ECPGtype * type, struct ECPGstruct_member ** start) +ECPGmake_struct_member(char *name, struct ECPGtype *type, struct ECPGstruct_member **start) { struct ECPGstruct_member *ptr, *ne = @@ -108,7 +108,7 @@ ECPGmake_simple_type(enum ECPGttype type, char *size, int counter) } struct ECPGtype * -ECPGmake_array_type(struct ECPGtype * type, char *size) +ECPGmake_array_type(struct ECPGtype *type, char *size) { struct ECPGtype *ne = ECPGmake_simple_type(ECPGt_array, size, 0); @@ -118,7 +118,7 @@ ECPGmake_array_type(struct ECPGtype * type, char *size) } struct ECPGtype * -ECPGmake_struct_type(struct ECPGstruct_member * rm, enum ECPGttype type, char *type_name, char *struct_sizeof) +ECPGmake_struct_type(struct ECPGstruct_member *rm, enum ECPGttype type, char *type_name, char *struct_sizeof) { struct ECPGtype *ne = ECPGmake_simple_type(type, mm_strdup("1"), 0); @@ -175,7 +175,7 @@ get_type(enum ECPGttype type) break; case ECPGt_varchar: return ("ECPGt_varchar"); - case ECPGt_NO_INDICATOR: /* no indicator */ + case ECPGt_NO_INDICATOR: /* no indicator */ return ("ECPGt_NO_INDICATOR"); break; case ECPGt_char_variable: /* string that should not be quoted */ @@ -233,11 +233,11 @@ static void ECPGdump_a_simple(FILE *o, const char *name, enum ECPGttype type, char *varcharsize, char *arrsize, const char *size, const char *prefix, int); static void ECPGdump_a_struct(FILE *o, const char *name, const char *ind_name, char *arrsize, - struct ECPGtype * type, struct ECPGtype * ind_type, const char *prefix, const char *ind_prefix); + struct ECPGtype *type, struct ECPGtype *ind_type, const char *prefix, const char *ind_prefix); void -ECPGdump_a_type(FILE *o, const char *name, struct ECPGtype * type, const int brace_level, - const char *ind_name, struct ECPGtype * ind_type, const int ind_brace_level, +ECPGdump_a_type(FILE *o, const char *name, struct ECPGtype *type, const int brace_level, + const char *ind_name, struct ECPGtype *ind_type, const int ind_brace_level, const char *prefix, const char *ind_prefix, char *arr_str_size, const char *struct_sizeof, const char *ind_struct_sizeof) @@ -569,7 +569,7 @@ ECPGdump_a_simple(FILE *o, const char *name, enum ECPGttype type, /* Penetrate a struct and dump the contents. */ static void -ECPGdump_a_struct(FILE *o, const char *name, const char *ind_name, char *arrsize, struct ECPGtype * type, struct ECPGtype * ind_type, const char *prefix, const char *ind_prefix) +ECPGdump_a_struct(FILE *o, const char *name, const char *ind_name, char *arrsize, struct ECPGtype *type, struct ECPGtype *ind_type, const char *prefix, const char *ind_prefix) { /* * If offset is NULL, then this is the first recursive level. If not then @@ -617,7 +617,7 @@ ECPGdump_a_struct(FILE *o, const char *name, const char *ind_name, char *arrsize } void -ECPGfree_struct_member(struct ECPGstruct_member * rm) +ECPGfree_struct_member(struct ECPGstruct_member *rm) { while (rm) { @@ -631,7 +631,7 @@ ECPGfree_struct_member(struct ECPGstruct_member * rm) } void -ECPGfree_type(struct ECPGtype * type) +ECPGfree_type(struct ECPGtype *type) { if (!IS_SIMPLE_TYPE(type->type)) { diff --git a/src/interfaces/ecpg/preproc/variable.c b/src/interfaces/ecpg/preproc/variable.c index 232b940938..31225738e0 100644 --- a/src/interfaces/ecpg/preproc/variable.c +++ b/src/interfaces/ecpg/preproc/variable.c @@ -7,7 +7,7 @@ static struct variable *allvariables = NULL; struct variable * -new_variable(const char *name, struct ECPGtype * type, int brace_level) +new_variable(const char *name, struct ECPGtype *type, int brace_level) { struct variable *p = (struct variable *) mm_alloc(sizeof(struct variable)); @@ -22,7 +22,7 @@ new_variable(const char *name, struct ECPGtype * type, int brace_level) } static struct variable * -find_struct_member(char *name, char *str, struct ECPGstruct_member * members, int brace_level) +find_struct_member(char *name, char *str, struct ECPGstruct_member *members, int brace_level) { char *next = strpbrk(++str, ".-["), *end, @@ -376,7 +376,7 @@ reset_variables(void) * Note: The list is dumped from the end, * so we have to add new entries at the beginning */ void -add_variable_to_head(struct arguments ** list, struct variable * var, struct variable * ind) +add_variable_to_head(struct arguments **list, struct variable *var, struct variable *ind) { struct arguments *p = (struct arguments *) mm_alloc(sizeof(struct arguments)); @@ -388,7 +388,7 @@ add_variable_to_head(struct arguments ** list, struct variable * var, struct var /* Append a new variable to our request list. */ void -add_variable_to_tail(struct arguments ** list, struct variable * var, struct variable * ind) +add_variable_to_tail(struct arguments **list, struct variable *var, struct variable *ind) { struct arguments *p, *new = (struct arguments *) mm_alloc(sizeof(struct arguments)); @@ -406,7 +406,7 @@ add_variable_to_tail(struct arguments ** list, struct variable * var, struct var } void -remove_variable_from_list(struct arguments ** list, struct variable * var) +remove_variable_from_list(struct arguments **list, struct variable *var) { struct arguments *p, *prev = NULL; @@ -435,7 +435,7 @@ remove_variable_from_list(struct arguments ** list, struct variable * var) deletes the list as we go on. */ void -dump_variables(struct arguments * list, int mode) +dump_variables(struct arguments *list, int mode) { char *str_zero; @@ -464,7 +464,7 @@ dump_variables(struct arguments * list, int mode) } void -check_indicator(struct ECPGtype * var) +check_indicator(struct ECPGtype *var) { /* make sure this is a valid indicator variable */ switch (var->type) diff --git a/src/interfaces/ecpg/test/expected/compat_informix-test_informix2.c b/src/interfaces/ecpg/test/expected/compat_informix-test_informix2.c index 4476130689..98246f4734 100644 --- a/src/interfaces/ecpg/test/expected/compat_informix-test_informix2.c +++ b/src/interfaces/ecpg/test/expected/compat_informix-test_informix2.c @@ -29,7 +29,7 @@ #define SQLERRMC_LEN 150 #ifdef __cplusplus -extern "C" +extern "C" { #endif diff --git a/src/interfaces/ecpg/test/expected/preproc-init.c b/src/interfaces/ecpg/test/expected/preproc-init.c index 9e410ff155..6ca8d55901 100644 --- a/src/interfaces/ecpg/test/expected/preproc-init.c +++ b/src/interfaces/ecpg/test/expected/preproc-init.c @@ -23,7 +23,7 @@ #define SQLERRMC_LEN 150 #ifdef __cplusplus -extern "C" +extern "C" { #endif diff --git a/src/interfaces/ecpg/test/expected/preproc-outofscope.c b/src/interfaces/ecpg/test/expected/preproc-outofscope.c index 348e843328..70809c450d 100644 --- a/src/interfaces/ecpg/test/expected/preproc-outofscope.c +++ b/src/interfaces/ecpg/test/expected/preproc-outofscope.c @@ -62,7 +62,7 @@ typedef struct } decimal; #ifdef __cplusplus -extern "C" +extern "C" { #endif diff --git a/src/interfaces/ecpg/test/expected/sql-array.c b/src/interfaces/ecpg/test/expected/sql-array.c index 9128741dd3..4b0a0418f7 100644 --- a/src/interfaces/ecpg/test/expected/sql-array.c +++ b/src/interfaces/ecpg/test/expected/sql-array.c @@ -36,7 +36,7 @@ #define SQLERRMC_LEN 150 #ifdef __cplusplus -extern "C" +extern "C" { #endif diff --git a/src/interfaces/ecpg/test/expected/sql-code100.c b/src/interfaces/ecpg/test/expected/sql-code100.c index 3c8fea6216..4338f7ed2d 100644 --- a/src/interfaces/ecpg/test/expected/sql-code100.c +++ b/src/interfaces/ecpg/test/expected/sql-code100.c @@ -23,7 +23,7 @@ #define SQLERRMC_LEN 150 #ifdef __cplusplus -extern "C" +extern "C" { #endif diff --git a/src/interfaces/ecpg/test/expected/sql-copystdout.c b/src/interfaces/ecpg/test/expected/sql-copystdout.c index 62db9c1771..a1e7595873 100644 --- a/src/interfaces/ecpg/test/expected/sql-copystdout.c +++ b/src/interfaces/ecpg/test/expected/sql-copystdout.c @@ -25,7 +25,7 @@ #define SQLERRMC_LEN 150 #ifdef __cplusplus -extern "C" +extern "C" { #endif diff --git a/src/interfaces/ecpg/test/expected/sql-define.c b/src/interfaces/ecpg/test/expected/sql-define.c index ad6e317aac..9c9931f443 100644 --- a/src/interfaces/ecpg/test/expected/sql-define.c +++ b/src/interfaces/ecpg/test/expected/sql-define.c @@ -23,7 +23,7 @@ #define SQLERRMC_LEN 150 #ifdef __cplusplus -extern "C" +extern "C" { #endif diff --git a/src/interfaces/ecpg/test/expected/sql-dynalloc.c b/src/interfaces/ecpg/test/expected/sql-dynalloc.c index c78e13a3f6..d2051e6996 100644 --- a/src/interfaces/ecpg/test/expected/sql-dynalloc.c +++ b/src/interfaces/ecpg/test/expected/sql-dynalloc.c @@ -24,7 +24,7 @@ #define SQLERRMC_LEN 150 #ifdef __cplusplus -extern "C" +extern "C" { #endif diff --git a/src/interfaces/ecpg/test/expected/sql-dynalloc2.c b/src/interfaces/ecpg/test/expected/sql-dynalloc2.c index 9f74a0c5f9..2d25149cbb 100644 --- a/src/interfaces/ecpg/test/expected/sql-dynalloc2.c +++ b/src/interfaces/ecpg/test/expected/sql-dynalloc2.c @@ -24,7 +24,7 @@ #define SQLERRMC_LEN 150 #ifdef __cplusplus -extern "C" +extern "C" { #endif diff --git a/src/interfaces/ecpg/test/expected/sql-dyntest.c b/src/interfaces/ecpg/test/expected/sql-dyntest.c index 2cbc196009..ea0d859bd7 100644 --- a/src/interfaces/ecpg/test/expected/sql-dyntest.c +++ b/src/interfaces/ecpg/test/expected/sql-dyntest.c @@ -77,7 +77,7 @@ enum #define SQLERRMC_LEN 150 #ifdef __cplusplus -extern "C" +extern "C" { #endif diff --git a/src/interfaces/ecpg/test/expected/sql-indicators.c b/src/interfaces/ecpg/test/expected/sql-indicators.c index 6c8cffc249..454fba0dba 100644 --- a/src/interfaces/ecpg/test/expected/sql-indicators.c +++ b/src/interfaces/ecpg/test/expected/sql-indicators.c @@ -25,7 +25,7 @@ #define SQLERRMC_LEN 150 #ifdef __cplusplus -extern "C" +extern "C" { #endif diff --git a/src/interfaces/ecpg/test/expected/sql-sqlda.c b/src/interfaces/ecpg/test/expected/sql-sqlda.c index b470b04a6a..b6c35ab1a3 100644 --- a/src/interfaces/ecpg/test/expected/sql-sqlda.c +++ b/src/interfaces/ecpg/test/expected/sql-sqlda.c @@ -84,7 +84,7 @@ typedef struct } decimal; #ifdef __cplusplus -extern "C" +extern "C" { #endif diff --git a/src/interfaces/ecpg/test/expected/thread-alloc.c b/src/interfaces/ecpg/test/expected/thread-alloc.c index 49f1cd19c4..57ef2bcc63 100644 --- a/src/interfaces/ecpg/test/expected/thread-alloc.c +++ b/src/interfaces/ecpg/test/expected/thread-alloc.c @@ -46,7 +46,7 @@ main(void) #define SQLERRMC_LEN 150 #ifdef __cplusplus -extern "C" +extern "C" { #endif diff --git a/src/interfaces/ecpg/test/expected/thread-descriptor.c b/src/interfaces/ecpg/test/expected/thread-descriptor.c index e2be89dec0..50a7a31da4 100644 --- a/src/interfaces/ecpg/test/expected/thread-descriptor.c +++ b/src/interfaces/ecpg/test/expected/thread-descriptor.c @@ -37,7 +37,7 @@ #define SQLERRMC_LEN 150 #ifdef __cplusplus -extern "C" +extern "C" { #endif diff --git a/src/interfaces/ecpg/test/expected/thread-prep.c b/src/interfaces/ecpg/test/expected/thread-prep.c index 4d06b90b98..382e214879 100644 --- a/src/interfaces/ecpg/test/expected/thread-prep.c +++ b/src/interfaces/ecpg/test/expected/thread-prep.c @@ -46,7 +46,7 @@ main(void) #define SQLERRMC_LEN 150 #ifdef __cplusplus -extern "C" +extern "C" { #endif diff --git a/src/interfaces/ecpg/test/regression.h b/src/interfaces/ecpg/test/regression.h index 4aa13b6fb2..6b7fba1bfd 100644 --- a/src/interfaces/ecpg/test/regression.h +++ b/src/interfaces/ecpg/test/regression.h @@ -1,5 +1,5 @@ -exec sql define REGRESSDB1 ecpg1_regression; -exec sql define REGRESSDB2 ecpg2_regression; +exec sql define REGRESSDB1 ecpg1_regression; +exec sql define REGRESSDB2 ecpg2_regression; -exec sql define REGRESSUSER1 regress_ecpg_user1; -exec sql define REGRESSUSER2 regress_ecpg_user2; +exec sql define REGRESSUSER1 regress_ecpg_user1; +exec sql define REGRESSUSER2 regress_ecpg_user2; diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index 02ec8f0cea..3d5966586d 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -349,8 +349,8 @@ static int uri_prefix_length(const char *connstr); static bool recognized_connection_string(const char *connstr); static PQconninfoOption *conninfo_parse(const char *conninfo, PQExpBuffer errorMessage, bool use_defaults); -static PQconninfoOption *conninfo_array_parse(const char *const * keywords, - const char *const * values, PQExpBuffer errorMessage, +static PQconninfoOption *conninfo_array_parse(const char *const *keywords, + const char *const *values, PQExpBuffer errorMessage, bool use_defaults, int expand_dbname); static bool conninfo_add_defaults(PQconninfoOption *options, PQExpBuffer errorMessage); @@ -507,8 +507,8 @@ pqDropConnection(PGconn *conn, bool flushInput) * call succeeded. */ PGconn * -PQconnectdbParams(const char *const * keywords, - const char *const * values, +PQconnectdbParams(const char *const *keywords, + const char *const *values, int expand_dbname) { PGconn *conn = PQconnectStartParams(keywords, values, expand_dbname); @@ -526,8 +526,8 @@ PQconnectdbParams(const char *const * keywords, * check server status, accepting parameters identical to PQconnectdbParams */ PGPing -PQpingParams(const char *const * keywords, - const char *const * values, +PQpingParams(const char *const *keywords, + const char *const *values, int expand_dbname) { PGconn *conn = PQconnectStartParams(keywords, values, expand_dbname); @@ -610,8 +610,8 @@ PQping(const char *conninfo) * See PQconnectPoll for more info. */ PGconn * -PQconnectStartParams(const char *const * keywords, - const char *const * values, +PQconnectStartParams(const char *const *keywords, + const char *const *values, int expand_dbname) { PGconn *conn; @@ -2280,7 +2280,7 @@ keep_going: /* We will come back to here until there is /* Fill in the client address */ conn->laddr.salen = sizeof(conn->laddr.addr); if (getsockname(conn->sock, - (struct sockaddr *) & conn->laddr.addr, + (struct sockaddr *) &conn->laddr.addr, &conn->laddr.salen) < 0) { appendPQExpBuffer(&conn->errorMessage, @@ -3740,7 +3740,7 @@ internal_cancel(SockAddr *raddr, int be_pid, int be_key, goto cancel_errReturn; } retry3: - if (connect(tmpsock, (struct sockaddr *) & raddr->addr, + if (connect(tmpsock, (struct sockaddr *) &raddr->addr, raddr->salen) < 0) { if (SOCK_ERRNO == EINTR) @@ -4926,7 +4926,7 @@ conninfo_parse(const char *conninfo, PQExpBuffer errorMessage, * a database, in-tree code first wraps the name in a connection string. */ static PQconninfoOption * -conninfo_array_parse(const char *const * keywords, const char *const * values, +conninfo_array_parse(const char *const *keywords, const char *const *values, PQExpBuffer errorMessage, bool use_defaults, int expand_dbname) { diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c index 9decd5339e..4391d8c05b 100644 --- a/src/interfaces/libpq/fe-exec.c +++ b/src/interfaces/libpq/fe-exec.c @@ -58,7 +58,7 @@ static int PQsendQueryGuts(PGconn *conn, const char *stmtName, int nParams, const Oid *paramTypes, - const char *const * paramValues, + const char *const *paramValues, const int *paramLengths, const int *paramFormats, int resultFormat); @@ -940,7 +940,7 @@ pqSaveParameterStatus(PGconn *conn, const char *name, const char *value) * Store new info as a single malloc block */ pstatus = (pgParameterStatus *) malloc(sizeof(pgParameterStatus) + - strlen(name) +strlen(value) + 2); + strlen(name) + strlen(value) + 2); if (pstatus) { char *ptr; @@ -1184,7 +1184,7 @@ PQsendQueryParams(PGconn *conn, const char *command, int nParams, const Oid *paramTypes, - const char *const * paramValues, + const char *const *paramValues, const int *paramLengths, const int *paramFormats, int resultFormat) @@ -1325,7 +1325,7 @@ int PQsendQueryPrepared(PGconn *conn, const char *stmtName, int nParams, - const char *const * paramValues, + const char *const *paramValues, const int *paramLengths, const int *paramFormats, int resultFormat) @@ -1408,7 +1408,7 @@ PQsendQueryGuts(PGconn *conn, const char *stmtName, int nParams, const Oid *paramTypes, - const char *const * paramValues, + const char *const *paramValues, const int *paramLengths, const int *paramFormats, int resultFormat) @@ -1861,7 +1861,7 @@ PQexecParams(PGconn *conn, const char *command, int nParams, const Oid *paramTypes, - const char *const * paramValues, + const char *const *paramValues, const int *paramLengths, const int *paramFormats, int resultFormat) @@ -1907,7 +1907,7 @@ PGresult * PQexecPrepared(PGconn *conn, const char *stmtName, int nParams, - const char *const * paramValues, + const char *const *paramValues, const int *paramLengths, const int *paramFormats, int resultFormat) diff --git a/src/interfaces/libpq/fe-print.c b/src/interfaces/libpq/fe-print.c index fa974540f5..d7a7414901 100644 --- a/src/interfaces/libpq/fe-print.c +++ b/src/interfaces/libpq/fe-print.c @@ -326,7 +326,7 @@ static void do_field(const PQprintOpt *po, const PGresult *res, const int i, const int j, const int fs_len, char **fields, - const int nFields, char const ** fieldNames, + const int nFields, char const **fieldNames, unsigned char *fieldNotNum, int *fieldMax, const int fieldMaxLen, FILE *fout) { diff --git a/src/interfaces/libpq/fe-secure-openssl.c b/src/interfaces/libpq/fe-secure-openssl.c index a7c3d7af64..e21bb5ad7d 100644 --- a/src/interfaces/libpq/fe-secure-openssl.c +++ b/src/interfaces/libpq/fe-secure-openssl.c @@ -909,7 +909,7 @@ initialize_SSL(PGconn *conn) !(conn->sslrootcert && strlen(conn->sslrootcert) > 0) || !(conn->sslcrl && strlen(conn->sslcrl) > 0)) have_homedir = pqGetHomeDirectory(homedir, sizeof(homedir)); - else /* won't need it */ + else /* won't need it */ have_homedir = false; /* diff --git a/src/interfaces/libpq/libpq-events.h b/src/interfaces/libpq/libpq-events.h index b7cd472dea..b08419a0f6 100644 --- a/src/interfaces/libpq/libpq-events.h +++ b/src/interfaces/libpq/libpq-events.h @@ -19,7 +19,7 @@ #include "libpq-fe.h" #ifdef __cplusplus -extern "C" +extern "C" { #endif diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h index e7496c59db..3d55a3da29 100644 --- a/src/interfaces/libpq/libpq-fe.h +++ b/src/interfaces/libpq/libpq-fe.h @@ -16,7 +16,7 @@ #define LIBPQ_FE_H #ifdef __cplusplus -extern "C" +extern "C" { #endif @@ -253,14 +253,14 @@ typedef struct pgresAttDesc /* make a new client connection to the backend */ /* Asynchronous (non-blocking) */ extern PGconn *PQconnectStart(const char *conninfo); -extern PGconn *PQconnectStartParams(const char *const * keywords, - const char *const * values, int expand_dbname); +extern PGconn *PQconnectStartParams(const char *const *keywords, + const char *const *values, int expand_dbname); extern PostgresPollingStatusType PQconnectPoll(PGconn *conn); /* Synchronous (blocking) */ extern PGconn *PQconnectdb(const char *conninfo); -extern PGconn *PQconnectdbParams(const char *const * keywords, - const char *const * values, int expand_dbname); +extern PGconn *PQconnectdbParams(const char *const *keywords, + const char *const *values, int expand_dbname); extern PGconn *PQsetdbLogin(const char *pghost, const char *pgport, const char *pgoptions, const char *pgtty, const char *dbName, @@ -333,7 +333,7 @@ extern int PQsetClientEncoding(PGconn *conn, const char *encoding); extern int PQsslInUse(PGconn *conn); extern void *PQsslStruct(PGconn *conn, const char *struct_name); extern const char *PQsslAttribute(PGconn *conn, const char *attribute_name); -extern const char *const * PQsslAttributeNames(PGconn *conn); +extern const char *const *PQsslAttributeNames(PGconn *conn); /* Get the OpenSSL structure associated with a connection. Returns NULL for * unencrypted connections or if any other TLS library is in use. */ @@ -383,7 +383,7 @@ extern PGresult *PQexecParams(PGconn *conn, const char *command, int nParams, const Oid *paramTypes, - const char *const * paramValues, + const char *const *paramValues, const int *paramLengths, const int *paramFormats, int resultFormat); @@ -393,7 +393,7 @@ extern PGresult *PQprepare(PGconn *conn, const char *stmtName, extern PGresult *PQexecPrepared(PGconn *conn, const char *stmtName, int nParams, - const char *const * paramValues, + const char *const *paramValues, const int *paramLengths, const int *paramFormats, int resultFormat); @@ -404,7 +404,7 @@ extern int PQsendQueryParams(PGconn *conn, const char *command, int nParams, const Oid *paramTypes, - const char *const * paramValues, + const char *const *paramValues, const int *paramLengths, const int *paramFormats, int resultFormat); @@ -414,7 +414,7 @@ extern int PQsendPrepare(PGconn *conn, const char *stmtName, extern int PQsendQueryPrepared(PGconn *conn, const char *stmtName, int nParams, - const char *const * paramValues, + const char *const *paramValues, const int *paramLengths, const int *paramFormats, int resultFormat); @@ -445,8 +445,8 @@ extern int PQsetnonblocking(PGconn *conn, int arg); extern int PQisnonblocking(const PGconn *conn); extern int PQisthreadsafe(void); extern PGPing PQping(const char *conninfo); -extern PGPing PQpingParams(const char *const * keywords, - const char *const * values, int expand_dbname); +extern PGPing PQpingParams(const char *const *keywords, + const char *const *values, int expand_dbname); /* Force the write buffer to be written (or at least try) */ extern int PQflush(PGconn *conn); diff --git a/src/interfaces/libpq/win32.c b/src/interfaces/libpq/win32.c index f99f9a8cdb..8818fc9a6d 100644 --- a/src/interfaces/libpq/win32.c +++ b/src/interfaces/libpq/win32.c @@ -44,7 +44,7 @@ static struct WSErrorEntry { DWORD error; const char *description; -} WSErrors[] = +} WSErrors[] = { { @@ -236,7 +236,7 @@ struct MessageDLL const char *dll_name; void *handle; int loaded; /* BOOL */ -} dlls[] = +} dlls[] = { { diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c index ce72dd488e..5b0d5aa8e8 100644 --- a/src/pl/plperl/plperl.c +++ b/src/pl/plperl/plperl.c @@ -2443,7 +2443,7 @@ plperl_trigger_handler(PG_FUNCTION_ARGS) HV *hvTD; ErrorContextCallback pl_error_context; TriggerData *tdata; - int rc PG_USED_FOR_ASSERTS_ONLY; + int rc PG_USED_FOR_ASSERTS_ONLY; /* Connect to SPI manager */ if (SPI_connect() != SPI_OK_CONNECT) diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c index cc093556e5..aeb8e4dfe7 100644 --- a/src/pl/plpgsql/src/pl_comp.c +++ b/src/pl/plpgsql/src/pl_comp.c @@ -501,7 +501,7 @@ do_compile(FunctionCallInfo fcinfo, rettypeid = INT4ARRAYOID; else if (rettypeid == ANYRANGEOID) rettypeid = INT4RANGEOID; - else /* ANYELEMENT or ANYNONARRAY */ + else /* ANYELEMENT or ANYNONARRAY */ rettypeid = INT4OID; /* XXX what could we use for ANYENUM? */ } @@ -2520,7 +2520,7 @@ plpgsql_resolve_polymorphic_argtypes(int numargs, { case ANYELEMENTOID: case ANYNONARRAYOID: - case ANYENUMOID: /* XXX dubious */ + case ANYENUMOID: /* XXX dubious */ argtypes[i] = INT4OID; break; case ANYARRAYOID: diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c index 7a40c99ce0..da86702bdd 100644 --- a/src/pl/plpgsql/src/pl_exec.c +++ b/src/pl/plpgsql/src/pl_exec.c @@ -5095,7 +5095,7 @@ plpgsql_exec_get_datum_type_info(PLpgSQL_execstate *estate, *typmod = -1; if (fno > 0) *collation = rec->tupdesc->attrs[fno - 1]->attcollation; - else /* no system column types have collation */ + else /* no system column types have collation */ *collation = InvalidOid; break; } diff --git a/src/pl/plpgsql/src/pl_funcs.c b/src/pl/plpgsql/src/pl_funcs.c index 93f89814b3..cd44a8e9a3 100644 --- a/src/pl/plpgsql/src/pl_funcs.c +++ b/src/pl/plpgsql/src/pl_funcs.c @@ -99,7 +99,7 @@ plpgsql_ns_additem(PLpgSQL_nsitem_type itemtype, int itemno, const char *name) /* first item added must be a label */ Assert(ns_top != NULL || itemtype == PLPGSQL_NSTYPE_LABEL); - nse = palloc(offsetof(PLpgSQL_nsitem, name) +strlen(name) + 1); + nse = palloc(offsetof(PLpgSQL_nsitem, name) + strlen(name) + 1); nse->itemtype = itemtype; nse->itemno = itemno; nse->prev = ns_top; diff --git a/src/pl/plpgsql/src/plpgsql.h b/src/pl/plpgsql/src/plpgsql.h index 43e7eb317b..0f790ee536 100644 --- a/src/pl/plpgsql/src/plpgsql.h +++ b/src/pl/plpgsql/src/plpgsql.h @@ -977,7 +977,7 @@ typedef struct PLpgSQL_plugin /* Function pointers set by PL/pgSQL itself */ void (*error_callback) (void *arg); void (*assign_expr) (PLpgSQL_execstate *estate, PLpgSQL_datum *target, - PLpgSQL_expr *expr); + PLpgSQL_expr *expr); } PLpgSQL_plugin; /* diff --git a/src/pl/plpython/plpy_exec.c b/src/pl/plpython/plpy_exec.c index aa4d68664f..a1ecc6d2a4 100644 --- a/src/pl/plpython/plpy_exec.c +++ b/src/pl/plpython/plpy_exec.c @@ -345,7 +345,7 @@ PLy_exec_trigger(FunctionCallInfo fcinfo, PLyProcedure *proc) PG_TRY(); { - int rc PG_USED_FOR_ASSERTS_ONLY; + int rc PG_USED_FOR_ASSERTS_ONLY; rc = SPI_register_trigger_data(tdata); Assert(rc >= 0); diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c index ae9ba80cf7..89bb46fb4a 100644 --- a/src/pl/tcl/pltcl.c +++ b/src/pl/tcl/pltcl.c @@ -1039,7 +1039,7 @@ pltcl_trigger_handler(PG_FUNCTION_ARGS, pltcl_call_state *call_state, const char *result; int result_Objc; Tcl_Obj **result_Objv; - int rc PG_USED_FOR_ASSERTS_ONLY; + int rc PG_USED_FOR_ASSERTS_ONLY; call_state->trigdata = trigdata; diff --git a/src/port/crypt.c b/src/port/crypt.c index 6a902ef0fc..9fc7abe10a 100644 --- a/src/port/crypt.c +++ b/src/port/crypt.c @@ -307,6 +307,7 @@ unsigned char *cp; C_block *out; C_block *p; int chars_in; + { DCL_BLOCK(D, D0, D1); C_block *tp; @@ -977,6 +978,7 @@ C_block perm[64 / CHUNKBITS][1 << CHUNKBITS]; unsigned char p[64]; int chars_in, chars_out; + { int i, j, @@ -1068,6 +1070,7 @@ prtab(s, t, num_rows) char *s; unsigned char *t; int num_rows; + { int i, j; diff --git a/src/port/dirmod.c b/src/port/dirmod.c index bf34835941..98e74f25b0 100644 --- a/src/port/dirmod.c +++ b/src/port/dirmod.c @@ -365,7 +365,7 @@ pgwin32_is_junction(const char *path) * to update this field. */ int -pgwin32_safestat(const char *path, struct stat * buf) +pgwin32_safestat(const char *path, struct stat *buf) { int r; WIN32_FILE_ATTRIBUTE_DATA attr; diff --git a/src/port/getaddrinfo.c b/src/port/getaddrinfo.c index c0e4b33e20..ff85db4b54 100644 --- a/src/port/getaddrinfo.c +++ b/src/port/getaddrinfo.c @@ -40,17 +40,17 @@ * Here we need to declare what the function pointers look like */ typedef int (__stdcall * getaddrinfo_ptr_t) (const char *nodename, - const char *servname, - const struct addrinfo * hints, - struct addrinfo ** res); + const char *servname, + const struct addrinfo *hints, + struct addrinfo **res); -typedef void (__stdcall * freeaddrinfo_ptr_t) (struct addrinfo * ai); +typedef void (__stdcall * freeaddrinfo_ptr_t) (struct addrinfo *ai); -typedef int (__stdcall * getnameinfo_ptr_t) (const struct sockaddr * sa, - int salen, - char *host, int hostlen, - char *serv, int servlen, - int flags); +typedef int (__stdcall * getnameinfo_ptr_t) (const struct sockaddr *sa, + int salen, + char *host, int hostlen, + char *serv, int servlen, + int flags); /* static pointers to the native routines, so we only do the lookup once. */ static getaddrinfo_ptr_t getaddrinfo_ptr = NULL; @@ -135,8 +135,8 @@ haveNativeWindowsIPv6routines(void) */ int getaddrinfo(const char *node, const char *service, - const struct addrinfo * hintp, - struct addrinfo ** res) + const struct addrinfo *hintp, + struct addrinfo **res) { struct addrinfo *ai; struct sockaddr_in sin, @@ -262,7 +262,7 @@ getaddrinfo(const char *node, const char *service, void -freeaddrinfo(struct addrinfo * res) +freeaddrinfo(struct addrinfo *res) { if (res) { @@ -354,7 +354,7 @@ gai_strerror(int errcode) * - No IPv6 support. */ int -getnameinfo(const struct sockaddr * sa, int salen, +getnameinfo(const struct sockaddr *sa, int salen, char *node, int nodelen, char *service, int servicelen, int flags) { diff --git a/src/port/getopt.c b/src/port/getopt.c index f1ad93d7d6..54c46ea366 100644 --- a/src/port/getopt.c +++ b/src/port/getopt.c @@ -69,7 +69,7 @@ char *optarg; /* argument associated with option */ * returning -1.) */ int -getopt(int nargc, char *const * nargv, const char *ostr) +getopt(int nargc, char *const *nargv, const char *ostr) { static char *place = EMSG; /* option letter processing */ char *oli; /* option letter list index */ diff --git a/src/port/getopt_long.c b/src/port/getopt_long.c index aa5b7319fd..0f589d631b 100644 --- a/src/port/getopt_long.c +++ b/src/port/getopt_long.c @@ -56,7 +56,7 @@ int getopt_long(int argc, char *const argv[], const char *optstring, - const struct option * longopts, int *longindex) + const struct option *longopts, int *longindex) { static char *place = EMSG; /* option letter processing */ char *oli; /* option letter list index */ diff --git a/src/port/getrusage.c b/src/port/getrusage.c index 71fce75722..2ef7e09967 100644 --- a/src/port/getrusage.c +++ b/src/port/getrusage.c @@ -28,7 +28,7 @@ */ int -getrusage(int who, struct rusage * rusage) +getrusage(int who, struct rusage *rusage) { #ifdef WIN32 FILETIME starttime; diff --git a/src/port/gettimeofday.c b/src/port/gettimeofday.c index af1157134b..f84d4e096a 100644 --- a/src/port/gettimeofday.c +++ b/src/port/gettimeofday.c @@ -45,7 +45,7 @@ static const unsigned __int64 epoch = UINT64CONST(116444736000000000); * signature, so we can just store a pointer to whichever we find. This * is the pointer's type. */ -typedef VOID(WINAPI * PgGetSystemTimeFn) (LPFILETIME); +typedef VOID(WINAPI * PgGetSystemTimeFn) (LPFILETIME); /* One-time initializer function, must match that signature. */ static void WINAPI init_gettimeofday(LPFILETIME lpSystemTimeAsFileTime); @@ -102,7 +102,7 @@ init_gettimeofday(LPFILETIME lpSystemTimeAsFileTime) * elapsed_time(). */ int -gettimeofday(struct timeval * tp, struct timezone * tzp) +gettimeofday(struct timeval *tp, struct timezone *tzp) { FILETIME file_time; ULARGE_INTEGER ularge; diff --git a/src/port/inet_aton.c b/src/port/inet_aton.c index 27e8aaa4ec..68efd4723e 100644 --- a/src/port/inet_aton.c +++ b/src/port/inet_aton.c @@ -51,7 +51,7 @@ * cannot distinguish between failure and a local broadcast address. */ int -inet_aton(const char *cp, struct in_addr * addr) +inet_aton(const char *cp, struct in_addr *addr) { unsigned int val; int base, @@ -120,22 +120,22 @@ inet_aton(const char *cp, struct in_addr * addr) switch (n) { - case 1: /* a -- 32 bits */ + case 1: /* a -- 32 bits */ break; - case 2: /* a.b -- 8.24 bits */ + case 2: /* a.b -- 8.24 bits */ if (val > 0xffffff) return 0; val |= parts[0] << 24; break; - case 3: /* a.b.c -- 8.8.16 bits */ + case 3: /* a.b.c -- 8.8.16 bits */ if (val > 0xffff) return 0; val |= (parts[0] << 24) | (parts[1] << 16); break; - case 4: /* a.b.c.d -- 8.8.8.8 bits */ + case 4: /* a.b.c.d -- 8.8.8.8 bits */ if (val > 0xff) return 0; val |= (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8); diff --git a/src/port/mkdtemp.c b/src/port/mkdtemp.c index f6316562e8..0aafb0d687 100644 --- a/src/port/mkdtemp.c +++ b/src/port/mkdtemp.c @@ -207,7 +207,7 @@ GETTEMP(char *path, int *doopen, int domkdir) if (isdigit((unsigned char) *trv)) *trv = 'a'; else - ++* trv; + ++*trv; break; } } diff --git a/src/port/thread.c b/src/port/thread.c index b54c871b00..a3f37b1237 100644 --- a/src/port/thread.c +++ b/src/port/thread.c @@ -92,8 +92,8 @@ pqStrerror(int errnum, char *strerrbuf, size_t buflen) */ #ifndef WIN32 int -pqGetpwuid(uid_t uid, struct passwd * resultbuf, char *buffer, - size_t buflen, struct passwd ** result) +pqGetpwuid(uid_t uid, struct passwd *resultbuf, char *buffer, + size_t buflen, struct passwd **result) { #if defined(FRONTEND) && defined(ENABLE_THREAD_SAFETY) && defined(HAVE_GETPWUID_R) return getpwuid_r(uid, resultbuf, buffer, buflen, result); @@ -115,9 +115,9 @@ pqGetpwuid(uid_t uid, struct passwd * resultbuf, char *buffer, #ifndef HAVE_GETADDRINFO int pqGethostbyname(const char *name, - struct hostent * resultbuf, + struct hostent *resultbuf, char *buffer, size_t buflen, - struct hostent ** result, + struct hostent **result, int *herrno) { #if defined(FRONTEND) && defined(ENABLE_THREAD_SAFETY) && defined(HAVE_GETHOSTBYNAME_R) diff --git a/src/port/win32error.c b/src/port/win32error.c index 40655962a8..fe07f6e0a2 100644 --- a/src/port/win32error.c +++ b/src/port/win32error.c @@ -21,7 +21,7 @@ static const struct { DWORD winerr; int doserr; -} doserrors[] = +} doserrors[] = { { diff --git a/src/port/win32setlocale.c b/src/port/win32setlocale.c index cbf109836b..c4da4a8f92 100644 --- a/src/port/win32setlocale.c +++ b/src/port/win32setlocale.c @@ -104,7 +104,7 @@ static const struct locale_map locale_map_result[] = { #define MAX_LOCALE_NAME_LEN 100 static const char * -map_locale(const struct locale_map * map, const char *locale) +map_locale(const struct locale_map *map, const char *locale) { static char aliasbuf[MAX_LOCALE_NAME_LEN]; int i; diff --git a/src/test/modules/worker_spi/worker_spi.c b/src/test/modules/worker_spi/worker_spi.c index 553baf0045..d6390ac648 100644 --- a/src/test/modules/worker_spi/worker_spi.c +++ b/src/test/modules/worker_spi/worker_spi.c @@ -137,7 +137,7 @@ initialize_worker_spi(worktable *table) appendStringInfo(&buf, "CREATE SCHEMA \"%s\" " "CREATE TABLE \"%s\" (" - " type text CHECK (type IN ('total', 'delta')), " + " type text CHECK (type IN ('total', 'delta')), " " value integer)" "CREATE UNIQUE INDEX \"%s_unique_total\" ON \"%s\" (type) " "WHERE type = 'total'", diff --git a/src/test/regress/pg_regress.h b/src/test/regress/pg_regress.h index f7745b16e1..4abfc628e5 100644 --- a/src/test/regress/pg_regress.h +++ b/src/test/regress/pg_regress.h @@ -26,9 +26,9 @@ typedef struct _stringlist } _stringlist; typedef PID_TYPE(*test_function) (const char *, - _stringlist **, - _stringlist **, - _stringlist **); + _stringlist **, + _stringlist **, + _stringlist **); typedef void (*init_function) (int argc, char **argv); extern char *bindir; diff --git a/src/test/regress/regress.c b/src/test/regress/regress.c index 6b1310344b..e408e5ea4c 100644 --- a/src/test/regress/regress.c +++ b/src/test/regress/regress.c @@ -630,7 +630,7 @@ ttdummy(PG_FUNCTION_ARGS) /* Tuple to return to upper Executor ... */ if (newtuple) /* UPDATE */ rettuple = SPI_modifytuple(rel, trigtuple, 1, &(attnum[1]), &newoff, NULL); - else /* DELETE */ + else /* DELETE */ rettuple = trigtuple; SPI_finish(); /* don't forget say Bye to SPI mgr */ diff --git a/src/timezone/localtime.c b/src/timezone/localtime.c index a2faa82ac8..76d96ff631 100644 --- a/src/timezone/localtime.c +++ b/src/timezone/localtime.c @@ -112,7 +112,7 @@ static struct pg_tm tm; /* Initialize *S to a value based on GMTOFF, ISDST, and ABBRIND. */ static void -init_ttinfo(struct ttinfo * s, int32 gmtoff, bool isdst, int abbrind) +init_ttinfo(struct ttinfo *s, int32 gmtoff, bool isdst, int abbrind) { s->tt_gmtoff = gmtoff; s->tt_isdst = isdst; @@ -189,7 +189,7 @@ union input_buffer /* The entire buffer. */ char buf[2 * sizeof(struct tzhead) + 2 * sizeof(struct state) - + 4 * TZ_MAX_TIMES]; + + 4 * TZ_MAX_TIMES]; }; /* Local storage needed for 'tzloadbody'. */ @@ -215,8 +215,8 @@ union local_storage * given name is stored there (the buffer must be > TZ_STRLEN_MAX bytes!). */ static int -tzloadbody(char const * name, char *canonname, struct state * sp, bool doextend, - union local_storage * lsp) +tzloadbody(char const *name, char *canonname, struct state *sp, bool doextend, + union local_storage *lsp) { int i; int fid; @@ -553,7 +553,7 @@ tzloadbody(char const * name, char *canonname, struct state * sp, bool doextend, * given name is stored there (the buffer must be > TZ_STRLEN_MAX bytes!). */ int -tzload(const char *name, char *canonname, struct state * sp, bool doextend) +tzload(const char *name, char *canonname, struct state *sp, bool doextend) { union local_storage *lsp = malloc(sizeof *lsp); @@ -569,7 +569,7 @@ tzload(const char *name, char *canonname, struct state * sp, bool doextend) } static bool -typesequiv(const struct state * sp, int a, int b) +typesequiv(const struct state *sp, int a, int b) { bool result; @@ -737,7 +737,7 @@ getoffset(const char *strp, int32 *offsetp) * Otherwise, return a pointer to the first character not part of the rule. */ static const char * -getrule(const char *strp, struct rule * rulep) +getrule(const char *strp, struct rule *rulep) { if (*strp == 'J') { @@ -797,7 +797,7 @@ getrule(const char *strp, struct rule * rulep) * effect, calculate the year-relative time that rule takes effect. */ static int32 -transtime(int year, const struct rule * rulep, +transtime(int year, const struct rule *rulep, int32 offset) { bool leapyear; @@ -894,7 +894,7 @@ transtime(int year, const struct rule * rulep, * Returns true on success, false on failure. */ bool -tzparse(const char *name, struct state * sp, bool lastditch) +tzparse(const char *name, struct state *sp, bool lastditch) { const char *stdname; const char *dstname = NULL; @@ -1217,7 +1217,7 @@ tzparse(const char *name, struct state * sp, bool lastditch) } static void -gmtload(struct state * sp) +gmtload(struct state *sp) { if (tzload(gmt, NULL, sp, true) != 0) tzparse(gmt, sp, true); @@ -1231,8 +1231,8 @@ gmtload(struct state * sp) * but it *is* desirable.) */ static struct pg_tm * -localsub(struct state const * sp, pg_time_t const * timep, - struct pg_tm * tmp) +localsub(struct state const *sp, pg_time_t const *timep, + struct pg_tm *tmp) { const struct ttinfo *ttisp; int i; @@ -1323,7 +1323,7 @@ pg_localtime(const pg_time_t *timep, const pg_tz *tz) * Except we have a private "struct state" for GMT, so no sp is passed in. */ static struct pg_tm * -gmtsub(pg_time_t const * timep, int32 offset, struct pg_tm * tmp) +gmtsub(pg_time_t const *timep, int32 offset, struct pg_tm *tmp) { struct pg_tm *result; @@ -1370,7 +1370,7 @@ leaps_thru_end_of(const int y) static struct pg_tm * timesub(const pg_time_t *timep, int32 offset, - const struct state * sp, struct pg_tm * tmp) + const struct state *sp, struct pg_tm *tmp) { const struct lsinfo *lp; pg_time_t tdays; diff --git a/src/timezone/pgtz.h b/src/timezone/pgtz.h index cd193b8255..f5aec6e529 100644 --- a/src/timezone/pgtz.h +++ b/src/timezone/pgtz.h @@ -50,7 +50,7 @@ struct state unsigned char types[TZ_MAX_TIMES]; struct ttinfo ttis[TZ_MAX_TYPES]; char chars[BIGGEST(BIGGEST(TZ_MAX_CHARS + 1, 3 /* sizeof gmt */ ), - (2 * (TZ_STRLEN_MAX + 1)))]; + (2 * (TZ_STRLEN_MAX + 1)))]; struct lsinfo lsis[TZ_MAX_LEAPS]; int defaulttype; /* for early times or if no transitions */ }; @@ -68,8 +68,8 @@ struct pg_tz extern int pg_open_tzfile(const char *name, char *canonname); /* in localtime.c */ -extern int tzload(const char *name, char *canonname, struct state * sp, +extern int tzload(const char *name, char *canonname, struct state *sp, bool doextend); -extern bool tzparse(const char *name, struct state * sp, bool lastditch); +extern bool tzparse(const char *name, struct state *sp, bool lastditch); #endif /* _PGTZ_H */ diff --git a/src/timezone/strftime.c b/src/timezone/strftime.c index 3f6ba395c6..9c9baee0b1 100644 --- a/src/timezone/strftime.c +++ b/src/timezone/strftime.c @@ -120,7 +120,7 @@ static char *_yconv(int, int, bool, bool, char *, const char *); size_t pg_strftime(char *s, size_t maxsize, const char *format, - const struct pg_tm * t) + const struct pg_tm *t) { char *p; int warn; @@ -134,7 +134,7 @@ pg_strftime(char *s, size_t maxsize, const char *format, } static char * -_fmt(const char *format, const struct pg_tm * t, char *pt, const char *ptlim, +_fmt(const char *format, const struct pg_tm *t, char *pt, const char *ptlim, int *warnp) { for (; *format; ++format) diff --git a/src/timezone/zic.c b/src/timezone/zic.c index 5fa0a81262..a38cadff58 100644 --- a/src/timezone/zic.c +++ b/src/timezone/zic.c @@ -137,9 +137,9 @@ static char lowerit(char); static void mkdirs(char const *, bool); static void newabbr(const char *abbr); static zic_t oadd(zic_t t1, zic_t t2); -static void outzone(const struct zone * zp, ptrdiff_t ntzones); -static zic_t rpytime(const struct rule * rp, zic_t wantedy); -static void rulesub(struct rule * rp, +static void outzone(const struct zone *zp, ptrdiff_t ntzones); +static zic_t rpytime(const struct rule *rp, zic_t wantedy); +static void rulesub(struct rule *rp, const char *loyearp, const char *hiyearp, const char *typep, const char *monthp, const char *dayp, const char *timep); @@ -291,7 +291,7 @@ struct lookup }; static struct lookup const *byword(const char *string, - const struct lookup * lp); + const struct lookup *lp); static struct lookup const line_codes[] = { {"Rule", LC_RULE}, @@ -372,7 +372,7 @@ static struct attype zic_t at; bool dontmerge; unsigned char type; -} *attypes; +} *attypes; static zic_t gmtoffs[TZ_MAX_TYPES]; static char isdsts[TZ_MAX_TYPES]; static unsigned char abbrinds[TZ_MAX_TYPES]; @@ -423,7 +423,7 @@ erealloc(void *ptr, size_t size) } static char * -ecpyalloc(char const * str) +ecpyalloc(char const *str) { return memcheck(strdup(str)); } @@ -449,7 +449,7 @@ growalloc(void *ptr, size_t itemsize, ptrdiff_t nitems, ptrdiff_t *nitems_alloc) */ static void -eats(char const * name, lineno_t num, char const * rname, lineno_t rnum) +eats(char const *name, lineno_t num, char const *rname, lineno_t rnum) { filename = name; linenum = num; @@ -458,7 +458,7 @@ eats(char const * name, lineno_t num, char const * rname, lineno_t rnum) } static void -eat(char const * name, lineno_t num) +eat(char const *name, lineno_t num) { eats(name, num, NULL, -1); } @@ -503,7 +503,7 @@ warning(const char *string,...) } static void -close_file(FILE *stream, char const * dir, char const * name) +close_file(FILE *stream, char const *dir, char const *name) { char const *e = (ferror(stream) ? _("I/O error") : fclose(stream) != 0 ? strerror(errno) : NULL); @@ -536,7 +536,7 @@ usage(FILE *stream, int status) ancestors. After this is done, all files are accessed with names relative to DIR. */ static void -change_directory(char const * dir) +change_directory(char const *dir) { if (chdir(dir) != 0) { @@ -720,8 +720,8 @@ main(int argc, char *argv[]) } static bool -componentcheck(char const * name, char const * component, - char const * component_end) +componentcheck(char const *name, char const *component, + char const *component_end) { enum { @@ -812,7 +812,7 @@ namecheck(const char *name) */ #ifdef HAVE_SYMLINK static char * -relname(char const * from, char const * to) +relname(char const *from, char const *to) { size_t i, taillen, @@ -857,7 +857,7 @@ relname(char const * from, char const * to) /* Hard link FROM to TO, following any symbolic links. Return 0 if successful, an error number otherwise. */ static int -hardlinkerr(char const * from, char const * to) +hardlinkerr(char const *from, char const *to) { int r = linkat(AT_FDCWD, from, AT_FDCWD, to, AT_SYMLINK_FOLLOW); @@ -865,7 +865,7 @@ hardlinkerr(char const * from, char const * to) } static void -dolink(char const * fromfield, char const * tofield, bool staysymlink) +dolink(char const *fromfield, char const *tofield, bool staysymlink) { bool todirs_made = false; int link_errno; @@ -1009,7 +1009,7 @@ static const zic_t early_time = (WORK_AROUND_GNOME_BUG_730332 /* Return true if NAME is a directory. */ static bool -itsdir(char const * name) +itsdir(char const *name) { struct stat st; int res = stat(name, &st); @@ -1034,7 +1034,7 @@ itsdir(char const * name) /* Return true if NAME is a symbolic link. */ static bool -itssymlink(char const * name) +itssymlink(char const *name) { #ifdef HAVE_SYMLINK char c; @@ -1250,7 +1250,7 @@ infile(const char *name) * Call error with errstring and return zero on errors. */ static zic_t -gethms(char const * string, char const * errstring, bool signable) +gethms(char const *string, char const *errstring, bool signable) { /* PG: make hh be int not zic_t to avoid sscanf portability issues */ int hh; @@ -1634,7 +1634,7 @@ inlink(char **fields, int nfields) } static void -rulesub(struct rule * rp, const char *loyearp, const char *hiyearp, +rulesub(struct rule *rp, const char *loyearp, const char *hiyearp, const char *typep, const char *monthp, const char *dayp, const char *timep) { @@ -2323,7 +2323,7 @@ abbroffset(char *buf, zic_t offset) } static size_t -doabbr(char *abbr, struct zone const * zp, char const * letters, +doabbr(char *abbr, struct zone const *zp, char const *letters, zic_t stdoff, bool doquotes) { char *cp; @@ -2409,7 +2409,7 @@ stringoffset(char *result, zic_t offset) } static int -stringrule(char *result, const struct rule * const rp, const zic_t dstoff, +stringrule(char *result, const struct rule *const rp, const zic_t dstoff, const zic_t gmtoff) { zic_t tod = rp->r_tod; @@ -2491,7 +2491,7 @@ stringrule(char *result, const struct rule * const rp, const zic_t dstoff, } static int -rule_cmp(struct rule const * a, struct rule const * b) +rule_cmp(struct rule const *a, struct rule const *b) { if (!a) return -!!b; @@ -2509,7 +2509,7 @@ enum YEAR_BY_YEAR_ZONE = 1}; static int -stringzone(char *result, struct zone const * zpfirst, ptrdiff_t zonecount) +stringzone(char *result, struct zone const *zpfirst, ptrdiff_t zonecount) { const struct zone *zp; struct rule *rp; @@ -2644,7 +2644,7 @@ stringzone(char *result, struct zone const * zpfirst, ptrdiff_t zonecount) } static void -outzone(const struct zone * zpfirst, ptrdiff_t zonecount) +outzone(const struct zone *zpfirst, ptrdiff_t zonecount) { const struct zone *zp; struct rule *rp; @@ -3045,7 +3045,7 @@ addtt(zic_t starttime, int type) } static int -addtype(zic_t gmtoff, char const * abbr, bool isdst, bool ttisstd, bool ttisgmt) +addtype(zic_t gmtoff, char const *abbr, bool isdst, bool ttisstd, bool ttisgmt) { int i, j; @@ -3144,7 +3144,7 @@ adjleap(void) } static char * -shellquote(char *b, char const * s) +shellquote(char *b, char const *s) { *b++ = '\''; while (*s) @@ -3363,7 +3363,7 @@ itsabbr(const char *abbr, const char *word) } static const struct lookup * -byword(const char *word, const struct lookup * table) +byword(const char *word, const struct lookup *table) { const struct lookup *foundlp; const struct lookup *lp; @@ -3478,7 +3478,7 @@ tadd(zic_t t1, zic_t t2) */ static zic_t -rpytime(const struct rule * rp, zic_t wantedy) +rpytime(const struct rule *rp, zic_t wantedy) { int m, i; @@ -3570,7 +3570,7 @@ will not work with pre-2004 versions of zic")); return min_time; if (dayoff > max_time / SECSPERDAY) return max_time; - t = (zic_t) dayoff *SECSPERDAY; + t = (zic_t) dayoff * SECSPERDAY; return tadd(t, rp->r_tod); } @@ -3614,7 +3614,7 @@ newabbr(const char *string) do it for ARGNAME too. Exit with failure if there is trouble. Do not consider an existing non-directory to be trouble. */ static void -mkdirs(char const * argname, bool ancestors) +mkdirs(char const *argname, bool ancestors) { char *name; char *cp; diff --git a/src/tools/ifaddrs/test_ifaddrs.c b/src/tools/ifaddrs/test_ifaddrs.c index 100359ade1..b8dbb84945 100644 --- a/src/tools/ifaddrs/test_ifaddrs.c +++ b/src/tools/ifaddrs/test_ifaddrs.c @@ -15,7 +15,7 @@ static void -print_addr(struct sockaddr * addr) +print_addr(struct sockaddr *addr) { char buffer[256]; int ret, @@ -45,7 +45,7 @@ print_addr(struct sockaddr * addr) } static void -callback(struct sockaddr * addr, struct sockaddr * mask, void *unused) +callback(struct sockaddr *addr, struct sockaddr *mask, void *unused) { printf("addr: "); print_addr(addr); diff --git a/src/tools/testint128.c b/src/tools/testint128.c index b6c8a0a4ef..afdfd15cb0 100644 --- a/src/tools/testint128.c +++ b/src/tools/testint128.c @@ -45,7 +45,7 @@ typedef union int64 hi; #endif } hl; -} test128; +} test128; /* @@ -134,7 +134,7 @@ main(int argc, char **argv) } /* check multiplication */ - t1.i128 = (int128) x *(int128) y; + t1.i128 = (int128) x * (int128) y; t2.hl.hi = t2.hl.lo = 0; int128_add_int64_mul_int64(&t2.I128, x, y); diff --git a/src/tutorial/complex.c b/src/tutorial/complex.c index ea7051bdeb..1b5ebc2ff0 100644 --- a/src/tutorial/complex.c +++ b/src/tutorial/complex.c @@ -18,7 +18,7 @@ typedef struct Complex { double x; double y; -} Complex; +} Complex; /***************************************************************************** diff --git a/src/tutorial/funcs.c b/src/tutorial/funcs.c index 61ad1417a8..3c78f336fc 100644 --- a/src/tutorial/funcs.c +++ b/src/tutorial/funcs.c @@ -25,7 +25,7 @@ float8 *add_one_float8(float8 *arg); Point *makepoint(Point *pointx, Point *pointy); text *copytext(text *t); text *concat_text(text *arg1, text *arg2); -bool c_overpaid(HeapTupleHeader t, /* the current instance of EMP */ +bool c_overpaid(HeapTupleHeader t, /* the current instance of EMP */ int32 limit); |