diff --git a/contrib/bloom/blutils.c b/contrib/bloom/blutils.c index 00a65875b03..f2eda67e0ae 100644 --- a/contrib/bloom/blutils.c +++ b/contrib/bloom/blutils.c @@ -75,7 +75,7 @@ _PG_init(void) bl_relopt_tab[i + 1].optname = MemoryContextStrdup(TopMemoryContext, buf); bl_relopt_tab[i + 1].opttype = RELOPT_TYPE_INT; - bl_relopt_tab[i + 1].offset = offsetof(BloomOptions, bitSize[0]) +sizeof(int) * i; + bl_relopt_tab[i + 1].offset = offsetof(BloomOptions, bitSize[0]) + sizeof(int) * i; } } diff --git a/contrib/btree_gist/btree_utils_var.c b/contrib/btree_gist/btree_utils_var.c index 3648adccef7..c531663f927 100644 --- a/contrib/btree_gist/btree_utils_var.c +++ b/contrib/btree_gist/btree_utils_var.c @@ -72,7 +72,7 @@ gbt_var_key_readable(const GBT_VARKEY *k) * Create a leaf-entry to store in the index, from a single Datum. */ static GBT_VARKEY * -gbt_var_key_from_datum(const struct varlena * u) +gbt_var_key_from_datum(const struct varlena *u) { int32 lowersize = VARSIZE(u); GBT_VARKEY *r; diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c index a6a3c09ff8e..f2182bc3f4a 100644 --- a/contrib/dblink/dblink.c +++ b/contrib/dblink/dblink.c @@ -179,7 +179,7 @@ dblink_conn_not_avail(const char *conname) static void dblink_get_conn(char *conname_or_str, - PGconn *volatile * conn_p, char **conname_p, volatile bool *freeconn_p) + PGconn *volatile *conn_p, char **conname_p, volatile bool *freeconn_p) { remoteConn *rconn = getConnectionByName(conname_or_str); PGconn *conn; @@ -723,7 +723,7 @@ dblink_record_internal(FunctionCallInfo fcinfo, bool is_async) /* shouldn't happen */ elog(ERROR, "wrong number of arguments"); } - else /* is_async */ + else /* is_async */ { /* get async result */ conname = text_to_cstring(PG_GETARG_TEXT_PP(0)); diff --git a/contrib/fuzzystrmatch/fuzzystrmatch.c b/contrib/fuzzystrmatch/fuzzystrmatch.c index f1bb7bca732..ce58a6a7fc5 100644 --- a/contrib/fuzzystrmatch/fuzzystrmatch.c +++ b/contrib/fuzzystrmatch/fuzzystrmatch.c @@ -389,7 +389,7 @@ _metaphone(char *word, /* IN */ /*-- Allocate memory for our phoned_phrase --*/ if (max_phonemes == 0) { /* Assume largest possible */ - *phoned_word = palloc(sizeof(char) * strlen(word) +1); + *phoned_word = palloc(sizeof(char) * strlen(word) + 1); } else { @@ -722,7 +722,7 @@ _metaphone(char *word, /* IN */ End_Phoned_Word; return (META_SUCCESS); -} /* END metaphone */ +} /* END metaphone */ /* diff --git a/contrib/intarray/_int_gin.c b/contrib/intarray/_int_gin.c index fb16b66edb0..73628bea11d 100644 --- a/contrib/intarray/_int_gin.c +++ b/contrib/intarray/_int_gin.c @@ -93,7 +93,7 @@ ginint4_queryextract(PG_FUNCTION_ARGS) case RTOldContainsStrategyNumber: if (*nentries > 0) *searchMode = GIN_SEARCH_MODE_DEFAULT; - else /* everything contains the empty set */ + else /* everything contains the empty set */ *searchMode = GIN_SEARCH_MODE_ALL; break; default: diff --git a/contrib/ltree/lquery_op.c b/contrib/ltree/lquery_op.c index 31d150db40f..3bf5818e3a1 100644 --- a/contrib/ltree/lquery_op.c +++ b/contrib/ltree/lquery_op.c @@ -147,7 +147,7 @@ static struct { bool muse; uint32 high_pos; -} SomeStack = +} SomeStack = { false, 0, diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c index aab71aed2fa..ffb8234c0d7 100644 --- a/contrib/oid2name/oid2name.c +++ b/contrib/oid2name/oid2name.c @@ -57,7 +57,7 @@ void sql_exec_dumpalltbspc(PGconn *, struct options *); /* function to parse command line options and check for some usage errors. */ void -get_opts(int argc, char **argv, struct options * my_opts) +get_opts(int argc, char **argv, struct options *my_opts) { int c; const char *progname; @@ -260,7 +260,7 @@ get_comma_elts(eary *eary) /* establish connection with database. */ PGconn * -sql_conn(struct options * my_opts) +sql_conn(struct options *my_opts) { PGconn *conn; bool have_password = false; @@ -411,7 +411,7 @@ sql_exec(PGconn *conn, const char *todo, bool quiet) * Dump all databases. There are no system objects to worry about. */ void -sql_exec_dumpalldbs(PGconn *conn, struct options * opts) +sql_exec_dumpalldbs(PGconn *conn, struct options *opts) { char todo[1024]; @@ -428,7 +428,7 @@ sql_exec_dumpalldbs(PGconn *conn, struct options * opts) * Dump all tables, indexes and sequences in the current database. */ void -sql_exec_dumpalltables(PGconn *conn, struct options * opts) +sql_exec_dumpalltables(PGconn *conn, struct options *opts) { char todo[1024]; char *addfields = ",c.oid AS \"Oid\", nspname AS \"Schema\", spcname as \"Tablespace\" "; @@ -460,7 +460,7 @@ sql_exec_dumpalltables(PGconn *conn, struct options * opts) * given objects in the current database. */ void -sql_exec_searchtables(PGconn *conn, struct options * opts) +sql_exec_searchtables(PGconn *conn, struct options *opts) { char *todo; char *qualifiers, @@ -516,7 +516,7 @@ sql_exec_searchtables(PGconn *conn, struct options * opts) CppAsString2(RELKIND_SEQUENCE) "," CppAsString2(RELKIND_TOASTVALUE) ") AND\n" " t.oid = CASE\n" - " WHEN reltablespace <> 0 THEN reltablespace\n" + " WHEN reltablespace <> 0 THEN reltablespace\n" " ELSE dattablespace\n" " END AND\n" " (%s)\n" @@ -530,7 +530,7 @@ sql_exec_searchtables(PGconn *conn, struct options * opts) } void -sql_exec_dumpalltbspc(PGconn *conn, struct options * opts) +sql_exec_dumpalltbspc(PGconn *conn, struct options *opts) { char todo[1024]; diff --git a/contrib/pg_stat_statements/pg_stat_statements.c b/contrib/pg_stat_statements/pg_stat_statements.c index bf03e67513f..1febdca16fe 100644 --- a/contrib/pg_stat_statements/pg_stat_statements.c +++ b/contrib/pg_stat_statements/pg_stat_statements.c @@ -250,7 +250,7 @@ typedef enum PGSS_TRACK_NONE, /* track no statements */ PGSS_TRACK_TOP, /* only top level statements */ PGSS_TRACK_ALL /* all statements, including nested ones */ -} PGSSTrackLevel; +} PGSSTrackLevel; static const struct config_enum_entry track_options[] = { diff --git a/contrib/pg_trgm/trgm_op.c b/contrib/pg_trgm/trgm_op.c index e9a713113ed..f7e96acc53c 100644 --- a/contrib/pg_trgm/trgm_op.c +++ b/contrib/pg_trgm/trgm_op.c @@ -325,7 +325,7 @@ generate_trgm(char *str, int slen) protect_out_of_mem(slen); - trg = (TRGM *) palloc(TRGMHDRSIZE + sizeof(trgm) * (slen / 2 + 1) *3); + trg = (TRGM *) palloc(TRGMHDRSIZE + sizeof(trgm) * (slen / 2 + 1) * 3); trg->flag = ARRKEY; len = generate_trgm_only(GETARR(trg), str, slen); @@ -572,8 +572,8 @@ calc_word_similarity(char *str1, int slen1, char *str2, int slen2, protect_out_of_mem(slen1 + slen2); /* Make positional trigrams */ - trg1 = (trgm *) palloc(sizeof(trgm) * (slen1 / 2 + 1) *3); - trg2 = (trgm *) palloc(sizeof(trgm) * (slen2 / 2 + 1) *3); + trg1 = (trgm *) palloc(sizeof(trgm) * (slen1 / 2 + 1) * 3); + trg2 = (trgm *) palloc(sizeof(trgm) * (slen2 / 2 + 1) * 3); len1 = generate_trgm_only(trg1, str1, slen1); len2 = generate_trgm_only(trg2, str2, slen2); @@ -806,7 +806,7 @@ generate_wildcard_trgm(const char *str, int slen) protect_out_of_mem(slen); - trg = (TRGM *) palloc(TRGMHDRSIZE + sizeof(trgm) * (slen / 2 + 1) *3); + trg = (TRGM *) palloc(TRGMHDRSIZE + sizeof(trgm) * (slen / 2 + 1) * 3); trg->flag = ARRKEY; SET_VARSIZE(trg, TRGMHDRSIZE); diff --git a/contrib/pg_visibility/pg_visibility.c b/contrib/pg_visibility/pg_visibility.c index 480f917d087..ce4a2cb12f2 100644 --- a/contrib/pg_visibility/pg_visibility.c +++ b/contrib/pg_visibility/pg_visibility.c @@ -481,7 +481,7 @@ collect_visibility_data(Oid relid, bool include_pd) check_relation_relkind(rel); nblocks = RelationGetNumberOfBlocks(rel); - info = palloc0(offsetof(vbits, bits) +nblocks); + info = palloc0(offsetof(vbits, bits) + nblocks); info->next = 0; info->count = nblocks; diff --git a/contrib/pgcrypto/imath.c b/contrib/pgcrypto/imath.c index 61a01e2b710..41021a7ffdb 100644 --- a/contrib/pgcrypto/imath.c +++ b/contrib/pgcrypto/imath.c @@ -908,7 +908,7 @@ mp_int_sqr(mp_int a, mp_int c) CHECK(a != NULL && c != NULL); /* Get a temporary buffer big enough to hold the result */ - osize = (mp_size) 4 *((MP_USED(a) + 1) / 2); + osize = (mp_size) 4 * ((MP_USED(a) + 1) / 2); if (a == c) { @@ -1613,8 +1613,8 @@ mp_int_gcd(mp_int a, mp_int b, mp_int c) CLEANUP: mp_int_clear(&v); -V: mp_int_clear(&u); -U: mp_int_clear(&t); +V: mp_int_clear(&u); +U: mp_int_clear(&t); return res; } @@ -3512,7 +3512,7 @@ s_outlen(mp_int z, mp_size r) double raw; bits = mp_int_count_bits(z); - raw = (double) bits *s_log2[r]; + raw = (double) bits * s_log2[r]; return (int) (raw + 0.999999); } diff --git a/contrib/pgcrypto/imath.h b/contrib/pgcrypto/imath.h index 0a4f0f713f4..8ba38d3acb9 100644 --- a/contrib/pgcrypto/imath.h +++ b/contrib/pgcrypto/imath.h @@ -61,6 +61,7 @@ typedef struct mpz mp_size used; mp_sign sign; } mpz_t , + *mp_int; #define MP_DIGITS(Z) ((Z)->digits) @@ -117,9 +118,9 @@ mp_result mp_int_mul_value(mp_int a, int value, mp_int c); mp_result mp_int_mul_pow2(mp_int a, int p2, mp_int c); mp_result mp_int_sqr(mp_int a, mp_int c); /* c = a * a */ -mp_result mp_int_div(mp_int a, mp_int b, /* q = a / b */ +mp_result mp_int_div(mp_int a, mp_int b, /* q = a / b */ mp_int q, mp_int r); /* r = a % b */ -mp_result mp_int_div_value(mp_int a, int value, /* q = a / value */ +mp_result mp_int_div_value(mp_int a, int value, /* q = a / value */ mp_int q, int *r); /* r = a % value */ mp_result mp_int_div_pow2(mp_int a, int p2, /* q = a / 2^p2 */ mp_int q, mp_int r); /* r = q % 2^p2 */ diff --git a/contrib/pgcrypto/internal.c b/contrib/pgcrypto/internal.c index 2516092ba4e..c2687cfdb2e 100644 --- a/contrib/pgcrypto/internal.c +++ b/contrib/pgcrypto/internal.c @@ -318,7 +318,7 @@ rj_init(PX_Cipher *c, const uint8 *key, unsigned klen, const uint8 *iv) } static int -rj_real_init(struct int_ctx * cx, int dir) +rj_real_init(struct int_ctx *cx, int dir) { aes_set_key(&cx->ctx.rj, cx->keybuf, cx->keylen * 8, dir); return 0; diff --git a/contrib/pgcrypto/mbuf.h b/contrib/pgcrypto/mbuf.h index 988293a7299..d413eb52764 100644 --- a/contrib/pgcrypto/mbuf.h +++ b/contrib/pgcrypto/mbuf.h @@ -51,7 +51,7 @@ struct PushFilterOps * copied (in-place) returns 0 on error */ int (*push) (PushFilter *next, void *priv, - const uint8 *src, int len); + const uint8 *src, int len); int (*flush) (PushFilter *next, void *priv); void (*free) (void *priv); }; @@ -69,7 +69,7 @@ struct PullFilterOps * use buf as work area if NULL in-place copy */ int (*pull) (void *priv, PullFilter *src, int len, - uint8 **data_p, uint8 *buf, int buflen); + uint8 **data_p, uint8 *buf, int buflen); void (*free) (void *priv); }; diff --git a/contrib/pgcrypto/pgp-decrypt.c b/contrib/pgcrypto/pgp-decrypt.c index 9ea60c4c47d..7d31e5354b8 100644 --- a/contrib/pgcrypto/pgp-decrypt.c +++ b/contrib/pgcrypto/pgp-decrypt.c @@ -460,7 +460,7 @@ mdcbuf_init(void **priv_p, void *arg, PullFilter *src) } static int -mdcbuf_finish(struct MDCBufData * st) +mdcbuf_finish(struct MDCBufData *st) { uint8 hash[20]; int res; @@ -485,7 +485,7 @@ mdcbuf_finish(struct MDCBufData * st) } static void -mdcbuf_load_data(struct MDCBufData * st, uint8 *src, int len) +mdcbuf_load_data(struct MDCBufData *st, uint8 *src, int len) { uint8 *dst = st->pos + st->avail; @@ -495,14 +495,14 @@ mdcbuf_load_data(struct MDCBufData * st, uint8 *src, int len) } static void -mdcbuf_load_mdc(struct MDCBufData * st, uint8 *src, int len) +mdcbuf_load_mdc(struct MDCBufData *st, uint8 *src, int len) { memmove(st->mdc_buf + st->mdc_avail, src, len); st->mdc_avail += len; } static int -mdcbuf_refill(struct MDCBufData * st, PullFilter *src) +mdcbuf_refill(struct MDCBufData *st, PullFilter *src) { uint8 *data; int res; diff --git a/contrib/pgcrypto/pgp-pgsql.c b/contrib/pgcrypto/pgp-pgsql.c index cc5df14725e..058b07f0461 100644 --- a/contrib/pgcrypto/pgp-pgsql.c +++ b/contrib/pgcrypto/pgp-pgsql.c @@ -132,7 +132,7 @@ struct debug_expect }; static void -fill_expect(struct debug_expect * ex, int text_mode) +fill_expect(struct debug_expect *ex, int text_mode) { ex->debug = 0; ex->expect = 0; @@ -157,7 +157,7 @@ fill_expect(struct debug_expect * ex, int text_mode) } while (0) static void -check_expect(PGP_Context *ctx, struct debug_expect * ex) +check_expect(PGP_Context *ctx, struct debug_expect *ex) { EX_CHECK(cipher_algo); EX_CHECK(s2k_mode); @@ -179,7 +179,7 @@ show_debug(const char *msg) static int set_arg(PGP_Context *ctx, char *key, char *val, - struct debug_expect * ex) + struct debug_expect *ex) { int res = 0; @@ -317,7 +317,7 @@ downcase_convert(const uint8 *s, int len) static int parse_args(PGP_Context *ctx, uint8 *args, int arg_len, - struct debug_expect * ex) + struct debug_expect *ex) { char *str = downcase_convert(args, arg_len); char *key, @@ -362,7 +362,7 @@ create_mbuf_from_vardata(text *data) static void init_work(PGP_Context **ctx_p, int is_text, - text *args, struct debug_expect * ex) + text *args, struct debug_expect *ex) { int err = pgp_init(ctx_p); diff --git a/contrib/pgcrypto/px-crypt.c b/contrib/pgcrypto/px-crypt.c index 6c72c4ae830..ee40788fe71 100644 --- a/contrib/pgcrypto/px-crypt.c +++ b/contrib/pgcrypto/px-crypt.c @@ -74,7 +74,7 @@ struct px_crypt_algo char *id; unsigned id_len; char *(*crypt) (const char *psw, const char *salt, - char *buf, unsigned len); + char *buf, unsigned len); }; static const struct px_crypt_algo @@ -115,7 +115,7 @@ struct generator { char *name; char *(*gen) (unsigned long count, const char *input, int size, - char *output, int output_size); + char *output, int output_size); int input_len; int def_rounds; int min_rounds; diff --git a/contrib/pgcrypto/px.h b/contrib/pgcrypto/px.h index e68a95a0584..e8068317d0b 100644 --- a/contrib/pgcrypto/px.h +++ b/contrib/pgcrypto/px.h @@ -169,11 +169,11 @@ struct px_cipher struct px_combo { int (*init) (PX_Combo *cx, const uint8 *key, unsigned klen, - const uint8 *iv, unsigned ivlen); + const uint8 *iv, unsigned ivlen); int (*encrypt) (PX_Combo *cx, const uint8 *data, unsigned dlen, - uint8 *res, unsigned *rlen); + uint8 *res, unsigned *rlen); int (*decrypt) (PX_Combo *cx, const uint8 *data, unsigned dlen, - uint8 *res, unsigned *rlen); + uint8 *res, unsigned *rlen); unsigned (*encrypt_len) (PX_Combo *cx, unsigned dlen); unsigned (*decrypt_len) (PX_Combo *cx, unsigned dlen); void (*free) (PX_Combo *cx); diff --git a/contrib/pgcrypto/rijndael.h b/contrib/pgcrypto/rijndael.h index e536c61a6fb..108ef68b760 100644 --- a/contrib/pgcrypto/rijndael.h +++ b/contrib/pgcrypto/rijndael.h @@ -44,8 +44,7 @@ typedef struct _rijndael_ctx /* These are all based on 32 bit unsigned values and will therefore */ /* require endian conversions for big-endian architectures */ -rijndael_ctx * - rijndael_set_key(rijndael_ctx *, const u4byte *, const u4byte, int); +rijndael_ctx *rijndael_set_key(rijndael_ctx *, const u4byte *, const u4byte, int); void rijndael_encrypt(rijndael_ctx *, const u4byte *, u4byte *); void rijndael_decrypt(rijndael_ctx *, const u4byte *, u4byte *); diff --git a/contrib/pgcrypto/sha1.c b/contrib/pgcrypto/sha1.c index 0e753ce63a1..fb6a57d917c 100644 --- a/contrib/pgcrypto/sha1.c +++ b/contrib/pgcrypto/sha1.c @@ -81,7 +81,7 @@ do { \ static void sha1_step(struct sha1_ctxt *); static void -sha1_step(struct sha1_ctxt * ctxt) +sha1_step(struct sha1_ctxt *ctxt) { uint32 a, b, @@ -226,7 +226,7 @@ sha1_step(struct sha1_ctxt * ctxt) /*------------------------------------------------------------*/ void -sha1_init(struct sha1_ctxt * ctxt) +sha1_init(struct sha1_ctxt *ctxt) { memset(ctxt, 0, sizeof(struct sha1_ctxt)); H(0) = 0x67452301; @@ -237,7 +237,7 @@ sha1_init(struct sha1_ctxt * ctxt) } void -sha1_pad(struct sha1_ctxt * ctxt) +sha1_pad(struct sha1_ctxt *ctxt) { size_t padlen; /* pad length in bytes */ size_t padstart; @@ -280,7 +280,7 @@ sha1_pad(struct sha1_ctxt * ctxt) } void -sha1_loop(struct sha1_ctxt * ctxt, const uint8 *input0, size_t len) +sha1_loop(struct sha1_ctxt *ctxt, const uint8 *input0, size_t len) { const uint8 *input; size_t gaplen; @@ -308,7 +308,7 @@ sha1_loop(struct sha1_ctxt * ctxt, const uint8 *input0, size_t len) } void -sha1_result(struct sha1_ctxt * ctxt, uint8 *digest0) +sha1_result(struct sha1_ctxt *ctxt, uint8 *digest0) { uint8 *digest; diff --git a/contrib/pgstattuple/pgstatapprox.c b/contrib/pgstattuple/pgstatapprox.c index 9facf651378..c801988cc58 100644 --- a/contrib/pgstattuple/pgstatapprox.c +++ b/contrib/pgstattuple/pgstatapprox.c @@ -182,7 +182,7 @@ statapprox_heap(Relation rel, output_type *stat) UnlockReleaseBuffer(buf); } - stat->table_len = (uint64) nblocks *BLCKSZ; + stat->table_len = (uint64) nblocks * BLCKSZ; stat->tuple_count = vac_estimate_reltuples(rel, false, nblocks, scanned, stat->tuple_count + misc_count); diff --git a/contrib/pgstattuple/pgstattuple.c b/contrib/pgstattuple/pgstattuple.c index eb02ec5b890..7a91cc3468f 100644 --- a/contrib/pgstattuple/pgstattuple.c +++ b/contrib/pgstattuple/pgstattuple.c @@ -62,7 +62,7 @@ typedef struct pgstattuple_type } pgstattuple_type; typedef void (*pgstat_page) (pgstattuple_type *, Relation, BlockNumber, - BufferAccessStrategy); + BufferAccessStrategy); static Datum build_pgstattuple_type(pgstattuple_type *stat, FunctionCallInfo fcinfo); @@ -386,7 +386,7 @@ pgstat_heap(Relation rel, FunctionCallInfo fcinfo) heap_endscan(scan); relation_close(rel, AccessShareLock); - stat.table_len = (uint64) nblocks *BLCKSZ; + stat.table_len = (uint64) nblocks * BLCKSZ; return build_pgstattuple_type(&stat, fcinfo); } @@ -531,7 +531,7 @@ pgstat_index(Relation rel, BlockNumber start, pgstat_page pagefn, /* Quit if we've scanned the whole relation */ if (blkno >= nblocks) { - stat.table_len = (uint64) nblocks *BLCKSZ; + stat.table_len = (uint64) nblocks * BLCKSZ; break; } diff --git a/contrib/sepgsql/hooks.c b/contrib/sepgsql/hooks.c index c4b978b48f2..6da6a23647a 100644 --- a/contrib/sepgsql/hooks.c +++ b/contrib/sepgsql/hooks.c @@ -52,7 +52,7 @@ typedef struct * command. Elsewhere (including the case of default) NULL. */ const char *createdb_dtemplate; -} sepgsql_context_info_t; +} sepgsql_context_info_t; static sepgsql_context_info_t sepgsql_context_info; diff --git a/contrib/sepgsql/label.c b/contrib/sepgsql/label.c index 62398001894..2f01c393ccb 100644 --- a/contrib/sepgsql/label.c +++ b/contrib/sepgsql/label.c @@ -78,7 +78,7 @@ typedef struct { SubTransactionId subid; char *label; -} pending_label; +} pending_label; /* * sepgsql_get_client_label @@ -721,7 +721,7 @@ quote_object_name(const char *src1, const char *src2, * catalog OID. */ static void -exec_object_restorecon(struct selabel_handle * sehnd, Oid catalogId) +exec_object_restorecon(struct selabel_handle *sehnd, Oid catalogId) { Relation rel; SysScanDesc sscan; diff --git a/contrib/sepgsql/selinux.c b/contrib/sepgsql/selinux.c index 7728a183338..bf89e83dd62 100644 --- a/contrib/sepgsql/selinux.c +++ b/contrib/sepgsql/selinux.c @@ -36,7 +36,7 @@ static struct const char *av_name; uint32 av_code; } av[32]; -} selinux_catalog[] = +} selinux_catalog[] = { { @@ -732,7 +732,7 @@ void sepgsql_compute_avd(const char *scontext, const char *tcontext, uint16 tclass, - struct av_decision * avd) + struct av_decision *avd) { const char *tclass_name; security_class_t tclass_ex; diff --git a/contrib/sepgsql/sepgsql.h b/contrib/sepgsql/sepgsql.h index 9d245c27801..fbe25e6602d 100644 --- a/contrib/sepgsql/sepgsql.h +++ b/contrib/sepgsql/sepgsql.h @@ -235,7 +235,7 @@ extern void sepgsql_audit_log(bool denied, extern void sepgsql_compute_avd(const char *scontext, const char *tcontext, uint16 tclass, - struct av_decision * avd); + struct av_decision *avd); extern char *sepgsql_compute_create(const char *scontext, const char *tcontext, diff --git a/contrib/sepgsql/uavc.c b/contrib/sepgsql/uavc.c index 6fd58c7e428..ffb00716c62 100644 --- a/contrib/sepgsql/uavc.c +++ b/contrib/sepgsql/uavc.c @@ -45,7 +45,7 @@ typedef struct /* true, if tcontext is valid */ char *ncontext; /* temporary scontext on execution of trusted * procedure, or NULL elsewhere */ -} avc_cache; +} avc_cache; /* * Declaration of static variables diff --git a/contrib/spi/timetravel.c b/contrib/spi/timetravel.c index 19bf8a892ce..c4b3e7d6fae 100644 --- a/contrib/spi/timetravel.c +++ b/contrib/spi/timetravel.c @@ -461,7 +461,7 @@ set_timetravel(PG_FUNCTION_ARGS) s = rname = DatumGetCString(DirectFunctionCall1(nameout, NameGetDatum(relname))); if (s) { - pp = malloc(offsetof(TTOffList, name) +strlen(rname) + 1); + pp = malloc(offsetof(TTOffList, name) + strlen(rname) + 1); if (pp) { pp->next = NULL; diff --git a/contrib/uuid-ossp/uuid-ossp.c b/contrib/uuid-ossp/uuid-ossp.c index 1ce08555cfb..f34398f54a7 100644 --- a/contrib/uuid-ossp/uuid-ossp.c +++ b/contrib/uuid-ossp/uuid-ossp.c @@ -262,11 +262,11 @@ uuid_generate_internal(int v, unsigned char *ns, char *ptr, int len) switch (v) { - case 0: /* constant-value uuids */ + case 0: /* constant-value uuids */ strlcpy(strbuf, ptr, 37); break; - case 1: /* time/node-based uuids */ + case 1: /* time/node-based uuids */ { #ifdef HAVE_UUID_E2FS uuid_t uu; @@ -316,8 +316,8 @@ uuid_generate_internal(int v, unsigned char *ns, char *ptr, int len) break; } - case 3: /* namespace-based MD5 uuids */ - case 5: /* namespace-based SHA1 uuids */ + case 3: /* namespace-based MD5 uuids */ + case 5: /* namespace-based SHA1 uuids */ { dce_uuid_t uu; #ifdef HAVE_UUID_BSD @@ -373,7 +373,7 @@ uuid_generate_internal(int v, unsigned char *ns, char *ptr, int len) break; } - case 4: /* random uuid */ + case 4: /* random uuid */ default: { #ifdef HAVE_UUID_E2FS diff --git a/contrib/vacuumlo/vacuumlo.c b/contrib/vacuumlo/vacuumlo.c index 887483cf0fa..a4d45533033 100644 --- a/contrib/vacuumlo/vacuumlo.c +++ b/contrib/vacuumlo/vacuumlo.c @@ -47,7 +47,7 @@ struct _param long transaction_limit; }; -static int vacuumlo(const char *database, const struct _param * param); +static int vacuumlo(const char *database, const struct _param *param); static void usage(const char *progname); @@ -56,7 +56,7 @@ static void usage(const char *progname); * This vacuums LOs of one database. It returns 0 on success, -1 on failure. */ static int -vacuumlo(const char *database, const struct _param * param) +vacuumlo(const char *database, const struct _param *param) { PGconn *conn; PGresult *res, diff --git a/contrib/xml2/xpath.c b/contrib/xml2/xpath.c index 034545caa87..acf1c4a1c11 100644 --- a/contrib/xml2/xpath.c +++ b/contrib/xml2/xpath.c @@ -720,7 +720,7 @@ xpath_table(PG_FUNCTION_ARGS) /* Parse the document */ if (xmldoc) doctree = xmlParseMemory(xmldoc, strlen(xmldoc)); - else /* treat NULL as not well-formed */ + else /* treat NULL as not well-formed */ doctree = NULL; if (doctree == NULL) diff --git a/src/backend/access/common/reloptions.c b/src/backend/access/common/reloptions.c index 6d1f22f049b..a6adf6e637c 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 cc7435e0309..a5238c3af5e 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 ad62d4e0e94..93ed3272ea9 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 8a3297924ff..d89c1928627 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 0ea11b2e742..429af11f4dd 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 b5133e3945c..8468efee020 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 60dcb67a203..e702af901e2 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 aa5a45ded48..a2b3700750a 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 116f5f32f6e..5d7504040da 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 90c65341397..57d2612c475 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 2d96c0094e6..92810506463 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 16a0bee6103..98793bda668 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 7ae783102af..92966d3b105 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 e9751aa2f6d..957457c9790 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 70d2570dc2c..e386df7315c 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 7a6da1e3c97..8a774440005 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 68fc12b50ee..b9cca29ea3b 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 ae79a2ffbc3..ff32d041897 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 e8126a38a9d..91f9cac7862 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 02c740c13a6..2e26090bf99 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 8f06c23df95..9cfac4a6f97 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 b4425bc6afa..758c876ef3f 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 0271788bf99..d7ed71f7675 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 fc9c4f0fb1f..153a3608611 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 3af4a90b515..f00fce59132 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 89aea2fe5c5..f15ff64a3b4 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 7eeda95af75..96cdfb7ad2a 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 f9ab0d60353..907090395cc 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 aa5d2529f4f..32b7269cdaf 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 572e9dce94c..336270f02ac 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 2f0a4e647b9..01048cc8268 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 9ae53bb8a71..0fb5615da3f 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 628bc9f00b7..433d97c8b4e 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 9f99e77db04..ce4331ccdec 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 720cecb0e78..a108cd150bc 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 cdf8a73aa52..3d80090a8cd 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 081c06a1e6b..28893d35190 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 2cb60393852..9033dd4da82 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 823880ebff4..45324341409 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 10643978c74..b5f32434104 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 d1cc38beb2b..1dffa98c44e 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 5af37a93885..2cceb99fd98 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 ef25fab71bf..6ed3c634b89 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 5a68de3cc86..4c775a76c69 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 749ea805f82..cfdd770f6a4 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 06fce8458cc..72d70d52d19 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 65bd51e1fd6..e46aa60097f 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 34f1cf82ee0..eb1706a4a69 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 ff44b6033ed..c97cb9181e6 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 f11d6e6eb86..535b9a0c67c 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 43097794f76..f1aa0f3a169 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 89dd3b321bc..5baa6db321a 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 712d700481d..09b7fb40920 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 f453dade6c6..5cf95822463 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 5c79b1e40d1..a5d3575b209 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, + 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)); + /*------ + 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 9f5ca5cac08..9828999eb84 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 4b72894ad3a..823bec018fd 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 50b7a4574b4..10306215596 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 cd34c8ae411..b2506ca814f 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 7cb3a40a0c8..acae90abce2 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 90dca5d9dea..2179a38a228 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)<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 0834ae6e064..777373e691a 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 b98c9d39021..366b79f492f 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 f2fe696425c..2d38fbc646b 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 5cbfd9b151b..471ddb2aad7 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 371c1f9da67..53417f0e7dd 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 cb74f2f311f..96ca0e1ed3a 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 cb5f58b6ba2..f3671cf41ff 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 8f4f7f842bc..0182fb7fa72 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 27236127181..01b86ffe8aa 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 976a42f86d3..b61eaef6f57 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 e6812eef892..2ca6c63799d 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 0c322a49c6b..7cf668de19e 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 ba3b1d00bb1..00ee3a3e0a3 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 8d7460c96be..73d7ef3c271 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 d8d422cd45a..4b8d8926d29 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 2109cbf8587..77296646d95 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 5d0a636ba8c..e14524bb412 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 387849e22c1..008cd9145c0 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 fcd6cc7a8c3..f45a67cc278 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 50334cd7978..a532f4fa5cf 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 67150debf21..b5f49727f7a 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 35536e47894..a021fbb2297 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 f0b127cc600..b07ef4c21bc 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 3e716b1c6c7..b76c170630a 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 ac82e704fa6..09f1c64e46e 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 9bc00b62143..1b1de1f879a 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 0ed1fe91d5f..e9850f79ae0 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 5f272d84485..ba0f06c302d 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 f99dd0a2d49..fd6c9cf039d 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 a22fd5397e5..dd1916f366a 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 aea76e85b52..2b89f596f08 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 c1e194a8f57..817237ce4d2 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 017435cc59b..f4298ca9aa4 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 bb7edc1516b..0cfc6552d75 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: /* token, "ignore = false; break; - case 7: /*