diff --git a/contrib/amcheck/verify_common.c b/contrib/amcheck/verify_common.c index 54ce901716b..2301b843494 100644 --- a/contrib/amcheck/verify_common.c +++ b/contrib/amcheck/verify_common.c @@ -50,14 +50,14 @@ amcheck_index_mainfork_expected(Relation rel) } /* -* Amcheck main workhorse. -* Given index relation OID, lock relation. -* Next, take a number of standard actions: -* 1) Make sure the index can be checked -* 2) change the context of the user, -* 3) keep track of GUCs modified via index functions -* 4) execute callback function to verify integrity. -*/ + * Amcheck main workhorse. + * Given index relation OID, lock relation. + * Next, take a number of standard actions: + * 1) Make sure the index can be checked + * 2) change the context of the user, + * 3) keep track of GUCs modified via index functions + * 4) execute callback function to verify integrity. + */ void amcheck_lock_relation_and_check(Oid indrelid, Oid am_id, diff --git a/contrib/btree_gist/btree_gist.c b/contrib/btree_gist/btree_gist.c index 39fcbdad334..a2cc2d708e1 100644 --- a/contrib/btree_gist/btree_gist.c +++ b/contrib/btree_gist/btree_gist.c @@ -49,9 +49,9 @@ gbtreekey_out(PG_FUNCTION_ARGS) /* -** GiST DeCompress methods -** do not do anything. -*/ + * GiST DeCompress methods + * do not do anything. + */ Datum gbt_decompress(PG_FUNCTION_ARGS) { diff --git a/contrib/btree_gist/btree_utils_num.c b/contrib/btree_gist/btree_utils_num.c index 51c8836f27a..3affe4c2c46 100644 --- a/contrib/btree_gist/btree_utils_num.c +++ b/contrib/btree_gist/btree_utils_num.c @@ -165,8 +165,8 @@ gbt_num_fetch(GISTENTRY *entry, const gbtree_ninfo *tinfo) /* -** The GiST union method for numerical values -*/ + * The GiST union method for numerical values + */ void * gbt_num_union(GBT_NUMKEY *out, const GistEntryVector *entryvec, const gbtree_ninfo *tinfo, FmgrInfo *flinfo) @@ -205,8 +205,8 @@ gbt_num_union(GBT_NUMKEY *out, const GistEntryVector *entryvec, const gbtree_nin /* -** The GiST same method for numerical values -*/ + * The GiST same method for numerical values + */ bool gbt_num_same(const GBT_NUMKEY *a, const GBT_NUMKEY *b, const gbtree_ninfo *tinfo, FmgrInfo *flinfo) @@ -309,8 +309,8 @@ gbt_num_consistent(const GBT_NUMKEY_R *key, /* -** The GiST distance method (for KNN-Gist) -*/ + * The GiST distance method (for KNN-Gist) + */ float8 gbt_num_distance(const GBT_NUMKEY_R *key, diff --git a/contrib/btree_gist/btree_utils_var.c b/contrib/btree_gist/btree_utils_var.c index e1945cf808f..25c3bbe8eac 100644 --- a/contrib/btree_gist/btree_utils_var.c +++ b/contrib/btree_gist/btree_utils_var.c @@ -118,7 +118,7 @@ gbt_var_leaf2node(GBT_VARKEY *leaf, const gbtree_vinfo *tinfo, FmgrInfo *flinfo) * * If the underlying type is character data, the prefix length may point in * the middle of a multibyte character. -*/ + */ static int32 gbt_var_node_cp_len(const GBT_VARKEY *node, const gbtree_vinfo *tinfo) { @@ -207,9 +207,9 @@ gbt_var_node_pf_match(const GBT_VARKEY_R *node, const bytea *query, const gbtree /* -* truncates / compresses the node key -* cpf_length .. common prefix length -*/ + * truncates / compresses the node key + * cpf_length .. common prefix length + */ static GBT_VARKEY * gbt_var_node_truncate(const GBT_VARKEY *node, int32 cpf_length, const gbtree_vinfo *tinfo) { diff --git a/contrib/cube/cube.c b/contrib/cube/cube.c index 77263ab277f..28d48549b36 100644 --- a/contrib/cube/cube.c +++ b/contrib/cube/cube.c @@ -29,8 +29,8 @@ PG_MODULE_MAGIC_EXT( #define ARRNELEMS(x) ArrayGetNItems( ARR_NDIM(x), ARR_DIMS(x)) /* -** Input/Output routines -*/ + * Input/Output routines + */ PG_FUNCTION_INFO_V1(cube_in); PG_FUNCTION_INFO_V1(cube_a_f8_f8); PG_FUNCTION_INFO_V1(cube_a_f8); @@ -49,8 +49,8 @@ PG_FUNCTION_INFO_V1(cube_coord_llur); PG_FUNCTION_INFO_V1(cube_subset); /* -** GiST support methods -*/ + * GiST support methods + */ PG_FUNCTION_INFO_V1(g_cube_consistent); PG_FUNCTION_INFO_V1(g_cube_compress); @@ -62,8 +62,8 @@ PG_FUNCTION_INFO_V1(g_cube_same); PG_FUNCTION_INFO_V1(g_cube_distance); /* -** B-tree support functions -*/ + * B-tree support functions + */ PG_FUNCTION_INFO_V1(cube_eq); PG_FUNCTION_INFO_V1(cube_ne); PG_FUNCTION_INFO_V1(cube_lt); @@ -73,8 +73,8 @@ PG_FUNCTION_INFO_V1(cube_ge); PG_FUNCTION_INFO_V1(cube_cmp); /* -** R-tree support functions -*/ + * R-tree support functions + */ PG_FUNCTION_INFO_V1(cube_contains); PG_FUNCTION_INFO_V1(cube_contained); @@ -84,8 +84,8 @@ PG_FUNCTION_INFO_V1(cube_inter); PG_FUNCTION_INFO_V1(cube_size); /* -** miscellaneous -*/ + * miscellaneous + */ PG_FUNCTION_INFO_V1(distance_taxicab); PG_FUNCTION_INFO_V1(cube_distance); PG_FUNCTION_INFO_V1(distance_chebyshev); @@ -93,8 +93,8 @@ PG_FUNCTION_INFO_V1(cube_is_point); PG_FUNCTION_INFO_V1(cube_enlarge); /* -** For internal use only -*/ + * For internal use only + */ int32 cube_cmp_v0(NDBOX *a, NDBOX *b); bool cube_contains_v0(NDBOX *a, NDBOX *b); bool cube_overlap_v0(NDBOX *a, NDBOX *b); @@ -105,8 +105,8 @@ bool g_cube_leaf_consistent(NDBOX *key, NDBOX *query, StrategyNumber strategy); bool g_cube_internal_consistent(NDBOX *key, NDBOX *query, StrategyNumber strategy); /* -** Auxiliary functions -*/ + * Auxiliary functions + */ static double distance_1D(double a1, double a2, double b1, double b2); static bool cube_is_point_internal(NDBOX *cube); @@ -137,8 +137,8 @@ cube_in(PG_FUNCTION_ARGS) /* -** Allows the construction of a cube from 2 float[]'s -*/ + * Allows the construction of a cube from 2 float[]'s + */ Datum cube_a_f8_f8(PG_FUNCTION_ARGS) { @@ -204,8 +204,8 @@ cube_a_f8_f8(PG_FUNCTION_ARGS) } /* -** Allows the construction of a zero-volume cube from a float[] -*/ + * Allows the construction of a zero-volume cube from a float[] + */ Datum cube_a_f8(PG_FUNCTION_ARGS) { @@ -386,11 +386,11 @@ cube_recv(PG_FUNCTION_ARGS) *****************************************************************************/ /* -** The GiST Consistent method for boxes -** Should return false if for all data items x below entry, -** the predicate x op query == false, where op is the oper -** corresponding to strategy in the pg_amop table. -*/ + * The GiST Consistent method for boxes + * Should return false if for all data items x below entry, + * the predicate x op query == false, where op is the oper + * corresponding to strategy in the pg_amop table. + */ Datum g_cube_consistent(PG_FUNCTION_ARGS) { @@ -423,9 +423,9 @@ g_cube_consistent(PG_FUNCTION_ARGS) /* -** The GiST Union method for boxes -** returns the minimal bounding box that encloses all the entries in entryvec -*/ + * The GiST Union method for boxes + * returns the minimal bounding box that encloses all the entries in entryvec + */ Datum g_cube_union(PG_FUNCTION_ARGS) { @@ -454,9 +454,9 @@ g_cube_union(PG_FUNCTION_ARGS) } /* -** GiST Compress and Decompress methods for boxes -** do not do anything. -*/ + * GiST Compress and Decompress methods for boxes + * do not do anything. + */ Datum g_cube_compress(PG_FUNCTION_ARGS) @@ -484,9 +484,9 @@ g_cube_decompress(PG_FUNCTION_ARGS) /* -** The GiST Penalty method for boxes -** As in the R-tree paper, we use change in area as our penalty metric -*/ + * The GiST Penalty method for boxes + * As in the R-tree paper, we use change in area as our penalty metric + */ Datum g_cube_penalty(PG_FUNCTION_ARGS) { @@ -509,9 +509,9 @@ g_cube_penalty(PG_FUNCTION_ARGS) /* -** The GiST PickSplit method for boxes -** We use Guttman's poly time split algorithm -*/ + * The GiST PickSplit method for boxes + * We use Guttman's poly time split algorithm + */ Datum g_cube_picksplit(PG_FUNCTION_ARGS) { @@ -660,8 +660,8 @@ g_cube_picksplit(PG_FUNCTION_ARGS) } /* -** Equality method -*/ + * Equality method + */ Datum g_cube_same(PG_FUNCTION_ARGS) { @@ -678,8 +678,8 @@ g_cube_same(PG_FUNCTION_ARGS) } /* -** SUPPORT ROUTINES -*/ + * SUPPORT ROUTINES + */ bool g_cube_leaf_consistent(NDBOX *key, NDBOX *query, @@ -936,8 +936,10 @@ rt_cube_size(NDBOX *a, double *size) *size = result; } -/* make up a metric in which one box will be 'lower' than the other - -- this can be useful for sorting and to determine uniqueness */ +/* + * make up a metric in which one box will be 'lower' than the other + * -- this can be useful for sorting and to determine uniqueness + */ int32 cube_cmp_v0(NDBOX *a, NDBOX *b) { @@ -1250,10 +1252,12 @@ cube_overlap(PG_FUNCTION_ARGS) /* Distance */ -/* The distance is computed as a per axis sum of the squared distances - between 1D projections of the boxes onto Cartesian axes. Assuming zero - distance between overlapping projections, this metric coincides with the - "common sense" geometric distance */ +/* + * The distance is computed as a per axis sum of the squared distances + * between 1D projections of the boxes onto Cartesian axes. Assuming zero + * distance between overlapping projections, this metric coincides with the + * "common sense" geometric distance + */ Datum cube_distance(PG_FUNCTION_ARGS) { @@ -1817,8 +1821,10 @@ cube_f8_f8(PG_FUNCTION_ARGS) PG_RETURN_NDBOX_P(result); } -/* Add a dimension to an existing cube with the same values for the new - coordinate */ +/* + * Add a dimension to an existing cube with the same values for the new + * coordinate + */ Datum cube_c_f8(PG_FUNCTION_ARGS) { diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c index 9798cb535bc..d843eee7e97 100644 --- a/contrib/dblink/dblink.c +++ b/contrib/dblink/dblink.c @@ -124,7 +124,7 @@ static bool dblink_connstr_has_pw(const char *connstr); static void dblink_security_check(PGconn *conn, const char *connname, const char *connstr); static void dblink_res_error(PGconn *conn, const char *conname, PGresult *res, - bool fail, const char *fmt,...) pg_attribute_printf(5, 6); + bool fail, const char *fmt, ...) pg_attribute_printf(5, 6); static char *get_connect_string(const char *servername); static char *escape_param_str(const char *str); static void validate_pkattnums(Relation rel, @@ -2793,7 +2793,7 @@ dblink_connstr_check(const char *connstr) */ static void dblink_res_error(PGconn *conn, const char *conname, PGresult *res, - bool fail, const char *fmt,...) + bool fail, const char *fmt, ...) { int level; char *pg_diag_sqlstate = PQresultErrorField(res, PG_DIAG_SQLSTATE); diff --git a/contrib/fuzzystrmatch/daitch_mokotoff.c b/contrib/fuzzystrmatch/daitch_mokotoff.c index 72e556d552d..5dfa408f8e3 100644 --- a/contrib/fuzzystrmatch/daitch_mokotoff.c +++ b/contrib/fuzzystrmatch/daitch_mokotoff.c @@ -38,7 +38,7 @@ * 744300 instead of 743000 as for "BEST". * - "J" is considered (only) a consonant in DaitchMokotoffSoundex.java * - "Y" is not considered a vowel in DaitchMokotoffSoundex.java -*/ + */ #include "postgres.h" @@ -53,7 +53,7 @@ * The soundex coding chart table is adapted from * https://www.jewishgen.org/InfoFiles/Soundex.html * See daitch_mokotoff_header.pl for details. -*/ + */ /* Generated coding chart table */ #include "daitch_mokotoff.h" diff --git a/contrib/fuzzystrmatch/dmetaphone.c b/contrib/fuzzystrmatch/dmetaphone.c index 062667527c2..f8ab8e47c85 100644 --- a/contrib/fuzzystrmatch/dmetaphone.c +++ b/contrib/fuzzystrmatch/dmetaphone.c @@ -347,10 +347,10 @@ SetAt(metastring *s, int pos, char c) /* - Caveats: the START value is 0 based -*/ + * Caveats: the START value is 0 based + */ static int -StringAt(metastring *s, int start, int length,...) +StringAt(metastring *s, int start, int length, ...) { char *test; char *pos; diff --git a/contrib/fuzzystrmatch/fuzzystrmatch.c b/contrib/fuzzystrmatch/fuzzystrmatch.c index 90a1969b114..e527b1048b5 100644 --- a/contrib/fuzzystrmatch/fuzzystrmatch.c +++ b/contrib/fuzzystrmatch/fuzzystrmatch.c @@ -97,9 +97,11 @@ soundex_code(char letter) ****************************************************************************/ -/* I add modifications to the traditional metaphone algorithm that you - might find in books. Define this if you want metaphone to behave - traditionally */ +/* + * I add modifications to the traditional metaphone algorithm that you + * might find in books. Define this if you want metaphone to behave + * traditionally + */ #undef USE_TRADITIONAL_METAPHONE /* Special encodings */ @@ -302,8 +304,10 @@ metaphone(PG_FUNCTION_ARGS) * function (palloc, etc). */ -/* I suppose I could have been using a character pointer instead of - * accessing the array directly... */ +/* + * I suppose I could have been using a character pointer instead of + * accessing the array directly... + */ /* Look at the next letter in the word */ #define Next_Letter (pg_ascii_toupper((unsigned char) word[w_idx+1])) diff --git a/contrib/intarray/_int_gist.c b/contrib/intarray/_int_gist.c index 586e19df01b..98711ac54e2 100644 --- a/contrib/intarray/_int_gist.c +++ b/contrib/intarray/_int_gist.c @@ -25,8 +25,8 @@ /* or: #define MAXNUMELTS 1000000 */ /* -** GiST support methods -*/ + * GiST support methods + */ PG_FUNCTION_INFO_V1(g_int_consistent); PG_FUNCTION_INFO_V1(g_int_compress); PG_FUNCTION_INFO_V1(g_int_decompress); @@ -38,11 +38,11 @@ PG_FUNCTION_INFO_V1(g_int_options); /* -** The GiST Consistent method for _intments -** Should return false if for all data items x below entry, -** the predicate x op query == false, where op is the oper -** corresponding to strategy in the pg_amop table. -*/ + * The GiST Consistent method for _intments + * Should return false if for all data items x below entry, + * the predicate x op query == false, where op is the oper + * corresponding to strategy in the pg_amop table. + */ Datum g_int_consistent(PG_FUNCTION_ARGS) { @@ -158,8 +158,8 @@ g_int_union(PG_FUNCTION_ARGS) } /* -** GiST Compress and Decompress methods -*/ + * GiST Compress and Decompress methods + */ Datum g_int_compress(PG_FUNCTION_ARGS) { @@ -359,8 +359,8 @@ g_int_decompress(PG_FUNCTION_ARGS) } /* -** The GiST Penalty method for _intments -*/ + * The GiST Penalty method for _intments + */ Datum g_int_penalty(PG_FUNCTION_ARGS) { @@ -436,9 +436,9 @@ comparecost(const void *a, const void *b) } /* -** The GiST PickSplit method for _intments -** We use Guttman's poly time split algorithm -*/ + * The GiST PickSplit method for _intments + * We use Guttman's poly time split algorithm + */ Datum g_int_picksplit(PG_FUNCTION_ARGS) { diff --git a/contrib/intarray/_int_op.c b/contrib/intarray/_int_op.c index a706e353c6f..04067146929 100644 --- a/contrib/intarray/_int_op.c +++ b/contrib/intarray/_int_op.c @@ -96,7 +96,8 @@ _int_same(PG_FUNCTION_ARGS) PG_RETURN_BOOL(result); } -/* _int_overlap -- does a overlap b? +/* + * _int_overlap -- does a overlap b? */ Datum _int_overlap(PG_FUNCTION_ARGS) diff --git a/contrib/intarray/_intbig_gist.c b/contrib/intarray/_intbig_gist.c index 6ffb03dab58..396da703438 100644 --- a/contrib/intarray/_intbig_gist.c +++ b/contrib/intarray/_intbig_gist.c @@ -12,8 +12,8 @@ #define GETENTRY(vec,pos) ((GISTTYPE *) DatumGetPointer((vec)->vector[(pos)].key)) /* -** _intbig methods -*/ + * _intbig methods + */ PG_FUNCTION_INFO_V1(g_intbig_consistent); PG_FUNCTION_INFO_V1(g_intbig_compress); PG_FUNCTION_INFO_V1(g_intbig_decompress); diff --git a/contrib/isn/isn.c b/contrib/isn/isn.c index bbe4344e6ad..a1d2f26158a 100644 --- a/contrib/isn/isn.c +++ b/contrib/isn/isn.c @@ -933,7 +933,8 @@ _PG_init(void) MarkGUCPrefixReserved("isn"); } -/* isn_out +/* + * isn_out */ PG_FUNCTION_INFO_V1(isn_out); Datum @@ -949,7 +950,8 @@ isn_out(PG_FUNCTION_ARGS) PG_RETURN_CSTRING(result); } -/* ean13_out +/* + * ean13_out */ PG_FUNCTION_INFO_V1(ean13_out); Datum @@ -965,7 +967,8 @@ ean13_out(PG_FUNCTION_ARGS) PG_RETURN_CSTRING(result); } -/* ean13_in +/* + * ean13_in */ PG_FUNCTION_INFO_V1(ean13_in); Datum @@ -979,7 +982,8 @@ ean13_in(PG_FUNCTION_ARGS) PG_RETURN_EAN13(result); } -/* isbn_in +/* + * isbn_in */ PG_FUNCTION_INFO_V1(isbn_in); Datum @@ -993,7 +997,8 @@ isbn_in(PG_FUNCTION_ARGS) PG_RETURN_EAN13(result); } -/* ismn_in +/* + * ismn_in */ PG_FUNCTION_INFO_V1(ismn_in); Datum @@ -1007,7 +1012,8 @@ ismn_in(PG_FUNCTION_ARGS) PG_RETURN_EAN13(result); } -/* issn_in +/* + * issn_in */ PG_FUNCTION_INFO_V1(issn_in); Datum @@ -1021,7 +1027,8 @@ issn_in(PG_FUNCTION_ARGS) PG_RETURN_EAN13(result); } -/* upc_in +/* + * upc_in */ PG_FUNCTION_INFO_V1(upc_in); Datum @@ -1035,8 +1042,9 @@ upc_in(PG_FUNCTION_ARGS) PG_RETURN_EAN13(result); } -/* casting functions -*/ +/* + * casting functions + */ PG_FUNCTION_INFO_V1(isbn_cast_from_ean13); Datum isbn_cast_from_ean13(PG_FUNCTION_ARGS) @@ -1086,7 +1094,8 @@ upc_cast_from_ean13(PG_FUNCTION_ARGS) } -/* is_valid - returns false if the "invalid-check-digit-on-input" is set +/* + * is_valid - returns false if the "invalid-check-digit-on-input" is set */ PG_FUNCTION_INFO_V1(is_valid); Datum @@ -1097,7 +1106,8 @@ is_valid(PG_FUNCTION_ARGS) PG_RETURN_BOOL((val & 1) == 0); } -/* make_valid - unsets the "invalid-check-digit-on-input" flag +/* + * make_valid - unsets the "invalid-check-digit-on-input" flag */ PG_FUNCTION_INFO_V1(make_valid); Datum @@ -1109,7 +1119,8 @@ make_valid(PG_FUNCTION_ARGS) PG_RETURN_EAN13(val); } -/* this function temporarily sets weak input flag +/* + * this function temporarily sets weak input flag * (to lose the strictness of check digit acceptance) */ PG_FUNCTION_INFO_V1(accept_weak_input); diff --git a/contrib/jsonb_plpython/jsonb_plpython.c b/contrib/jsonb_plpython/jsonb_plpython.c index c2c4ce37c08..4de75a04e76 100644 --- a/contrib/jsonb_plpython/jsonb_plpython.c +++ b/contrib/jsonb_plpython/jsonb_plpython.c @@ -16,7 +16,7 @@ PG_MODULE_MAGIC_EXT( typedef char *(*PLyObject_AsString_t) (PyObject *plrv); static PLyObject_AsString_t PLyObject_AsString_p; -typedef void (*PLy_elog_impl_t) (int elevel, const char *fmt,...); +typedef void (*PLy_elog_impl_t) (int elevel, const char *fmt, ...); static PLy_elog_impl_t PLy_elog_impl_p; /* diff --git a/contrib/pgcrypto/crypt-blowfish.c b/contrib/pgcrypto/crypt-blowfish.c index 5a1b1e10091..563393c9284 100644 --- a/contrib/pgcrypto/crypt-blowfish.c +++ b/contrib/pgcrypto/crypt-blowfish.c @@ -741,15 +741,19 @@ _crypt_blowfish_rn(const char *key, const char *setting, output[7 + 22 - 1] = BF_itoa64[(int) BF_atoi64[(int) setting[7 + 22 - 1] - 0x20] & 0x30]; -/* This has to be bug-compatible with the original implementation, so - * only encode 23 of the 24 bytes. :-) */ +/* + * This has to be bug-compatible with the original implementation, so + * only encode 23 of the 24 bytes. :-) + */ BF_swap(data.binary.output, 6); BF_encode(&output[7 + 22], data.binary.output, 23); output[7 + 22 + 31] = '\0'; -/* Overwrite the most obvious sensitive data we have on the stack. Note +/* + * Overwrite the most obvious sensitive data we have on the stack. Note * that this does not guarantee there's no sensitive data left on the - * stack and/or in registers; I'm not aware of portable code that does. */ + * stack and/or in registers; I'm not aware of portable code that does. + */ px_memset(&data, 0, sizeof(data)); return output; diff --git a/contrib/pgcrypto/crypt-gensalt.c b/contrib/pgcrypto/crypt-gensalt.c index 7149dce02d5..393c323fd57 100644 --- a/contrib/pgcrypto/crypt-gensalt.c +++ b/contrib/pgcrypto/crypt-gensalt.c @@ -45,8 +45,10 @@ _crypt_gensalt_extended_rn(unsigned long count, { unsigned long value; -/* Even iteration counts make it easier to detect weak DES keys from a look - * at the hash, so they should be avoided */ +/* + * Even iteration counts make it easier to detect weak DES keys from a look + * at the hash, so they should be avoided + */ if (size < 3 || output_size < 1 + 4 + 4 + 1 || (count && (count > 0xffffff || !(count & 1)))) { diff --git a/contrib/pgcrypto/px.c b/contrib/pgcrypto/px.c index f08bc498ac8..32f62f3fc1b 100644 --- a/contrib/pgcrypto/px.c +++ b/contrib/pgcrypto/px.c @@ -147,7 +147,7 @@ px_set_debug_handler(void (*handler) (const char *)) } void -px_debug(const char *fmt,...) +px_debug(const char *fmt, ...) { va_list ap; diff --git a/contrib/pgcrypto/px.h b/contrib/pgcrypto/px.h index a09533a3582..440acf6a527 100644 --- a/contrib/pgcrypto/px.h +++ b/contrib/pgcrypto/px.h @@ -194,7 +194,7 @@ bool CheckFIPSMode(void); void CheckBuiltinCryptoMode(void); #ifdef PX_DEBUG -void px_debug(const char *fmt,...) pg_attribute_printf(1, 2); +void px_debug(const char *fmt, ...) pg_attribute_printf(1, 2); #else #define px_debug(...) #endif diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c index 0ff4ec23164..0657618eda3 100644 --- a/contrib/postgres_fdw/postgres_fdw.c +++ b/contrib/postgres_fdw/postgres_fdw.c @@ -5593,7 +5593,7 @@ postgresImportForeignStatistics(Relation relation, List *va_cols, int elevel) const char *relname = NULL; ForeignTable *table; ForeignServer *server; - RemoteStatsResults remstats = {.rel = NULL,.att = NULL}; + RemoteStatsResults remstats = {.rel = NULL, .att = NULL}; RemoteAttributeMapping *remattrmap = NULL; int attrcnt = 0; bool restore_stats = false; diff --git a/contrib/seg/seg.c b/contrib/seg/seg.c index 972265b1bac..fcded0245aa 100644 --- a/contrib/seg/seg.c +++ b/contrib/seg/seg.c @@ -1,11 +1,11 @@ /* * contrib/seg/seg.c * - ****************************************************************************** - This file contains routines that can be bound to a Postgres backend and - called by the backend in the process of processing queries. The calling - format for these routines is dictated by Postgres architecture. -******************************************************************************/ + * + * This file contains routines that can be bound to a Postgres backend and + * called by the backend in the process of processing queries. The calling + * format for these routines is dictated by Postgres architecture. + */ #include "postgres.h" @@ -24,9 +24,9 @@ /* -#define GIST_DEBUG -#define GIST_QUERY_DEBUG -*/ + * #define GIST_DEBUG + * #define GIST_QUERY_DEBUG + */ PG_MODULE_MAGIC_EXT( .name = "seg", @@ -44,8 +44,8 @@ typedef struct } gseg_picksplit_item; /* -** Input/Output routines -*/ + * Input/Output routines + */ PG_FUNCTION_INFO_V1(seg_in); PG_FUNCTION_INFO_V1(seg_out); PG_FUNCTION_INFO_V1(seg_size); @@ -54,8 +54,8 @@ PG_FUNCTION_INFO_V1(seg_upper); PG_FUNCTION_INFO_V1(seg_center); /* -** GiST support methods -*/ + * GiST support methods + */ PG_FUNCTION_INFO_V1(gseg_consistent); PG_FUNCTION_INFO_V1(gseg_compress); PG_FUNCTION_INFO_V1(gseg_decompress); @@ -69,8 +69,8 @@ static Datum gseg_binary_union(Datum r1, Datum r2, int *sizep); /* -** R-tree support functions -*/ + * R-tree support functions + */ PG_FUNCTION_INFO_V1(seg_same); PG_FUNCTION_INFO_V1(seg_contains); PG_FUNCTION_INFO_V1(seg_contained); @@ -84,8 +84,8 @@ PG_FUNCTION_INFO_V1(seg_inter); static void rt_seg_size(SEG *a, float *size); /* -** Various operators -*/ + * Various operators + */ PG_FUNCTION_INFO_V1(seg_cmp); PG_FUNCTION_INFO_V1(seg_lt); PG_FUNCTION_INFO_V1(seg_le); @@ -94,8 +94,8 @@ PG_FUNCTION_INFO_V1(seg_ge); PG_FUNCTION_INFO_V1(seg_different); /* -** Auxiliary functions -*/ + * Auxiliary functions + */ static int restore(char *result, float val, int n); @@ -191,11 +191,11 @@ seg_upper(PG_FUNCTION_ARGS) *****************************************************************************/ /* -** The GiST Consistent method for segments -** Should return false if for all data items x below entry, -** the predicate x op query == false, where op is the oper -** corresponding to strategy in the pg_amop table. -*/ + * The GiST Consistent method for segments + * Should return false if for all data items x below entry, + * the predicate x op query == false, where op is the oper + * corresponding to strategy in the pg_amop table. + */ Datum gseg_consistent(PG_FUNCTION_ARGS) { @@ -221,9 +221,9 @@ gseg_consistent(PG_FUNCTION_ARGS) } /* -** The GiST Union method for segments -** returns the minimal bounding seg that encloses all the entries in entryvec -*/ + * The GiST Union method for segments + * returns the minimal bounding seg that encloses all the entries in entryvec + */ Datum gseg_union(PG_FUNCTION_ARGS) { @@ -252,9 +252,9 @@ gseg_union(PG_FUNCTION_ARGS) } /* -** GiST Compress and Decompress methods for segments -** do not do anything. -*/ + * GiST Compress and Decompress methods for segments + * do not do anything. + */ Datum gseg_compress(PG_FUNCTION_ARGS) { @@ -268,9 +268,9 @@ gseg_decompress(PG_FUNCTION_ARGS) } /* -** The GiST Penalty method for segments -** As in the R-tree paper, we use change in area as our penalty metric -*/ + * The GiST Penalty method for segments + * As in the R-tree paper, we use change in area as our penalty metric + */ Datum gseg_penalty(PG_FUNCTION_ARGS) { @@ -411,8 +411,8 @@ gseg_picksplit(PG_FUNCTION_ARGS) } /* -** Equality methods -*/ + * Equality methods + */ Datum gseg_same(PG_FUNCTION_ARGS) { @@ -431,8 +431,8 @@ gseg_same(PG_FUNCTION_ARGS) } /* -** SUPPORT ROUTINES -*/ + * SUPPORT ROUTINES + */ static Datum gseg_leaf_consistent(Datum key, Datum query, StrategyNumber strategy) { @@ -570,7 +570,8 @@ seg_same(PG_FUNCTION_ARGS) PG_RETURN_BOOL(cmp == 0); } -/* seg_overlap -- does a overlap b? +/* + * seg_overlap -- does a overlap b? */ Datum seg_overlap(PG_FUNCTION_ARGS) @@ -582,7 +583,8 @@ seg_overlap(PG_FUNCTION_ARGS) ((b->upper >= a->upper) && (b->lower <= a->upper))); } -/* seg_over_left -- is the right edge of (a) located at or left of the right edge of (b)? +/* + * seg_over_left -- is the right edge of (a) located at or left of the right edge of (b)? */ Datum seg_over_left(PG_FUNCTION_ARGS) @@ -593,7 +595,8 @@ seg_over_left(PG_FUNCTION_ARGS) PG_RETURN_BOOL(a->upper <= b->upper); } -/* seg_left -- is (a) entirely on the left of (b)? +/* + * seg_left -- is (a) entirely on the left of (b)? */ Datum seg_left(PG_FUNCTION_ARGS) @@ -604,7 +607,8 @@ seg_left(PG_FUNCTION_ARGS) PG_RETURN_BOOL(a->upper < b->lower); } -/* seg_right -- is (a) entirely on the right of (b)? +/* + * seg_right -- is (a) entirely on the right of (b)? */ Datum seg_right(PG_FUNCTION_ARGS) @@ -615,7 +619,8 @@ seg_right(PG_FUNCTION_ARGS) PG_RETURN_BOOL(a->lower > b->upper); } -/* seg_over_right -- is the left edge of (a) located at or right of the left edge of (b)? +/* + * seg_over_right -- is the left edge of (a) located at or right of the left edge of (b)? */ Datum seg_over_right(PG_FUNCTION_ARGS) @@ -1059,10 +1064,11 @@ restore(char *result, float val, int n) /* -** Miscellany -*/ + * Miscellany + */ -/* find out the number of significant digits in a string representing +/* + * find out the number of significant digits in a string representing * a floating point number */ int diff --git a/contrib/spi/moddatetime.c b/contrib/spi/moddatetime.c index 5013eee433e..3e64964b969 100644 --- a/contrib/spi/moddatetime.c +++ b/contrib/spi/moddatetime.c @@ -1,18 +1,18 @@ /* -moddatetime.c - -contrib/spi/moddatetime.c - -What is this? -It is a function to be called from a trigger for the purpose of updating -a modification datetime stamp in a record when that record is UPDATEd. - -Credits -This is 95%+ based on autoinc.c, which I used as a starting point as I do -not really know what I am doing. I also had help from -Jan Wieck who told me about the timestamp_in("now") function. -OH, me, I'm Terry Mackintosh -*/ + * moddatetime.c + * + * contrib/spi/moddatetime.c + * + * What is this? + * It is a function to be called from a trigger for the purpose of updating + * a modification datetime stamp in a record when that record is UPDATEd. + * + * Credits + * This is 95%+ based on autoinc.c, which I used as a starting point as I do + * not really know what I am doing. I also had help from + * Jan Wieck who told me about the timestamp_in("now") function. + * OH, me, I'm Terry Mackintosh + */ #include "postgres.h" #include "access/htup_details.h" diff --git a/contrib/xml2/xpath.c b/contrib/xml2/xpath.c index 14b9e014d74..7bf477e0c3f 100644 --- a/contrib/xml2/xpath.c +++ b/contrib/xml2/xpath.c @@ -232,7 +232,8 @@ pgxmlNodeSetToText(xmlNodeSetPtr nodeset, } -/* Translate a PostgreSQL "varlena" -i.e. a variable length parameter +/* + * Translate a PostgreSQL "varlena" -i.e. a variable length parameter * into the libxml2 representation */ static xmlChar * diff --git a/src/backend/access/gin/gininsert.c b/src/backend/access/gin/gininsert.c index 9d83a495775..cb9ed3b563c 100644 --- a/src/backend/access/gin/gininsert.c +++ b/src/backend/access/gin/gininsert.c @@ -2405,7 +2405,7 @@ _gin_parse_tuple_key(GinTuple *a) } /* -* _gin_parse_tuple_items + * _gin_parse_tuple_items * Return a pointer to a palloc'd array of decompressed TID array. */ static ItemPointer diff --git a/src/backend/access/index/amvalidate.c b/src/backend/access/index/amvalidate.c index f86ba7d76d2..96ef19e96ff 100644 --- a/src/backend/access/index/amvalidate.c +++ b/src/backend/access/index/amvalidate.c @@ -150,7 +150,7 @@ identify_opfamily_groups(CatCList *oprlist, CatCList *proclist) */ bool check_amproc_signature(Oid funcid, Oid restype, bool exact, - int minargs, int maxargs,...) + int minargs, int maxargs, ...) { bool result = true; HeapTuple tp; diff --git a/src/backend/access/nbtree/nbtreadpage.c b/src/backend/access/nbtree/nbtreadpage.c index 2ba1ca66023..448a5141244 100644 --- a/src/backend/access/nbtree/nbtreadpage.c +++ b/src/backend/access/nbtree/nbtreadpage.c @@ -3339,7 +3339,7 @@ _bt_skiparray_set_isnull(Relation rel, ScanKey skey, BTArrayKeyInfo *array) * compare the value that they're searching for to a binary search pivot. * However, unlike _bt_compare, this function's "tuple argument" comes first, * while its "array/scankey argument" comes second. -*/ + */ static inline int32 _bt_compare_array_skey(FmgrInfo *orderproc, Datum tupdatum, bool tupnull, diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index f0434da40c9..d34e34a56c5 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -1200,7 +1200,7 @@ ReserveXLogInsertLocation(int size, XLogRecPtr *StartPos, XLogRecPtr *EndPos, * *EndPos value. However, if we are already at the beginning of the current * segment, *StartPos and *EndPos are set to the current location without * reserving any space, and the function returns false. -*/ + */ static bool ReserveXLogSwitch(XLogRecPtr *StartPos, XLogRecPtr *EndPos, XLogRecPtr *PrevPtr) { diff --git a/src/backend/access/transam/xlogreader.c b/src/backend/access/transam/xlogreader.c index 8849610db00..3145c58a9b1 100644 --- a/src/backend/access/transam/xlogreader.c +++ b/src/backend/access/transam/xlogreader.c @@ -41,7 +41,7 @@ #include "common/logging.h" #endif -static void report_invalid_record(XLogReaderState *state, const char *fmt,...) +static void report_invalid_record(XLogReaderState *state, const char *fmt, ...) pg_attribute_printf(2, 3); static void allocate_recordbuf(XLogReaderState *state, uint32 reclength); static int ReadPageInternal(XLogReaderState *state, XLogRecPtr pageptr, @@ -70,7 +70,7 @@ static void WALOpenSegmentInit(WALOpenSegment *seg, WALSegmentContext *segcxt, * the current record being read. */ static void -report_invalid_record(XLogReaderState *state, const char *fmt,...) +report_invalid_record(XLogReaderState *state, const char *fmt, ...) { va_list args; diff --git a/src/backend/backup/basebackup_incremental.c b/src/backend/backup/basebackup_incremental.c index 6f3552c6a4a..9235f6b268c 100644 --- a/src/backend/backup/basebackup_incremental.c +++ b/src/backend/backup/basebackup_incremental.c @@ -140,7 +140,7 @@ static void manifest_process_wal_range(JsonManifestParseContext *context, XLogRecPtr start_lsn, XLogRecPtr end_lsn); pg_noreturn static void manifest_report_error(JsonManifestParseContext *context, - const char *fmt,...) + const char *fmt, ...) pg_attribute_printf(2, 3); static int compare_block_numbers(const void *a, const void *b); @@ -1018,7 +1018,7 @@ manifest_process_wal_range(JsonManifestParseContext *context, * manifest. */ static void -manifest_report_error(JsonManifestParseContext *context, const char *fmt,...) +manifest_report_error(JsonManifestParseContext *context, const char *fmt, ...) { StringInfoData errbuf; diff --git a/src/backend/backup/walsummary.c b/src/backend/backup/walsummary.c index 4cd1824fbc6..0cdc86af30b 100644 --- a/src/backend/backup/walsummary.c +++ b/src/backend/backup/walsummary.c @@ -319,7 +319,7 @@ WriteWalSummary(void *wal_summary_io, void *data, int length) * Error-reporting callback for use with CreateBlockRefTableReader. */ void -ReportWalSummaryError(void *callback_arg, char *fmt,...) +ReportWalSummaryError(void *callback_arg, char *fmt, ...) { StringInfoData buf; va_list ap; diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c index 67424fe3b0c..007ede997c5 100644 --- a/src/backend/catalog/aclchk.c +++ b/src/backend/catalog/aclchk.c @@ -3057,7 +3057,8 @@ pg_aclmask(ObjectType objtype, Oid object_oid, AttrNumber attnum, Oid roleid, } -/* **************************************************************** +/* + * **************************************************************** * Exported routines for examining a user's privileges for various objects * * See aclmask() for a description of the common API for these functions. diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c index 7678ab13f6a..4f6b00bd739 100644 --- a/src/backend/catalog/heap.c +++ b/src/backend/catalog/heap.c @@ -263,7 +263,8 @@ SystemAttributeByName(const char *attname) /* ---------------------------------------------------------------- * XXX END OF UGLY HARD CODED BADNESS XXX - * ---------------------------------------------------------------- */ + * ---------------------------------------------------------------- + */ /* ---------------------------------------------------------------- diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index 020a5919b84..f66e80b757c 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -1880,7 +1880,8 @@ ind_fetch_func(VacAttrStatsP stats, int rownum, bool *isNull) } -/*========================================================================== +/* + * ========================================================================== * * Code below this point represents the "standard" type-specific statistics * analysis algorithms. This code can be replaced on a per-data-type basis diff --git a/src/backend/commands/copyto.c b/src/backend/commands/copyto.c index 85d15353647..1085d0d5b8d 100644 --- a/src/backend/commands/copyto.c +++ b/src/backend/commands/copyto.c @@ -1327,7 +1327,7 @@ DoCopyTo(CopyToState cstate) * root_rel can be set to the root table of rel if rel is a partition * table so that we can send tuples in root_rel's rowtype, which might * differ from individual partitions. -*/ + */ static void CopyRelationTo(CopyToState cstate, Relation rel, Relation root_rel, uint64 *processed) { diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 88451c91448..92b0f38c353 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -13903,7 +13903,7 @@ transformFkeyCheckAttrs(Relation pkrel, * * Wrapper around find_coercion_pathway() for ATAddForeignKeyConstraint(). * Caller has equal regard for binary coercibility and for an exact match. -*/ + */ static CoercionPathType findFkeyCast(Oid targetTypeId, Oid sourceTypeId, Oid *funcid) { diff --git a/src/backend/executor/nodeAppend.c b/src/backend/executor/nodeAppend.c index 85c85569b5e..987358e27fa 100644 --- a/src/backend/executor/nodeAppend.c +++ b/src/backend/executor/nodeAppend.c @@ -12,7 +12,8 @@ * *------------------------------------------------------------------------- */ -/* INTERFACE ROUTINES +/* + * INTERFACE ROUTINES * ExecInitAppend - initialize the append node * ExecAppend - retrieve the next tuple from the node * ExecEndAppend - shut down the append node diff --git a/src/backend/executor/nodeBitmapAnd.c b/src/backend/executor/nodeBitmapAnd.c index 9007dda3802..64092fa8065 100644 --- a/src/backend/executor/nodeBitmapAnd.c +++ b/src/backend/executor/nodeBitmapAnd.c @@ -12,7 +12,8 @@ * *------------------------------------------------------------------------- */ -/* INTERFACE ROUTINES +/* + * INTERFACE ROUTINES * ExecInitBitmapAnd - initialize the BitmapAnd node * MultiExecBitmapAnd - retrieve the result bitmap from the node * ExecEndBitmapAnd - shut down the BitmapAnd node diff --git a/src/backend/executor/nodeBitmapOr.c b/src/backend/executor/nodeBitmapOr.c index 148c80fdae6..b98b96172fe 100644 --- a/src/backend/executor/nodeBitmapOr.c +++ b/src/backend/executor/nodeBitmapOr.c @@ -12,7 +12,8 @@ * *------------------------------------------------------------------------- */ -/* INTERFACE ROUTINES +/* + * INTERFACE ROUTINES * ExecInitBitmapOr - initialize the BitmapOr node * MultiExecBitmapOr - retrieve the result bitmap from the node * ExecEndBitmapOr - shut down the BitmapOr node diff --git a/src/backend/executor/nodeMergeAppend.c b/src/backend/executor/nodeMergeAppend.c index 72eebd50bdf..0173074d85d 100644 --- a/src/backend/executor/nodeMergeAppend.c +++ b/src/backend/executor/nodeMergeAppend.c @@ -12,7 +12,8 @@ * *------------------------------------------------------------------------- */ -/* INTERFACE ROUTINES +/* + * INTERFACE ROUTINES * ExecInitMergeAppend - initialize the MergeAppend node * ExecMergeAppend - retrieve the next tuple from the node * ExecEndMergeAppend - shut down the MergeAppend node diff --git a/src/backend/executor/nodeModifyTable.c b/src/backend/executor/nodeModifyTable.c index 4cb057ca4f9..478cb01783c 100644 --- a/src/backend/executor/nodeModifyTable.c +++ b/src/backend/executor/nodeModifyTable.c @@ -12,7 +12,8 @@ * *------------------------------------------------------------------------- */ -/* INTERFACE ROUTINES +/* + * INTERFACE ROUTINES * ExecInitModifyTable - initialize the ModifyTable node * ExecModifyTable - retrieve the next tuple from the node * ExecEndModifyTable - shut down the ModifyTable node diff --git a/src/backend/executor/nodeWindowAgg.c b/src/backend/executor/nodeWindowAgg.c index f52a7aae843..5cc39bd9086 100644 --- a/src/backend/executor/nodeWindowAgg.c +++ b/src/backend/executor/nodeWindowAgg.c @@ -3336,7 +3336,8 @@ window_gettupleslot(WindowObject winobj, int64 pos, TupleTableSlot *slot) return true; } -/* gettuple_eval_partition +/* + * gettuple_eval_partition * get tuple in a partition and evaluate the window function's argument * expression on it. */ @@ -3527,7 +3528,7 @@ init_notnull_info(WindowObject winobj, WindowStatePerFunc perfuncstate) * expand notnull_info if necessary. * pos: not null info position * argno: argument number -*/ + */ static void grow_notnull_info(WindowObject winobj, int64 pos, int argno) { diff --git a/src/backend/lib/rbtree.c b/src/backend/lib/rbtree.c index d7b410d4430..036f3478062 100644 --- a/src/backend/lib/rbtree.c +++ b/src/backend/lib/rbtree.c @@ -62,7 +62,7 @@ struct RBTree static RBTNode sentinel = { - .color = RBTBLACK,.left = RBTNIL,.right = RBTNIL,.parent = NULL + .color = RBTBLACK, .left = RBTNIL, .right = RBTNIL, .parent = NULL }; diff --git a/src/backend/libpq/be-secure-openssl.c b/src/backend/libpq/be-secure-openssl.c index b978497b5d4..877851a73cd 100644 --- a/src/backend/libpq/be-secure-openssl.c +++ b/src/backend/libpq/be-secure-openssl.c @@ -62,7 +62,7 @@ typedef struct { uint32 status; const char *hostname; -} HostCacheEntry; +} HostCacheEntry; static uint32 host_cache_pointer(const char *key); #define SH_PREFIX host_cache #define SH_ELEMENT_TYPE HostCacheEntry diff --git a/src/backend/libpq/pqformat.c b/src/backend/libpq/pqformat.c index ebb09db157a..8b41aa4f1cb 100644 --- a/src/backend/libpq/pqformat.c +++ b/src/backend/libpq/pqformat.c @@ -98,7 +98,7 @@ pq_beginmessage(StringInfo buf, char msgtype) } /* -------------------------------- - + * * pq_beginmessage_reuse - initialize for sending a message, reuse buffer * * This requires the buffer to be allocated in a sufficiently long-lived diff --git a/src/backend/optimizer/geqo/geqo_copy.c b/src/backend/optimizer/geqo/geqo_copy.c index 91a03566ddf..d9965342840 100644 --- a/src/backend/optimizer/geqo/geqo_copy.c +++ b/src/backend/optimizer/geqo/geqo_copy.c @@ -10,12 +10,13 @@ *------------------------------------------------------------------------- */ -/* contributed by: - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= - * Martin Utesch * Institute of Automatic Control * - = = University of Mining and Technology = - * utesch@aut.tu-freiberg.de * Freiberg, Germany * - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= +/* + * contributed by: + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= + * * Martin Utesch * Institute of Automatic Control * + * = = University of Mining and Technology = + * * utesch@aut.tu-freiberg.de * Freiberg, Germany * + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= */ /* this is adopted from D. Whitley's Genitor algorithm */ @@ -36,7 +37,8 @@ #include "postgres.h" #include "optimizer/geqo_copy.h" -/* geqo_copy +/* + * geqo_copy * * copies one gene to another * diff --git a/src/backend/optimizer/geqo/geqo_cx.c b/src/backend/optimizer/geqo/geqo_cx.c index 12cffb66415..c99183b54df 100644 --- a/src/backend/optimizer/geqo/geqo_cx.c +++ b/src/backend/optimizer/geqo/geqo_cx.c @@ -11,12 +11,13 @@ *------------------------------------------------------------------------- */ -/* contributed by: - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= - * Martin Utesch * Institute of Automatic Control * - = = University of Mining and Technology = - * utesch@aut.tu-freiberg.de * Freiberg, Germany * - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= +/* + * contributed by: + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= + * * Martin Utesch * Institute of Automatic Control * + * = = University of Mining and Technology = + * * utesch@aut.tu-freiberg.de * Freiberg, Germany * + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= */ /* the cx algorithm is adopted from Genitor : */ @@ -42,7 +43,8 @@ #include "optimizer/geqo_random.h" #include "optimizer/geqo_recombination.h" -/* cx +/* + * cx * * cycle crossover */ diff --git a/src/backend/optimizer/geqo/geqo_erx.c b/src/backend/optimizer/geqo/geqo_erx.c index f11a59e4a28..8ecd6c23f56 100644 --- a/src/backend/optimizer/geqo/geqo_erx.c +++ b/src/backend/optimizer/geqo/geqo_erx.c @@ -8,12 +8,13 @@ *------------------------------------------------------------------------- */ -/* contributed by: - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= - * Martin Utesch * Institute of Automatic Control * - = = University of Mining and Technology = - * utesch@aut.tu-freiberg.de * Freiberg, Germany * - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= +/* + * contributed by: + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= + * * Martin Utesch * Institute of Automatic Control * + * = = University of Mining and Technology = + * * utesch@aut.tu-freiberg.de * Freiberg, Germany * + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= */ /* the edge recombination algorithm is adopted from Genitor : */ @@ -46,7 +47,8 @@ static Gene gimme_gene(PlannerInfo *root, Edge edge, Edge *edge_table); static Gene edge_failure(PlannerInfo *root, Gene *gene, int index, Edge *edge_table, int num_gene); -/* alloc_edge_table +/* + * alloc_edge_table * * allocate memory for edge table * @@ -67,7 +69,8 @@ alloc_edge_table(PlannerInfo *root, int num_gene) return edge_table; } -/* free_edge_table +/* + * free_edge_table * * deallocate memory of edge table * @@ -78,7 +81,8 @@ free_edge_table(PlannerInfo *root, Edge *edge_table) pfree(edge_table); } -/* gimme_edge_table +/* + * gimme_edge_table * * fills a data structure which represents the set of explicit * edges between points in the (2) input genes @@ -136,7 +140,8 @@ gimme_edge_table(PlannerInfo *root, Gene *tour1, Gene *tour2, return ((float) (edge_total * 2) / (float) num_gene); } -/* gimme_edge +/* + * gimme_edge * * registers edge from city1 to city2 in input edge table * @@ -184,7 +189,8 @@ gimme_edge(PlannerInfo *root, Gene gene1, Gene gene2, Edge *edge_table) return 1; } -/* gimme_tour +/* + * gimme_tour * * creates a new tour using edges from the edge table. * priority is given to "shared" edges (i.e. edges which @@ -229,7 +235,8 @@ gimme_tour(PlannerInfo *root, Edge *edge_table, Gene *new_gene, int num_gene) return edge_failures; } -/* remove_gene +/* + * remove_gene * * removes input gene from edge_table. * input edge is used @@ -272,7 +279,8 @@ remove_gene(PlannerInfo *root, Gene gene, Edge edge, Edge *edge_table) } } -/* gimme_gene +/* + * gimme_gene * * priority is given to "shared" edges * (i.e. edges which both genes possess) @@ -363,7 +371,8 @@ gimme_gene(PlannerInfo *root, Edge edge, Edge *edge_table) return 0; /* to keep the compiler quiet */ } -/* edge_failure +/* + * edge_failure * * routine for handling edge failure * diff --git a/src/backend/optimizer/geqo/geqo_eval.c b/src/backend/optimizer/geqo/geqo_eval.c index 56ad3df98fa..3061d68e19d 100644 --- a/src/backend/optimizer/geqo/geqo_eval.c +++ b/src/backend/optimizer/geqo/geqo_eval.c @@ -11,12 +11,13 @@ *------------------------------------------------------------------------- */ -/* contributed by: - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= - * Martin Utesch * Institute of Automatic Control * - = = University of Mining and Technology = - * utesch@aut.tu-freiberg.de * Freiberg, Germany * - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= +/* + * contributed by: + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= + * * Martin Utesch * Institute of Automatic Control * + * = = University of Mining and Technology = + * * utesch@aut.tu-freiberg.de * Freiberg, Germany * + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= */ #include "postgres.h" diff --git a/src/backend/optimizer/geqo/geqo_main.c b/src/backend/optimizer/geqo/geqo_main.c index f2dd9d84381..5d9b65cc48a 100644 --- a/src/backend/optimizer/geqo/geqo_main.c +++ b/src/backend/optimizer/geqo/geqo_main.c @@ -12,12 +12,13 @@ *------------------------------------------------------------------------- */ -/* contributed by: - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= - * Martin Utesch * Institute of Automatic Control * - = = University of Mining and Technology = - * utesch@aut.tu-freiberg.de * Freiberg, Germany * - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= +/* + * contributed by: + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= + * * Martin Utesch * Institute of Automatic Control * + * = = University of Mining and Technology = + * * utesch@aut.tu-freiberg.de * Freiberg, Germany * + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= */ /* -- parts of this are adapted from D. Whitley's Genitor algorithm -- */ diff --git a/src/backend/optimizer/geqo/geqo_misc.c b/src/backend/optimizer/geqo/geqo_misc.c index 42604385c8f..2fb59d6e899 100644 --- a/src/backend/optimizer/geqo/geqo_misc.c +++ b/src/backend/optimizer/geqo/geqo_misc.c @@ -11,12 +11,13 @@ *------------------------------------------------------------------------- */ -/* contributed by: - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= - * Martin Utesch * Institute of Automatic Control * - = = University of Mining and Technology = - * utesch@aut.tu-freiberg.de * Freiberg, Germany * - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= +/* + * contributed by: + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= + * * Martin Utesch * Institute of Automatic Control * + * = = University of Mining and Technology = + * * utesch@aut.tu-freiberg.de * Freiberg, Germany * + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= */ #include "postgres.h" @@ -51,7 +52,8 @@ avg_pool(Pool *pool) return cumulative; } -/* print_pool +/* + * print_pool */ void print_pool(FILE *fp, Pool *pool, int start, int stop) @@ -83,7 +85,8 @@ print_pool(FILE *fp, Pool *pool, int start, int stop) fflush(fp); } -/* print_gen +/* + * print_gen * * printout for chromosome: best, worst, mean, average */ diff --git a/src/backend/optimizer/geqo/geqo_mutation.c b/src/backend/optimizer/geqo/geqo_mutation.c index 56e8445e4ea..293bba2d8de 100644 --- a/src/backend/optimizer/geqo/geqo_mutation.c +++ b/src/backend/optimizer/geqo/geqo_mutation.c @@ -9,12 +9,13 @@ *------------------------------------------------------------------------- */ -/* contributed by: - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= - * Martin Utesch * Institute of Automatic Control * - = = University of Mining and Technology = - * utesch@aut.tu-freiberg.de * Freiberg, Germany * - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= +/* + * contributed by: + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= + * * Martin Utesch * Institute of Automatic Control * + * = = University of Mining and Technology = + * * utesch@aut.tu-freiberg.de * Freiberg, Germany * + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= */ /* this is adopted from Genitor : */ diff --git a/src/backend/optimizer/geqo/geqo_ox1.c b/src/backend/optimizer/geqo/geqo_ox1.c index a5487269778..f075537df7a 100644 --- a/src/backend/optimizer/geqo/geqo_ox1.c +++ b/src/backend/optimizer/geqo/geqo_ox1.c @@ -11,12 +11,13 @@ *------------------------------------------------------------------------- */ -/* contributed by: - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= - * Martin Utesch * Institute of Automatic Control * - = = University of Mining and Technology = - * utesch@aut.tu-freiberg.de * Freiberg, Germany * - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= +/* + * contributed by: + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= + * * Martin Utesch * Institute of Automatic Control * + * = = University of Mining and Technology = + * * utesch@aut.tu-freiberg.de * Freiberg, Germany * + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= */ /* the ox algorithm is adopted from Genitor : */ @@ -41,7 +42,8 @@ #include "optimizer/geqo_random.h" #include "optimizer/geqo_recombination.h" -/* ox1 +/* + * ox1 * * position crossover */ diff --git a/src/backend/optimizer/geqo/geqo_ox2.c b/src/backend/optimizer/geqo/geqo_ox2.c index 6b703576f5a..a1732fff76b 100644 --- a/src/backend/optimizer/geqo/geqo_ox2.c +++ b/src/backend/optimizer/geqo/geqo_ox2.c @@ -11,12 +11,13 @@ *------------------------------------------------------------------------- */ -/* contributed by: - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= - * Martin Utesch * Institute of Automatic Control * - = = University of Mining and Technology = - * utesch@aut.tu-freiberg.de * Freiberg, Germany * - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= +/* + * contributed by: + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= + * * Martin Utesch * Institute of Automatic Control * + * = = University of Mining and Technology = + * * utesch@aut.tu-freiberg.de * Freiberg, Germany * + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= */ /* the ox algorithm is adopted from Genitor : */ @@ -41,7 +42,8 @@ #include "optimizer/geqo_random.h" #include "optimizer/geqo_recombination.h" -/* ox2 +/* + * ox2 * * position crossover */ diff --git a/src/backend/optimizer/geqo/geqo_pmx.c b/src/backend/optimizer/geqo/geqo_pmx.c index af1cb868391..9434e5c8b36 100644 --- a/src/backend/optimizer/geqo/geqo_pmx.c +++ b/src/backend/optimizer/geqo/geqo_pmx.c @@ -11,12 +11,13 @@ *------------------------------------------------------------------------- */ -/* contributed by: - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= - * Martin Utesch * Institute of Automatic Control * - = = University of Mining and Technology = - * utesch@aut.tu-freiberg.de * Freiberg, Germany * - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= +/* + * contributed by: + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= + * * Martin Utesch * Institute of Automatic Control * + * = = University of Mining and Technology = + * * utesch@aut.tu-freiberg.de * Freiberg, Germany * + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= */ /* the pmx algorithm is adopted from Genitor : */ @@ -41,7 +42,8 @@ #include "optimizer/geqo_random.h" #include "optimizer/geqo_recombination.h" -/* pmx +/* + * pmx * * partially matched crossover */ diff --git a/src/backend/optimizer/geqo/geqo_pool.c b/src/backend/optimizer/geqo/geqo_pool.c index f330c739d3d..b0a8373628d 100644 --- a/src/backend/optimizer/geqo/geqo_pool.c +++ b/src/backend/optimizer/geqo/geqo_pool.c @@ -11,12 +11,13 @@ *------------------------------------------------------------------------- */ -/* contributed by: - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= - * Martin Utesch * Institute of Automatic Control * - = = University of Mining and Technology = - * utesch@aut.tu-freiberg.de * Freiberg, Germany * - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= +/* + * contributed by: + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= + * * Martin Utesch * Institute of Automatic Control * + * = = University of Mining and Technology = + * * utesch@aut.tu-freiberg.de * Freiberg, Germany * + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= */ /* -- parts of this are adapted from D. Whitley's Genitor algorithm -- */ @@ -154,7 +155,8 @@ compare(const void *arg1, const void *arg2) return -1; } -/* alloc_chromo +/* + * alloc_chromo * allocates a chromosome and string space */ Chromosome * @@ -168,7 +170,8 @@ alloc_chromo(PlannerInfo *root, int string_length) return chromo; } -/* free_chromo +/* + * free_chromo * deallocates a chromosome and string space */ void @@ -178,7 +181,8 @@ free_chromo(PlannerInfo *root, Chromosome *chromo) pfree(chromo); } -/* spread_chromo +/* + * spread_chromo * inserts a new chromosome into the pool, displacing worst gene in pool * assumes best->worst = smallest->largest */ diff --git a/src/backend/optimizer/geqo/geqo_px.c b/src/backend/optimizer/geqo/geqo_px.c index 662a17c8437..5d89a6d731b 100644 --- a/src/backend/optimizer/geqo/geqo_px.c +++ b/src/backend/optimizer/geqo/geqo_px.c @@ -11,12 +11,13 @@ *------------------------------------------------------------------------- */ -/* contributed by: - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= - * Martin Utesch * Institute of Automatic Control * - = = University of Mining and Technology = - * utesch@aut.tu-freiberg.de * Freiberg, Germany * - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= +/* + * contributed by: + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= + * * Martin Utesch * Institute of Automatic Control * + * = = University of Mining and Technology = + * * utesch@aut.tu-freiberg.de * Freiberg, Germany * + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= */ /* the px algorithm is adopted from Genitor : */ @@ -41,7 +42,8 @@ #include "optimizer/geqo_random.h" #include "optimizer/geqo_recombination.h" -/* px +/* + * px * * position crossover */ diff --git a/src/backend/optimizer/geqo/geqo_recombination.c b/src/backend/optimizer/geqo/geqo_recombination.c index 41d35c179e1..743687240de 100644 --- a/src/backend/optimizer/geqo/geqo_recombination.c +++ b/src/backend/optimizer/geqo/geqo_recombination.c @@ -8,12 +8,13 @@ *------------------------------------------------------------------------- */ -/* contributed by: - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= - * Martin Utesch * Institute of Automatic Control * - = = University of Mining and Technology = - * utesch@aut.tu-freiberg.de * Freiberg, Germany * - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= +/* + * contributed by: + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= + * * Martin Utesch * Institute of Automatic Control * + * = = University of Mining and Technology = + * * utesch@aut.tu-freiberg.de * Freiberg, Germany * + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= */ /* -- parts of this are adapted from D. Whitley's Genitor algorithm -- */ @@ -61,7 +62,8 @@ init_tour(PlannerInfo *root, Gene *tour, int num_gene) /* city table is used in these recombination methods: */ #if defined(CX) || defined(PX) || defined(OX1) || defined(OX2) -/* alloc_city_table +/* + * alloc_city_table * * allocate memory for city table */ @@ -79,7 +81,8 @@ alloc_city_table(PlannerInfo *root, int num_gene) return city_table; } -/* free_city_table +/* + * free_city_table * * deallocate memory of city table */ diff --git a/src/backend/optimizer/geqo/geqo_selection.c b/src/backend/optimizer/geqo/geqo_selection.c index a37316e8fd5..ec778d10657 100644 --- a/src/backend/optimizer/geqo/geqo_selection.c +++ b/src/backend/optimizer/geqo/geqo_selection.c @@ -11,12 +11,13 @@ *------------------------------------------------------------------------- */ -/* contributed by: - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= - * Martin Utesch * Institute of Automatic Control * - = = University of Mining and Technology = - * utesch@aut.tu-freiberg.de * Freiberg, Germany * - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= +/* + * contributed by: + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= + * * Martin Utesch * Institute of Automatic Control * + * = = University of Mining and Technology = + * * utesch@aut.tu-freiberg.de * Freiberg, Germany * + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= */ /* this is adopted from D. Whitley's Genitor algorithm */ diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c index 4270c2382c4..5fe5257b019 100644 --- a/src/backend/parser/parse_clause.c +++ b/src/backend/parser/parse_clause.c @@ -301,7 +301,8 @@ extractRemainingColumns(ParseState *pstate, return colcount; } -/* transformJoinUsingClause() +/* + * transformJoinUsingClause() * Build a complete ON clause from a partially-transformed USING list. * We are given lists of nodes representing left and right match columns. * Result is a transformed qualification expression. @@ -361,7 +362,8 @@ transformJoinUsingClause(ParseState *pstate, return result; } -/* transformJoinOnClause() +/* + * transformJoinOnClause() * Transform the qual conditions for JOIN/ON. * Result is a transformed qualification expression. */ diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c index 913ca53666f..9edace67e1d 100644 --- a/src/backend/parser/parse_coerce.c +++ b/src/backend/parser/parse_coerce.c @@ -2968,7 +2968,8 @@ check_valid_internal_signature(Oid ret_type, } -/* TypeCategory() +/* + * TypeCategory() * Assign a category to the specified type OID. * * NB: this must not return TYPCATEGORY_INVALID. @@ -2985,7 +2986,8 @@ TypeCategory(Oid type) } -/* IsPreferredType() +/* + * IsPreferredType() * Check if this type is a preferred type for the given category. * * If category is TYPCATEGORY_INVALID, then we'll return true for preferred @@ -3006,7 +3008,8 @@ IsPreferredType(TYPCATEGORY category, Oid type) } -/* IsBinaryCoercible() +/* + * IsBinaryCoercible() * Check if srctype is binary-coercible to targettype. * * This notion allows us to cheat and directly exchange values without @@ -3035,7 +3038,8 @@ IsBinaryCoercible(Oid srctype, Oid targettype) return IsBinaryCoercibleWithCast(srctype, targettype, &castoid); } -/* IsBinaryCoercibleWithCast() +/* + * IsBinaryCoercibleWithCast() * Check if srctype is binary-coercible to targettype. * * This variant also returns the OID of the pg_cast entry if one is involved. diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c index 35ff6427147..e07e7911f87 100644 --- a/src/backend/parser/parse_func.c +++ b/src/backend/parser/parse_func.c @@ -1019,7 +1019,8 @@ func_lookup_failure_details(int fgc_flags, List *argnames, bool proc_call) } -/* func_match_argtypes() +/* + * func_match_argtypes() * * Given a list of candidate functions (having the right name and number * of arguments) and an array of input datatype OIDs, produce a shortlist of @@ -1062,7 +1063,8 @@ func_match_argtypes(int nargs, } /* func_match_argtypes() */ -/* func_select_candidate() +/* + * func_select_candidate() * Given the input argtype array and more than one candidate * for the function, attempt to resolve the conflict. * @@ -1473,7 +1475,8 @@ func_select_candidate(int nargs, } /* func_select_candidate() */ -/* func_get_detail() +/* + * func_get_detail() * * Find the named function in the system catalogs. * diff --git a/src/backend/parser/parse_oper.c b/src/backend/parser/parse_oper.c index 2f218c1ab8b..a7e5c686362 100644 --- a/src/backend/parser/parse_oper.c +++ b/src/backend/parser/parse_oper.c @@ -253,7 +253,8 @@ oprfuncid(Operator op) } -/* binary_oper_exact() +/* + * binary_oper_exact() * Check for an "exact" match to the specified operand types. * * If one operand is an unknown literal, assume it should be taken to be @@ -300,7 +301,8 @@ binary_oper_exact(List *opname, Oid arg1, Oid arg2) } -/* oper_select_candidate() +/* + * oper_select_candidate() * Given the input argtype array and one or more candidates * for the operator, attempt to resolve the conflict. * @@ -355,7 +357,8 @@ oper_select_candidate(int nargs, } -/* oper() -- search for a binary operator +/* + * oper() -- search for a binary operator * Given operator name, types of arg1 and arg2, return oper struct. * * IMPORTANT: the returned operator (if any) is only promised to be @@ -444,7 +447,8 @@ oper(ParseState *pstate, List *opname, Oid ltypeId, Oid rtypeId, return (Operator) tup; } -/* compatible_oper() +/* + * compatible_oper() * given an opname and input datatypes, find a compatible binary operator * * This is tighter than oper() because it will not return an operator that @@ -482,7 +486,8 @@ compatible_oper(ParseState *pstate, List *op, Oid arg1, Oid arg2, return (Operator) NULL; } -/* compatible_oper_opid() -- get OID of a binary operator +/* + * compatible_oper_opid() -- get OID of a binary operator * * This is a convenience routine that extracts only the operator OID * from the result of compatible_oper(). InvalidOid is returned if the @@ -505,7 +510,8 @@ compatible_oper_opid(List *op, Oid arg1, Oid arg2, bool noError) } -/* left_oper() -- search for a unary left operator (prefix operator) +/* + * left_oper() -- search for a unary left operator (prefix operator) * Given operator name and type of arg, return oper struct. * * IMPORTANT: the returned operator (if any) is only promised to be diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c index ffd1fdab7a0..43460e4a5a5 100644 --- a/src/backend/parser/parse_relation.c +++ b/src/backend/parser/parse_relation.c @@ -3693,7 +3693,8 @@ attnameAttNum(Relation rd, const char *attname, bool sysColOK) return InvalidAttrNumber; } -/* specialAttNum() +/* + * specialAttNum() * * Check attribute name to see if it is "special", e.g. "xmin". * - thomas 2000-02-07 diff --git a/src/backend/partitioning/partbounds.c b/src/backend/partitioning/partbounds.c index 9b4277a4987..a09beec34d8 100644 --- a/src/backend/partitioning/partbounds.c +++ b/src/backend/partitioning/partbounds.c @@ -5713,7 +5713,7 @@ check_parent_values_in_new_partitions(Relation parent, * 3. In case new partitions don't contain the DEFAULT partition and the * partitioned table does not have the DEFAULT partition, the following * should be true: the sum of the bounds of new partitions should be equal - & to the bound of the split partition. + * to the bound of the split partition. * * parent: partitioned table * splitPartOid: split partition Oid diff --git a/src/backend/port/win32/signal.c b/src/backend/port/win32/signal.c index f0025428037..1ef0ca999e1 100644 --- a/src/backend/port/win32/signal.c +++ b/src/backend/port/win32/signal.c @@ -375,8 +375,10 @@ pg_signal_thread(LPVOID param) } -/* Console control handler will execute on a thread created - by the OS at the time of invocation */ +/* + * Console control handler will execute on a thread created + * by the OS at the time of invocation + */ static BOOL WINAPI pg_console_handler(DWORD dwCtrlType) { diff --git a/src/backend/replication/logical/applyparallelworker.c b/src/backend/replication/logical/applyparallelworker.c index e10f653fde7..012d55e9d3d 100644 --- a/src/backend/replication/logical/applyparallelworker.c +++ b/src/backend/replication/logical/applyparallelworker.c @@ -228,11 +228,11 @@ typedef struct ParallelApplyWorkerEntry static HTAB *ParallelApplyTxnHash = NULL; /* -* A list (pool) of active parallel apply workers. The information for -* the new worker is added to the list after successfully launching it. The -* list entry is removed if there are already enough workers in the worker -* pool at the end of the transaction. For more information about the worker -* pool, see comments atop this file. + * A list (pool) of active parallel apply workers. The information for + * the new worker is added to the list after successfully launching it. The + * list entry is removed if there are already enough workers in the worker + * pool at the end of the transaction. For more information about the worker + * pool, see comments atop this file. */ static List *ParallelApplyWorkerPool = NIL; diff --git a/src/backend/replication/logical/launcher.c b/src/backend/replication/logical/launcher.c index 7adf4dbe0d1..50051dea8c7 100644 --- a/src/backend/replication/logical/launcher.c +++ b/src/backend/replication/logical/launcher.c @@ -1180,7 +1180,7 @@ AtEOXact_ApplyLauncher(bool isCommit) * This is used to send launcher signal to stop sleeping and process the * subscriptions when current transaction commits. Should be used when new * tuple was added to the pg_subscription catalog. -*/ + */ void ApplyLauncherWakeupAtCommit(void) { diff --git a/src/backend/replication/logical/logicalfuncs.c b/src/backend/replication/logical/logicalfuncs.c index 512013b0ef0..71fbaf72269 100644 --- a/src/backend/replication/logical/logicalfuncs.c +++ b/src/backend/replication/logical/logicalfuncs.c @@ -218,7 +218,7 @@ pg_logical_slot_get_changes_guts(FunctionCallInfo fcinfo, bool confirm, bool bin * what we need. */ if (!binary && - ctx->options.output_type !=OUTPUT_PLUGIN_TEXTUAL_OUTPUT) + ctx->options.output_type != OUTPUT_PLUGIN_TEXTUAL_OUTPUT) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("logical decoding output plugin \"%s\" produces binary output, but function \"%s\" expects textual data", diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c index 817855e2720..4cf4717f764 100644 --- a/src/backend/storage/file/fd.c +++ b/src/backend/storage/file/fd.c @@ -1643,7 +1643,7 @@ PathNameOpenFilePerm(const char *fileName, int fileFlags, mode_t fileMode) * with PG_TEMP_FILE_PREFIX, so that they can be identified as temporary and * deleted at startup by RemovePgTempFiles(). Further subdirectories below * that do not need any particular prefix. -*/ + */ void PathNameCreateTemporaryDir(const char *basedir, const char *directory) { diff --git a/src/backend/storage/ipc/dsm_registry.c b/src/backend/storage/ipc/dsm_registry.c index 2b56977659b..b9961c26019 100644 --- a/src/backend/storage/ipc/dsm_registry.c +++ b/src/backend/storage/ipc/dsm_registry.c @@ -479,7 +479,7 @@ pg_get_dsm_registry_allocations(PG_FUNCTION_ARGS) entry->dsa.handle != DSA_HANDLE_INVALID) vals[2] = Int64GetDatum(dsa_get_total_size_from_handle(entry->dsa.handle)); else if (entry->type == DSMR_ENTRY_TYPE_DSH && - entry->dsh.dsa_handle !=DSA_HANDLE_INVALID) + entry->dsh.dsa_handle != DSA_HANDLE_INVALID) vals[2] = Int64GetDatum(dsa_get_total_size_from_handle(entry->dsh.dsa_handle)); else nulls[2] = true; diff --git a/src/backend/utils/activity/pgstat_io.c b/src/backend/utils/activity/pgstat_io.c index 2be26e92283..13a5d8e6440 100644 --- a/src/backend/utils/activity/pgstat_io.c +++ b/src/backend/utils/activity/pgstat_io.c @@ -331,22 +331,22 @@ pgstat_io_snapshot_cb(void) } /* -* IO statistics are not collected for all BackendTypes. -* -* The following BackendTypes do not participate in the cumulative stats -* subsystem or do not perform IO on which we currently track: -* - Dead-end backend because it is not connected to shared memory and -* doesn't do any IO -* - Syslogger because it is not connected to shared memory -* - Archiver because most relevant archiving IO is delegated to a -* specialized command or module -* -* Function returns true if BackendType participates in the cumulative stats -* subsystem for IO and false if it does not. -* -* When adding a new BackendType, also consider adding relevant restrictions to -* pgstat_tracks_io_object() and pgstat_tracks_io_op(). -*/ + * IO statistics are not collected for all BackendTypes. + * + * The following BackendTypes do not participate in the cumulative stats + * subsystem or do not perform IO on which we currently track: + * - Dead-end backend because it is not connected to shared memory and + * doesn't do any IO + * - Syslogger because it is not connected to shared memory + * - Archiver because most relevant archiving IO is delegated to a + * specialized command or module + * + * Function returns true if BackendType participates in the cumulative stats + * subsystem for IO and false if it does not. + * + * When adding a new BackendType, also consider adding relevant restrictions to + * pgstat_tracks_io_object() and pgstat_tracks_io_op(). + */ bool pgstat_tracks_io_bktype(BackendType bktype) { diff --git a/src/backend/utils/adt/cash.c b/src/backend/utils/adt/cash.c index f0487a60f00..4bf60085c61 100644 --- a/src/backend/utils/adt/cash.c +++ b/src/backend/utils/adt/cash.c @@ -164,7 +164,8 @@ cash_div_int64(Cash c, int64 i) return c / i; } -/* cash_in() +/* + * cash_in() * Convert a string to a cash data type. * Format is [$]###[,]###[.##] * Examples: 123.45 $123.45 $123,456.78 @@ -380,7 +381,8 @@ cash_in(PG_FUNCTION_ARGS) } -/* cash_out() +/* + * cash_out() * Function to convert cash to a dollars and cents representation, using * the lc_monetary locale's formatting. */ @@ -684,7 +686,8 @@ cash_cmp(PG_FUNCTION_ARGS) } -/* cash_pl() +/* + * cash_pl() * Add two cash values. */ Datum @@ -697,7 +700,8 @@ cash_pl(PG_FUNCTION_ARGS) } -/* cash_mi() +/* + * cash_mi() * Subtract two cash values. */ Datum @@ -710,7 +714,8 @@ cash_mi(PG_FUNCTION_ARGS) } -/* cash_div_cash() +/* + * cash_div_cash() * Divide cash by cash, returning float8. */ Datum @@ -730,7 +735,8 @@ cash_div_cash(PG_FUNCTION_ARGS) } -/* cash_mul_flt8() +/* + * cash_mul_flt8() * Multiply cash by float8. */ Datum @@ -743,7 +749,8 @@ cash_mul_flt8(PG_FUNCTION_ARGS) } -/* flt8_mul_cash() +/* + * flt8_mul_cash() * Multiply float8 by cash. */ Datum @@ -756,7 +763,8 @@ flt8_mul_cash(PG_FUNCTION_ARGS) } -/* cash_div_flt8() +/* + * cash_div_flt8() * Divide cash by float8. */ Datum @@ -769,7 +777,8 @@ cash_div_flt8(PG_FUNCTION_ARGS) } -/* cash_mul_flt4() +/* + * cash_mul_flt4() * Multiply cash by float4. */ Datum @@ -782,7 +791,8 @@ cash_mul_flt4(PG_FUNCTION_ARGS) } -/* flt4_mul_cash() +/* + * flt4_mul_cash() * Multiply float4 by cash. */ Datum @@ -795,7 +805,8 @@ flt4_mul_cash(PG_FUNCTION_ARGS) } -/* cash_div_flt4() +/* + * cash_div_flt4() * Divide cash by float4. * */ @@ -809,7 +820,8 @@ cash_div_flt4(PG_FUNCTION_ARGS) } -/* cash_mul_int8() +/* + * cash_mul_int8() * Multiply cash by int8. */ Datum @@ -822,7 +834,8 @@ cash_mul_int8(PG_FUNCTION_ARGS) } -/* int8_mul_cash() +/* + * int8_mul_cash() * Multiply int8 by cash. */ Datum @@ -834,7 +847,8 @@ int8_mul_cash(PG_FUNCTION_ARGS) PG_RETURN_CASH(cash_mul_int64(c, i)); } -/* cash_div_int8() +/* + * cash_div_int8() * Divide cash by 8-byte integer. */ Datum @@ -847,7 +861,8 @@ cash_div_int8(PG_FUNCTION_ARGS) } -/* cash_mul_int4() +/* + * cash_mul_int4() * Multiply cash by int4. */ Datum @@ -860,7 +875,8 @@ cash_mul_int4(PG_FUNCTION_ARGS) } -/* int4_mul_cash() +/* + * int4_mul_cash() * Multiply int4 by cash. */ Datum @@ -873,7 +889,8 @@ int4_mul_cash(PG_FUNCTION_ARGS) } -/* cash_div_int4() +/* + * cash_div_int4() * Divide cash by 4-byte integer. * */ @@ -887,7 +904,8 @@ cash_div_int4(PG_FUNCTION_ARGS) } -/* cash_mul_int2() +/* + * cash_mul_int2() * Multiply cash by int2. */ Datum @@ -899,7 +917,8 @@ cash_mul_int2(PG_FUNCTION_ARGS) PG_RETURN_CASH(cash_mul_int64(c, (int64) s)); } -/* int2_mul_cash() +/* + * int2_mul_cash() * Multiply int2 by cash. */ Datum @@ -911,7 +930,8 @@ int2_mul_cash(PG_FUNCTION_ARGS) PG_RETURN_CASH(cash_mul_int64(c, (int64) s)); } -/* cash_div_int2() +/* + * cash_div_int2() * Divide cash by int2. * */ @@ -924,7 +944,8 @@ cash_div_int2(PG_FUNCTION_ARGS) PG_RETURN_CASH(cash_div_int64(c, (int64) s)); } -/* cashlarger() +/* + * cashlarger() * Return larger of two cash values. */ Datum @@ -939,7 +960,8 @@ cashlarger(PG_FUNCTION_ARGS) PG_RETURN_CASH(result); } -/* cashsmaller() +/* + * cashsmaller() * Return smaller of two cash values. */ Datum @@ -954,7 +976,8 @@ cashsmaller(PG_FUNCTION_ARGS) PG_RETURN_CASH(result); } -/* cash_words() +/* + * cash_words() * This converts an int4 as well but to a representation using words * Obviously way North American centric - sorry */ @@ -1045,7 +1068,8 @@ cash_words(PG_FUNCTION_ARGS) } -/* cash_numeric() +/* + * cash_numeric() * Convert cash to numeric. */ Datum @@ -1101,7 +1125,8 @@ cash_numeric(PG_FUNCTION_ARGS) PG_RETURN_DATUM(result); } -/* numeric_cash() +/* + * numeric_cash() * Convert numeric to cash. */ Datum @@ -1140,7 +1165,8 @@ numeric_cash(PG_FUNCTION_ARGS) PG_RETURN_CASH(result); } -/* int4_cash() +/* + * int4_cash() * Convert int4 (int) to cash */ Datum @@ -1172,7 +1198,8 @@ int4_cash(PG_FUNCTION_ARGS) PG_RETURN_CASH(result); } -/* int8_cash() +/* + * int8_cash() * Convert int8 (bigint) to cash */ Datum diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c index c3327440380..7f746dd84c9 100644 --- a/src/backend/utils/adt/date.c +++ b/src/backend/utils/adt/date.c @@ -100,7 +100,8 @@ anytime_typmodout(bool istz, int32 typmod) *****************************************************************************/ -/* date_in() +/* + * date_in() * Given date text string, convert to internal date format. */ Datum @@ -171,7 +172,8 @@ date_in(PG_FUNCTION_ARGS) PG_RETURN_DATEADT(date); } -/* date_out() +/* + * date_out() * Given internal format date, convert to text string. */ Datum @@ -539,7 +541,8 @@ date_smaller(PG_FUNCTION_ARGS) PG_RETURN_DATEADT((dateVal1 < dateVal2) ? dateVal1 : dateVal2); } -/* Compute difference between two dates in days. +/* + * Compute difference between two dates in days. */ Datum date_mi(PG_FUNCTION_ARGS) @@ -555,7 +558,8 @@ date_mi(PG_FUNCTION_ARGS) PG_RETURN_INT32((int32) (dateVal1 - dateVal2)); } -/* Add a number of days to a date, giving a new date. +/* + * Add a number of days to a date, giving a new date. * Must handle both positive and negative numbers of days. */ Datum @@ -580,7 +584,8 @@ date_pli(PG_FUNCTION_ARGS) PG_RETURN_DATEADT(result); } -/* Subtract a number of days from a date, giving a new date. +/* + * Subtract a number of days from a date, giving a new date. */ Datum date_mii(PG_FUNCTION_ARGS) @@ -1080,7 +1085,8 @@ in_range_date_interval(PG_FUNCTION_ARGS) } -/* extract_date() +/* + * extract_date() * Extract specified field from date type. */ Datum @@ -1257,7 +1263,8 @@ extract_date(PG_FUNCTION_ARGS) } -/* Add an interval to a date, giving a new date. +/* + * Add an interval to a date, giving a new date. * Must handle both positive and negative intervals. * * We implement this by promoting the date to timestamp (without time zone) @@ -1277,7 +1284,8 @@ date_pl_interval(PG_FUNCTION_ARGS) PointerGetDatum(span)); } -/* Subtract an interval from a date, giving a new date. +/* + * Subtract an interval from a date, giving a new date. * Must handle both positive and negative intervals. * * We implement this by promoting the date to timestamp (without time zone) @@ -1297,7 +1305,8 @@ date_mi_interval(PG_FUNCTION_ARGS) PointerGetDatum(span)); } -/* date_timestamp() +/* + * date_timestamp() * Convert date to timestamp data type. */ Datum @@ -1313,7 +1322,8 @@ date_timestamp(PG_FUNCTION_ARGS) PG_RETURN_TIMESTAMP(result); } -/* timestamp_date() +/* + * timestamp_date() * Convert timestamp to date data type. */ Datum @@ -1375,7 +1385,8 @@ timestamp2date_safe(Timestamp timestamp, Node *escontext) } -/* date_timestamptz() +/* + * date_timestamptz() * Convert date to timestamp with time zone data type. */ Datum @@ -1392,7 +1403,8 @@ date_timestamptz(PG_FUNCTION_ARGS) } -/* timestamptz_date() +/* + * timestamptz_date() * Convert timestamp with time zone to date data type. */ Datum @@ -1498,7 +1510,8 @@ time_in(PG_FUNCTION_ARGS) PG_RETURN_TIMEADT(result); } -/* tm2time() +/* + * tm2time() * Convert a tm structure to a time data type. */ int @@ -1509,7 +1522,8 @@ tm2time(struct pg_tm *tm, fsec_t fsec, TimeADT *result) return 0; } -/* time_overflows() +/* + * time_overflows() * Check to see if a broken-down time-of-day is out of range. */ bool @@ -1533,7 +1547,8 @@ time_overflows(int hour, int min, int sec, fsec_t fsec) return false; } -/* float_time_overflows() +/* + * float_time_overflows() * Same, when we have seconds + fractional seconds as one "double" value. */ bool @@ -1568,7 +1583,8 @@ float_time_overflows(int hour, int min, double sec) } -/* time2tm() +/* + * time2tm() * Convert time data type to POSIX time structure. * * Note that only the hour/min/sec/fractional-sec fields are filled in. @@ -1685,7 +1701,8 @@ make_time(PG_FUNCTION_ARGS) } -/* time_support() +/* + * time_support() * * Planner support function for the time_scale() and timetz_scale() * length coercion functions (we need not distinguish them here). @@ -1706,7 +1723,8 @@ time_support(PG_FUNCTION_ARGS) PG_RETURN_POINTER(ret); } -/* time_scale() +/* + * time_scale() * Adjust time type for specified scale factor. * Used by PostgreSQL type system to stuff columns. */ @@ -1723,7 +1741,8 @@ time_scale(PG_FUNCTION_ARGS) PG_RETURN_TIMEADT(result); } -/* AdjustTimeForTypmod() +/* + * AdjustTimeForTypmod() * Force the precision of the time value to a specified value. * Uses *exactly* the same code as in AdjustTimestampForTypmod() * but we make a separate copy because those types do not @@ -1862,7 +1881,8 @@ time_smaller(PG_FUNCTION_ARGS) PG_RETURN_TIMEADT((time1 < time2) ? time1 : time2); } -/* overlaps_time() --- implements the SQL OVERLAPS operator. +/* + * overlaps_time() --- implements the SQL OVERLAPS operator. * * Algorithm is per SQL spec. This is much harder than you'd think * because the spec requires us to deliver a non-null answer in some cases @@ -1987,7 +2007,8 @@ overlaps_time(PG_FUNCTION_ARGS) #undef TIMEADT_LT } -/* timestamp_time() +/* + * timestamp_time() * Convert timestamp to time data type. */ Datum @@ -2017,7 +2038,8 @@ timestamp_time(PG_FUNCTION_ARGS) PG_RETURN_TIMEADT(result); } -/* timestamptz_time() +/* + * timestamptz_time() * Convert timestamptz to time data type. */ Datum @@ -2048,7 +2070,8 @@ timestamptz_time(PG_FUNCTION_ARGS) PG_RETURN_TIMEADT(result); } -/* datetime_timestamp() +/* + * datetime_timestamp() * Convert date and time to timestamp data type. */ Datum @@ -2071,7 +2094,8 @@ datetime_timestamp(PG_FUNCTION_ARGS) PG_RETURN_TIMESTAMP(result); } -/* time_interval() +/* + * time_interval() * Convert time to interval data type. */ Datum @@ -2089,7 +2113,8 @@ time_interval(PG_FUNCTION_ARGS) PG_RETURN_INTERVAL_P(result); } -/* interval_time() +/* + * interval_time() * Convert interval to time data type. * * This is defined as producing the fractional-day portion of the interval. @@ -2115,7 +2140,8 @@ interval_time(PG_FUNCTION_ARGS) PG_RETURN_TIMEADT(result); } -/* time_mi_time() +/* + * time_mi_time() * Subtract two times to produce an interval. */ Datum @@ -2134,7 +2160,8 @@ time_mi_time(PG_FUNCTION_ARGS) PG_RETURN_INTERVAL_P(result); } -/* time_pl_interval() +/* + * time_pl_interval() * Add interval to time. */ Datum @@ -2157,7 +2184,8 @@ time_pl_interval(PG_FUNCTION_ARGS) PG_RETURN_TIMEADT(result); } -/* time_mi_interval() +/* + * time_mi_interval() * Subtract interval from time. */ Datum @@ -2222,7 +2250,8 @@ in_range_time_interval(PG_FUNCTION_ARGS) } -/* time_part() and extract_time() +/* + * time_part() and extract_time() * Extract specified field from time type. */ static Datum @@ -2345,7 +2374,8 @@ extract_time(PG_FUNCTION_ARGS) * Time With Time Zone ADT *****************************************************************************/ -/* tm2timetz() +/* + * tm2timetz() * Convert a tm structure to a time data type. */ int @@ -2485,7 +2515,8 @@ timetztypmodout(PG_FUNCTION_ARGS) } -/* timetz2tm() +/* + * timetz2tm() * Convert TIME WITH TIME ZONE data type to POSIX time structure. */ int @@ -2506,7 +2537,8 @@ timetz2tm(TimeTzADT *time, struct pg_tm *tm, fsec_t *fsec, int *tzp) return 0; } -/* timetz_scale() +/* + * timetz_scale() * Adjust time type for specified scale factor. * Used by PostgreSQL type system to stuff columns. */ @@ -2678,7 +2710,8 @@ timetz_smaller(PG_FUNCTION_ARGS) PG_RETURN_TIMETZADT_P(result); } -/* timetz_pl_interval() +/* + * timetz_pl_interval() * Add interval to timetz. */ Datum @@ -2705,7 +2738,8 @@ timetz_pl_interval(PG_FUNCTION_ARGS) PG_RETURN_TIMETZADT_P(result); } -/* timetz_mi_interval() +/* + * timetz_mi_interval() * Subtract interval from timetz. */ Datum @@ -2774,7 +2808,8 @@ in_range_timetz_interval(PG_FUNCTION_ARGS) PG_RETURN_BOOL(timetz_cmp_internal(val, &sum) >= 0); } -/* overlaps_timetz() --- implements the SQL OVERLAPS operator. +/* + * overlaps_timetz() --- implements the SQL OVERLAPS operator. * * Algorithm is per SQL spec. This is much harder than you'd think * because the spec requires us to deliver a non-null answer in some cases @@ -2936,7 +2971,8 @@ time_timetz(PG_FUNCTION_ARGS) } -/* timestamptz_timetz() +/* + * timestamptz_timetz() * Convert timestamp to timetz data type. */ Datum @@ -2965,7 +3001,8 @@ timestamptz_timetz(PG_FUNCTION_ARGS) } -/* datetimetz_timestamptz() +/* + * datetimetz_timestamptz() * Convert date and timetz to timestamp with time zone data type. * Timestamp is stored in GMT, so add the time zone * stored with the timetz to the result. @@ -3009,7 +3046,8 @@ datetimetz_timestamptz(PG_FUNCTION_ARGS) } -/* timetz_part() and extract_timetz() +/* + * timetz_part() and extract_timetz() * Extract specified field from time type. */ static Datum @@ -3141,7 +3179,8 @@ extract_timetz(PG_FUNCTION_ARGS) return timetz_part_common(fcinfo, true); } -/* timetz_zone() +/* + * timetz_zone() * Encode time with time zone type with specified time zone. * Applies DST rules as of the transaction start time. */ @@ -3204,7 +3243,8 @@ timetz_zone(PG_FUNCTION_ARGS) PG_RETURN_TIMETZADT_P(result); } -/* timetz_izone() +/* + * timetz_izone() * Encode time with time zone type with specified time interval as time zone. */ Datum @@ -3245,7 +3285,8 @@ timetz_izone(PG_FUNCTION_ARGS) PG_RETURN_TIMETZADT_P(result); } -/* timetz_at_local() +/* + * timetz_at_local() * * Unlike for timestamp[tz]_at_local, the type for timetz does not flip between * time with/without time zone, so we cannot just call the conversion function. diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index 8f25c15fcfc..04ebc632178 100644 --- a/src/backend/utils/adt/datetime.c +++ b/src/backend/utils/adt/datetime.c @@ -739,7 +739,8 @@ ParseFractionalSecond(char *cp, fsec_t *fsec) } -/* ParseDateTime() +/* + * ParseDateTime() * Break string into tokens based on a date/time context. * Returns 0 if successful, DTERR code if bogus input detected. * @@ -967,7 +968,8 @@ ParseDateTime(const char *timestr, char *workbuf, size_t buflen, } -/* DecodeDateTime() +/* + * DecodeDateTime() * Interpret previously parsed fields for general date and time. * Return 0 if full date, 1 if only time, and negative DTERR code if problems. * (Currently, all callers treat 1 as an error return too.) @@ -1589,7 +1591,8 @@ DecodeDateTime(char **field, int *ftype, int nf, } -/* DetermineTimeZoneOffset() +/* + * DetermineTimeZoneOffset() * * Given a struct pg_tm in which tm_year, tm_mon, tm_mday, tm_hour, tm_min, * and tm_sec fields are set, and a zic-style time zone definition, determine @@ -1610,7 +1613,8 @@ DetermineTimeZoneOffset(struct pg_tm *tm, pg_tz *tzp) } -/* DetermineTimeZoneOffsetInternal() +/* + * DetermineTimeZoneOffsetInternal() * * As above, but also return the actual UTC time imputed to the date/time * into *tp. @@ -1748,7 +1752,8 @@ overflow: } -/* DetermineTimeZoneAbbrevOffset() +/* + * DetermineTimeZoneAbbrevOffset() * * Determine the GMT offset and DST flag to be attributed to a dynamic * time zone abbreviation, that is one whose meaning has changed over time. @@ -1795,7 +1800,8 @@ DetermineTimeZoneAbbrevOffset(struct pg_tm *tm, const char *abbr, pg_tz *tzp) } -/* DetermineTimeZoneAbbrevOffsetTS() +/* + * DetermineTimeZoneAbbrevOffsetTS() * * As above but the probe time is specified as a TimestampTz (hence, UTC time), * and DST status is returned into *isdst rather than into tm->tm_isdst. @@ -1832,7 +1838,8 @@ DetermineTimeZoneAbbrevOffsetTS(TimestampTz ts, const char *abbr, } -/* DetermineTimeZoneAbbrevOffsetInternal() +/* + * DetermineTimeZoneAbbrevOffsetInternal() * * Workhorse for above two functions: work from a pg_time_t probe instant. * On success, return GMT offset and DST status into *offset and *isdst. @@ -1865,7 +1872,8 @@ DetermineTimeZoneAbbrevOffsetInternal(pg_time_t t, const char *abbr, pg_tz *tzp, } -/* TimeZoneAbbrevIsKnown() +/* + * TimeZoneAbbrevIsKnown() * * Detect whether the given string is a time zone abbreviation that's known * in the specified TZDB timezone, and if so whether it's fixed or varying @@ -1899,7 +1907,8 @@ TimeZoneAbbrevIsKnown(const char *abbr, pg_tz *tzp, } -/* DecodeTimeOnly() +/* + * DecodeTimeOnly() * Interpret parsed string as time fields only. * Returns 0 if successful, DTERR code if bogus input detected. * @@ -2438,7 +2447,8 @@ DecodeTimeOnly(char **field, int *ftype, int nf, return 0; } -/* DecodeDate() +/* + * DecodeDate() * Decode date string which includes delimiters. * Return 0 if okay, a DTERR code if not. * @@ -2554,7 +2564,8 @@ DecodeDate(char *str, int fmask, int *tmask, bool *is2digits, return 0; } -/* ValidateDate() +/* + * ValidateDate() * Check valid year/month/day values, handle BC and DOY cases * Return 0 if okay, a DTERR code if not. */ @@ -2630,7 +2641,8 @@ ValidateDate(int fmask, bool isjulian, bool is2digits, bool bc, } -/* DecodeTimeCommon() +/* + * DecodeTimeCommon() * Decode time string which includes delimiters. * Return 0 if okay, a DTERR code if not. * tmask and itm are output parameters. @@ -2715,7 +2727,8 @@ DecodeTimeCommon(char *str, int fmask, int range, return 0; } -/* DecodeTime() +/* + * DecodeTime() * Decode time string which includes delimiters. * Return 0 if okay, a DTERR code if not. * @@ -2744,7 +2757,8 @@ DecodeTime(char *str, int fmask, int range, return 0; } -/* DecodeTimeForInterval() +/* + * DecodeTimeForInterval() * Decode time string which includes delimiters. * Return 0 if okay, a DTERR code if not. * @@ -2773,7 +2787,8 @@ DecodeTimeForInterval(char *str, int fmask, int range, } -/* DecodeNumber() +/* + * DecodeNumber() * Interpret plain numeric field as a date value in context. * Return 0 if okay, a DTERR code if not. */ @@ -2955,7 +2970,8 @@ DecodeNumber(int flen, char *str, bool haveTextMonth, int fmask, } -/* DecodeNumberField() +/* + * DecodeNumberField() * Interpret numeric string as a concatenated date or time field. * Return a DTK token (>= 0) if successful, a DTERR code (< 0) if not. * @@ -3049,7 +3065,8 @@ DecodeNumberField(int len, char *str, int fmask, } -/* DecodeTimezone() +/* + * DecodeTimezone() * Interpret string as a numeric timezone. * * Return 0 if okay (and set *tzp), a DTERR code if not okay. @@ -3118,7 +3135,8 @@ DecodeTimezone(const char *str, int *tzp) } -/* DecodeTimezoneAbbrev() +/* + * DecodeTimezoneAbbrev() * Interpret string as a timezone abbreviation, if possible. * * Sets *ftype to an abbreviation type (TZ, DTZ, or DYNTZ), or UNKNOWN_FIELD if @@ -3231,7 +3249,8 @@ ClearTimeZoneAbbrevCache(void) } -/* DecodeSpecial() +/* + * DecodeSpecial() * Decode text string using lookup table. * * Recognizes the keywords listed in datetktbl. @@ -3271,7 +3290,8 @@ DecodeSpecial(int field, const char *lowtoken, int *val) } -/* DecodeTimezoneName() +/* + * DecodeTimezoneName() * Interpret string as a timezone abbreviation or name. * Throw error if the name is not recognized. * @@ -3333,7 +3353,8 @@ DecodeTimezoneName(const char *tzname, int *offset, pg_tz **tz) } } -/* DecodeTimezoneNameToTz() +/* + * DecodeTimezoneNameToTz() * Interpret string as a timezone abbreviation or name. * Throw error if the name is not recognized. * @@ -3354,7 +3375,8 @@ DecodeTimezoneNameToTz(const char *tzname) return result; } -/* DecodeTimezoneAbbrevPrefix() +/* + * DecodeTimezoneAbbrevPrefix() * Interpret prefix of string as a timezone abbreviation, if possible. * * This has roughly the same functionality as DecodeTimezoneAbbrev(), @@ -3455,7 +3477,8 @@ DecodeTimezoneAbbrevPrefix(const char *str, int *offset, pg_tz **tz) } -/* ClearPgItmIn +/* + * ClearPgItmIn * * Zero out a pg_itm_in */ @@ -3469,7 +3492,8 @@ ClearPgItmIn(struct pg_itm_in *itm_in) } -/* DecodeInterval() +/* + * DecodeInterval() * Interpret previously parsed fields for general time interval. * Returns 0 if successful, DTERR code if bogus input detected. * dtype and itm_in are output parameters. @@ -3931,7 +3955,8 @@ ISO8601IntegerWidth(char *fieldstart) } -/* DecodeISO8601Interval() +/* + * DecodeISO8601Interval() * Decode an ISO 8601 time interval of the "format with designators" * (section 4.4.3.2) or "alternative format" (section 4.4.3.3) * Examples: P1D for 1 day @@ -4156,7 +4181,8 @@ DecodeISO8601Interval(char *str, } -/* DecodeUnits() +/* + * DecodeUnits() * Decode text string using lookup table. * * This routine recognizes keywords associated with time interval units. @@ -4268,7 +4294,8 @@ DateTimeParseError(int dterr, DateTimeErrorExtra *extra, } } -/* datebsearch() +/* + * datebsearch() * Binary search -- from Knuth (6.2.1) Algorithm B. Special case like this * is WAY faster than the generic bsearch(). */ @@ -4302,7 +4329,8 @@ datebsearch(const char *key, const datetkn *base, int nel) return NULL; } -/* EncodeTimezone() +/* + * EncodeTimezone() * Copies representation of a numeric timezone offset to str. * * Returns a pointer to the new end of string. No NUL terminator is put @@ -4343,7 +4371,8 @@ EncodeTimezone(char *str, int tz, int style) return str; } -/* EncodeDateOnly() +/* + * EncodeDateOnly() * Encode date as local time. */ void @@ -4423,7 +4452,8 @@ EncodeDateOnly(struct pg_tm *tm, int style, char *str) } -/* EncodeTimeOnly() +/* + * EncodeTimeOnly() * Encode time fields only. * * tm and fsec are the value to encode, print_tz determines whether to include @@ -4445,7 +4475,8 @@ EncodeTimeOnly(struct pg_tm *tm, fsec_t fsec, bool print_tz, int tz, int style, } -/* EncodeDateTime() +/* + * EncodeDateTime() * Encode date and time interpreted as local time. * * tm and fsec are the value to encode, print_tz determines whether to include @@ -4685,7 +4716,8 @@ AddVerboseIntPart(char *cp, int64 value, const char *units, } -/* EncodeInterval() +/* + * EncodeInterval() * Interpret time structure as a delta time and convert to string. * * Support "traditional Postgres" and ISO-8601 styles. diff --git a/src/backend/utils/adt/ddlutils.c b/src/backend/utils/adt/ddlutils.c index d6f55c48f37..f32fcd453ef 100644 --- a/src/backend/utils/adt/ddlutils.c +++ b/src/backend/utils/adt/ddlutils.c @@ -76,7 +76,7 @@ typedef struct DdlOption static void parse_ddl_options(FunctionCallInfo fcinfo, int variadic_start, DdlOption *opts, int nopts); static void append_ddl_option(StringInfo buf, bool pretty, int indent, - const char *fmt,...) + const char *fmt, ...) pg_attribute_printf(4, 5); static void append_guc_value(StringInfo buf, const char *name, const char *value); @@ -232,7 +232,7 @@ parse_ddl_options(FunctionCallInfo fcinfo, int variadic_start, */ static void append_ddl_option(StringInfo buf, bool pretty, int indent, - const char *fmt,...) + const char *fmt, ...) { if (pretty) { diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c index 79cef8facfd..d52d71b0a8c 100644 --- a/src/backend/utils/adt/formatting.c +++ b/src/backend/utils/adt/formatting.c @@ -975,8 +975,8 @@ static const KeyWord NUM_keywords[] = { */ static const int DCH_index[KeyWord_INDEX_SIZE] = { /* -0 1 2 3 4 5 6 7 8 9 -*/ + * 0 1 2 3 4 5 6 7 8 9 + */ /*---- first 0..31 chars are skipped ----*/ -1, -1, -1, -1, -1, -1, -1, -1, @@ -998,8 +998,8 @@ static const int DCH_index[KeyWord_INDEX_SIZE] = { */ static const int NUM_index[KeyWord_INDEX_SIZE] = { /* -0 1 2 3 4 5 6 7 8 9 -*/ + * 0 1 2 3 4 5 6 7 8 9 + */ /*---- first 0..31 chars are skipped ----*/ -1, -1, -1, -1, -1, -1, -1, -1, diff --git a/src/backend/utils/adt/geo_ops.c b/src/backend/utils/adt/geo_ops.c index cc5ce013d0f..73324b91fe5 100644 --- a/src/backend/utils/adt/geo_ops.c +++ b/src/backend/utils/adt/geo_ops.c @@ -413,7 +413,8 @@ pair_count(char *s, char delim) * Formatting and conversion routines. *---------------------------------------------------------*/ -/* box_in - convert a string to internal form. +/* + * box_in - convert a string to internal form. * * External format: (two corners of box) * "(f8, f8), (f8, f8)" @@ -450,7 +451,8 @@ box_in(PG_FUNCTION_ARGS) PG_RETURN_BOX_P(box); } -/* box_out - convert a box to external form. +/* + * box_out - convert a box to external form. */ Datum box_out(PG_FUNCTION_ARGS) @@ -513,7 +515,8 @@ box_send(PG_FUNCTION_ARGS) } -/* box_construct - fill in a new box. +/* + * box_construct - fill in a new box. */ static inline void box_construct(BOX *result, Point *pt1, Point *pt2) @@ -546,7 +549,8 @@ box_construct(BOX *result, Point *pt1, Point *pt2) * <, >, <=, >=, and == are based on box area. *---------------------------------------------------------*/ -/* box_same - are two boxes identical? +/* + * box_same - are two boxes identical? */ Datum box_same(PG_FUNCTION_ARGS) @@ -558,7 +562,8 @@ box_same(PG_FUNCTION_ARGS) point_eq_point(&box1->low, &box2->low)); } -/* box_overlap - does box1 overlap box2? +/* + * box_overlap - does box1 overlap box2? */ Datum box_overlap(PG_FUNCTION_ARGS) @@ -578,7 +583,8 @@ box_ov(BOX *box1, BOX *box2) FPle(box2->low.y, box1->high.y)); } -/* box_left - is box1 strictly left of box2? +/* + * box_left - is box1 strictly left of box2? */ Datum box_left(PG_FUNCTION_ARGS) @@ -589,7 +595,8 @@ box_left(PG_FUNCTION_ARGS) PG_RETURN_BOOL(FPlt(box1->high.x, box2->low.x)); } -/* box_overleft - is the right edge of box1 at or left of +/* + * box_overleft - is the right edge of box1 at or left of * the right edge of box2? * * This is "less than or equal" for the end of a time range, @@ -604,7 +611,8 @@ box_overleft(PG_FUNCTION_ARGS) PG_RETURN_BOOL(FPle(box1->high.x, box2->high.x)); } -/* box_right - is box1 strictly right of box2? +/* + * box_right - is box1 strictly right of box2? */ Datum box_right(PG_FUNCTION_ARGS) @@ -615,7 +623,8 @@ box_right(PG_FUNCTION_ARGS) PG_RETURN_BOOL(FPgt(box1->low.x, box2->high.x)); } -/* box_overright - is the left edge of box1 at or right of +/* + * box_overright - is the left edge of box1 at or right of * the left edge of box2? * * This is "greater than or equal" for time ranges, when time ranges @@ -630,7 +639,8 @@ box_overright(PG_FUNCTION_ARGS) PG_RETURN_BOOL(FPge(box1->low.x, box2->low.x)); } -/* box_below - is box1 strictly below box2? +/* + * box_below - is box1 strictly below box2? */ Datum box_below(PG_FUNCTION_ARGS) @@ -641,7 +651,8 @@ box_below(PG_FUNCTION_ARGS) PG_RETURN_BOOL(FPlt(box1->high.y, box2->low.y)); } -/* box_overbelow - is the upper edge of box1 at or below +/* + * box_overbelow - is the upper edge of box1 at or below * the upper edge of box2? */ Datum @@ -653,7 +664,8 @@ box_overbelow(PG_FUNCTION_ARGS) PG_RETURN_BOOL(FPle(box1->high.y, box2->high.y)); } -/* box_above - is box1 strictly above box2? +/* + * box_above - is box1 strictly above box2? */ Datum box_above(PG_FUNCTION_ARGS) @@ -664,7 +676,8 @@ box_above(PG_FUNCTION_ARGS) PG_RETURN_BOOL(FPgt(box1->low.y, box2->high.y)); } -/* box_overabove - is the lower edge of box1 at or above +/* + * box_overabove - is the lower edge of box1 at or above * the lower edge of box2? */ Datum @@ -676,7 +689,8 @@ box_overabove(PG_FUNCTION_ARGS) PG_RETURN_BOOL(FPge(box1->low.y, box2->low.y)); } -/* box_contained - is box1 contained by box2? +/* + * box_contained - is box1 contained by box2? */ Datum box_contained(PG_FUNCTION_ARGS) @@ -687,7 +701,8 @@ box_contained(PG_FUNCTION_ARGS) PG_RETURN_BOOL(box_contain_box(box2, box1)); } -/* box_contain - does box1 contain box2? +/* + * box_contain - does box1 contain box2? */ Datum box_contain(PG_FUNCTION_ARGS) @@ -711,7 +726,8 @@ box_contain_box(BOX *contains_box, BOX *contained_box) } -/* box_positionop - +/* + * box_positionop - * is box1 entirely {above,below} box2? * * box_below_eq and box_above_eq are obsolete versions that (probably @@ -738,7 +754,8 @@ box_above_eq(PG_FUNCTION_ARGS) } -/* box_relop - is area(box1) relop area(box2), within +/* + * box_relop - is area(box1) relop area(box2), within * our accuracy constraint? */ Datum @@ -791,7 +808,8 @@ box_ge(PG_FUNCTION_ARGS) * "Arithmetic" operators on boxes. *---------------------------------------------------------*/ -/* box_area - returns the area of the box. +/* + * box_area - returns the area of the box. */ Datum box_area(PG_FUNCTION_ARGS) @@ -802,7 +820,8 @@ box_area(PG_FUNCTION_ARGS) } -/* box_width - returns the width of the box +/* + * box_width - returns the width of the box * (horizontal magnitude). */ Datum @@ -814,7 +833,8 @@ box_width(PG_FUNCTION_ARGS) } -/* box_height - returns the height of the box +/* + * box_height - returns the height of the box * (vertical magnitude). */ Datum @@ -826,7 +846,8 @@ box_height(PG_FUNCTION_ARGS) } -/* box_distance - returns the distance between the +/* + * box_distance - returns the distance between the * center points of two boxes. */ Datum @@ -844,7 +865,8 @@ box_distance(PG_FUNCTION_ARGS) } -/* box_center - returns the center point of the box. +/* + * box_center - returns the center point of the box. */ Datum box_center(PG_FUNCTION_ARGS) @@ -860,7 +882,8 @@ box_center(PG_FUNCTION_ARGS) } -/* box_ar - returns the area of the box. +/* + * box_ar - returns the area of the box. */ static float8 box_ar(BOX *box) @@ -869,7 +892,8 @@ box_ar(BOX *box) } -/* box_cn - stores the centerpoint of the box into *center. +/* + * box_cn - stores the centerpoint of the box into *center. */ static void box_cn(Point *center, BOX *box, Node *escontext) @@ -894,7 +918,8 @@ box_cn(Point *center, BOX *box, Node *escontext) return; } -/* box_wd - returns the width (length) of the box +/* + * box_wd - returns the width (length) of the box * (horizontal magnitude). */ static float8 @@ -904,7 +929,8 @@ box_wd(BOX *box) } -/* box_ht - returns the height of the box +/* + * box_ht - returns the height of the box * (vertical magnitude). */ static float8 @@ -918,7 +944,8 @@ box_ht(BOX *box) * Funky operations. *---------------------------------------------------------*/ -/* box_intersect - +/* + * box_intersect - * returns the overlapping portion of two boxes, * or NULL if they do not intersect. */ @@ -943,7 +970,8 @@ box_intersect(PG_FUNCTION_ARGS) } -/* box_diagonal - +/* + * box_diagonal - * returns a line segment which happens to be the * positive-slope diagonal of "box". */ @@ -1126,7 +1154,8 @@ line_construct(LINE *result, Point *pt, float8 m) } } -/* line_construct_pp() +/* + * line_construct_pp() * two points */ Datum @@ -1272,7 +1301,8 @@ line_invsl(LINE *line) } -/* line_distance() +/* + * line_distance() * Distance between two lines. */ Datum @@ -1297,7 +1327,8 @@ line_distance(PG_FUNCTION_ARGS) hypot(l1->A, l1->B))); } -/* line_interpt() +/* + * line_interpt() * Point where two lines l1, l2 intersect (if any) */ Datum @@ -1662,7 +1693,8 @@ path_open(PG_FUNCTION_ARGS) } -/* path_inter - +/* + * path_inter - * Does p1 intersect p2 at any point? * Use bounding boxes for a quick (O(n)) check, then do a * O(n^2) iterative edge check. @@ -1740,7 +1772,8 @@ path_inter(PG_FUNCTION_ARGS) PG_RETURN_BOOL(false); } -/* path_distance() +/* + * path_distance() * This essentially does a cartesian product of the lsegs in the * two paths, and finds the min distance between any two lsegs */ @@ -2151,7 +2184,8 @@ lseg_send(PG_FUNCTION_ARGS) } -/* lseg_construct - +/* + * lseg_construct - * form a LSEG from two Points. */ Datum @@ -2210,8 +2244,8 @@ lseg_length(PG_FUNCTION_ARGS) *---------------------------------------------------------*/ /* - ** find intersection of the two lines, and see if it falls on - ** both segments. + * find intersection of the two lines, and see if it falls on + * both segments. */ Datum lseg_intersect(PG_FUNCTION_ARGS) @@ -2326,7 +2360,8 @@ lseg_ge(PG_FUNCTION_ARGS) * Line arithmetic routines. *---------------------------------------------------------*/ -/* lseg_distance - +/* + * lseg_distance - * If two segments don't intersect, then the closest * point will be from one of the endpoints to the other * segment. @@ -3198,7 +3233,8 @@ box_contain_pt(PG_FUNCTION_ARGS) PG_RETURN_BOOL(box_contain_point(box, pt)); } -/* on_ppath - +/* + * on_ppath - * Whether a point lies within (on) a polyline. * If open, we have to (groan) check each segment. * (uses same algorithm as for point intersecting segment - tgl 1997-07-09) @@ -3368,7 +3404,8 @@ inter_sb(PG_FUNCTION_ARGS) } -/* inter_lb() +/* + * inter_lb() * Do line and box intersect? */ Datum @@ -4397,7 +4434,8 @@ boxes_bound_box(PG_FUNCTION_ARGS) ** ***********************************************************************/ -/* path_add() +/* + * path_add() * Concatenate two paths (only if they are both open). */ Datum @@ -4445,7 +4483,8 @@ path_add(PG_FUNCTION_ARGS) PG_RETURN_PATH_P(result); } -/* path_add_pt() +/* + * path_add_pt() * Translation operators. */ Datum @@ -4474,7 +4513,8 @@ path_sub_pt(PG_FUNCTION_ARGS) PG_RETURN_PATH_P(path); } -/* path_mul_pt() +/* + * path_mul_pt() * Rotation and scaling operators. */ Datum @@ -4587,7 +4627,8 @@ poly_box(PG_FUNCTION_ARGS) } -/* box_poly() +/* + * box_poly() * Convert a box to a polygon. */ Datum @@ -4660,7 +4701,8 @@ poly_path(PG_FUNCTION_ARGS) * Formatting and conversion routines. *---------------------------------------------------------*/ -/* circle_in - convert a string to internal form. +/* + * circle_in - convert a string to internal form. * * External format: (center and radius of circle) * "<(f8,f8),f8>" @@ -4734,7 +4776,8 @@ circle_in(PG_FUNCTION_ARGS) PG_RETURN_CIRCLE_P(circle); } -/* circle_out - convert a circle to external form. +/* + * circle_out - convert a circle to external form. */ Datum circle_out(PG_FUNCTION_ARGS) @@ -4801,7 +4844,8 @@ circle_send(PG_FUNCTION_ARGS) * <, >, <=, >=, and == are based on circle area. *---------------------------------------------------------*/ -/* circles identical? +/* + * circles identical? * * We consider NaNs values to be equal to each other to let those circles * to be found. @@ -4817,7 +4861,8 @@ circle_same(PG_FUNCTION_ARGS) point_eq_point(&circle1->center, &circle2->center)); } -/* circle_overlap - does circle1 overlap circle2? +/* + * circle_overlap - does circle1 overlap circle2? */ Datum circle_overlap(PG_FUNCTION_ARGS) @@ -4829,7 +4874,8 @@ circle_overlap(PG_FUNCTION_ARGS) float8_pl(circle1->radius, circle2->radius))); } -/* circle_overleft - is the right edge of circle1 at or left of +/* + * circle_overleft - is the right edge of circle1 at or left of * the right edge of circle2? */ Datum @@ -4842,7 +4888,8 @@ circle_overleft(PG_FUNCTION_ARGS) float8_pl(circle2->center.x, circle2->radius))); } -/* circle_left - is circle1 strictly left of circle2? +/* + * circle_left - is circle1 strictly left of circle2? */ Datum circle_left(PG_FUNCTION_ARGS) @@ -4854,7 +4901,8 @@ circle_left(PG_FUNCTION_ARGS) float8_mi(circle2->center.x, circle2->radius))); } -/* circle_right - is circle1 strictly right of circle2? +/* + * circle_right - is circle1 strictly right of circle2? */ Datum circle_right(PG_FUNCTION_ARGS) @@ -4866,7 +4914,8 @@ circle_right(PG_FUNCTION_ARGS) float8_pl(circle2->center.x, circle2->radius))); } -/* circle_overright - is the left edge of circle1 at or right of +/* + * circle_overright - is the left edge of circle1 at or right of * the left edge of circle2? */ Datum @@ -4879,7 +4928,8 @@ circle_overright(PG_FUNCTION_ARGS) float8_mi(circle2->center.x, circle2->radius))); } -/* circle_contained - is circle1 contained by circle2? +/* + * circle_contained - is circle1 contained by circle2? */ Datum circle_contained(PG_FUNCTION_ARGS) @@ -4891,7 +4941,8 @@ circle_contained(PG_FUNCTION_ARGS) float8_mi(circle2->radius, circle1->radius))); } -/* circle_contain - does circle1 contain circle2? +/* + * circle_contain - does circle1 contain circle2? */ Datum circle_contain(PG_FUNCTION_ARGS) @@ -4904,7 +4955,8 @@ circle_contain(PG_FUNCTION_ARGS) } -/* circle_below - is circle1 strictly below circle2? +/* + * circle_below - is circle1 strictly below circle2? */ Datum circle_below(PG_FUNCTION_ARGS) @@ -4916,7 +4968,8 @@ circle_below(PG_FUNCTION_ARGS) float8_mi(circle2->center.y, circle2->radius))); } -/* circle_above - is circle1 strictly above circle2? +/* + * circle_above - is circle1 strictly above circle2? */ Datum circle_above(PG_FUNCTION_ARGS) @@ -4928,7 +4981,8 @@ circle_above(PG_FUNCTION_ARGS) float8_pl(circle2->center.y, circle2->radius))); } -/* circle_overbelow - is the upper edge of circle1 at or below +/* + * circle_overbelow - is the upper edge of circle1 at or below * the upper edge of circle2? */ Datum @@ -4941,7 +4995,8 @@ circle_overbelow(PG_FUNCTION_ARGS) float8_pl(circle2->center.y, circle2->radius))); } -/* circle_overabove - is the lower edge of circle1 at or above +/* + * circle_overabove - is the lower edge of circle1 at or above * the lower edge of circle2? */ Datum @@ -4955,7 +5010,8 @@ circle_overabove(PG_FUNCTION_ARGS) } -/* circle_relop - is area(circle1) relop area(circle2), within +/* + * circle_relop - is area(circle1) relop area(circle2), within * our accuracy constraint? */ Datum @@ -5017,7 +5073,8 @@ circle_ge(PG_FUNCTION_ARGS) * "Arithmetic" operators on circles. *---------------------------------------------------------*/ -/* circle_add_pt() +/* + * circle_add_pt() * Translation operator. */ Datum @@ -5051,7 +5108,8 @@ circle_sub_pt(PG_FUNCTION_ARGS) } -/* circle_mul_pt() +/* + * circle_mul_pt() * Rotation and scaling operators. */ Datum @@ -5085,7 +5143,8 @@ circle_div_pt(PG_FUNCTION_ARGS) } -/* circle_area - returns the area of the circle. +/* + * circle_area - returns the area of the circle. */ Datum circle_area(PG_FUNCTION_ARGS) @@ -5096,7 +5155,8 @@ circle_area(PG_FUNCTION_ARGS) } -/* circle_diameter - returns the diameter of the circle. +/* + * circle_diameter - returns the diameter of the circle. */ Datum circle_diameter(PG_FUNCTION_ARGS) @@ -5107,7 +5167,8 @@ circle_diameter(PG_FUNCTION_ARGS) } -/* circle_radius - returns the radius of the circle. +/* + * circle_radius - returns the radius of the circle. */ Datum circle_radius(PG_FUNCTION_ARGS) @@ -5118,7 +5179,8 @@ circle_radius(PG_FUNCTION_ARGS) } -/* circle_distance - returns the distance between +/* + * circle_distance - returns the distance between * two circles. */ Datum @@ -5161,7 +5223,8 @@ pt_contained_circle(PG_FUNCTION_ARGS) } -/* dist_pc - returns the distance between +/* + * dist_pc - returns the distance between * a point and a circle. */ Datum @@ -5196,7 +5259,8 @@ dist_cpoint(PG_FUNCTION_ARGS) PG_RETURN_FLOAT8(result); } -/* circle_center - returns the center point of the circle. +/* + * circle_center - returns the center point of the circle. */ Datum circle_center(PG_FUNCTION_ARGS) @@ -5212,7 +5276,8 @@ circle_center(PG_FUNCTION_ARGS) } -/* circle_ar - returns the area of the circle. +/* + * circle_ar - returns the area of the circle. */ static float8 circle_ar(CIRCLE *circle) @@ -5276,7 +5341,8 @@ fail: PG_RETURN_NULL(); } -/* box_circle() +/* + * box_circle() * Convert a box to a circle. */ Datum @@ -5536,7 +5602,8 @@ point_inside(Point *p, int npts, Point *plist) } -/* lseg_crossing() +/* + * lseg_crossing() * Returns +/-2 if line segment crosses the positive X-axis in a +/- direction. * Returns +/-1 if one point is on the positive X-axis. * Returns 0 if both points are on the positive X-axis, or there is no crossing. diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c index 4c894a49d5d..01608d8ca42 100644 --- a/src/backend/utils/adt/int.c +++ b/src/backend/utils/adt/int.c @@ -1213,7 +1213,8 @@ int2mod(PG_FUNCTION_ARGS) } -/* int[24]abs() +/* + * int[24]abs() * Absolute value */ Datum diff --git a/src/backend/utils/adt/int8.c b/src/backend/utils/adt/int8.c index 19bb30f2d0f..9b429da86d9 100644 --- a/src/backend/utils/adt/int8.c +++ b/src/backend/utils/adt/int8.c @@ -44,7 +44,8 @@ typedef struct * Formatting and conversion routines. *---------------------------------------------------------*/ -/* int8in() +/* + * int8in() */ Datum int8in(PG_FUNCTION_ARGS) @@ -55,7 +56,8 @@ int8in(PG_FUNCTION_ARGS) } -/* int8out() +/* + * int8out() */ Datum int8out(PG_FUNCTION_ARGS) @@ -106,7 +108,8 @@ int8send(PG_FUNCTION_ARGS) * Relational operators for int8s, including cross-data-type comparisons. *---------------------------------------------------------*/ -/* int8relop() +/* + * int8relop() * Is val1 relop val2? */ Datum @@ -163,7 +166,8 @@ int8ge(PG_FUNCTION_ARGS) PG_RETURN_BOOL(val1 >= val2); } -/* int84relop() +/* + * int84relop() * Is 64-bit val1 relop 32-bit val2? */ Datum @@ -220,7 +224,8 @@ int84ge(PG_FUNCTION_ARGS) PG_RETURN_BOOL(val1 >= val2); } -/* int48relop() +/* + * int48relop() * Is 32-bit val1 relop 64-bit val2? */ Datum @@ -277,7 +282,8 @@ int48ge(PG_FUNCTION_ARGS) PG_RETURN_BOOL(val1 >= val2); } -/* int82relop() +/* + * int82relop() * Is 64-bit val1 relop 16-bit val2? */ Datum @@ -334,7 +340,8 @@ int82ge(PG_FUNCTION_ARGS) PG_RETURN_BOOL(val1 >= val2); } -/* int28relop() +/* + * int28relop() * Is 16-bit val1 relop 64-bit val2? */ Datum @@ -539,7 +546,8 @@ int8div(PG_FUNCTION_ARGS) PG_RETURN_INT64(result); } -/* int8abs() +/* + * int8abs() * Absolute value */ Datum @@ -556,7 +564,8 @@ int8abs(PG_FUNCTION_ARGS) PG_RETURN_INT64(result); } -/* int8mod() +/* + * int8mod() * Modulo operation. */ Datum @@ -1170,7 +1179,8 @@ int28div(PG_FUNCTION_ARGS) PG_RETURN_INT64((int64) arg1 / arg2); } -/* Binary arithmetics +/* + * Binary arithmetics * * int8and - returns arg1 & arg2 * int8or - returns arg1 | arg2 @@ -1290,7 +1300,8 @@ i8tod(PG_FUNCTION_ARGS) PG_RETURN_FLOAT8(result); } -/* dtoi8() +/* + * dtoi8() * Convert float8 to 8-byte integer. */ Datum @@ -1325,7 +1336,8 @@ i8tof(PG_FUNCTION_ARGS) PG_RETURN_FLOAT4(result); } -/* ftoi8() +/* + * ftoi8() * Convert float4 to 8-byte integer. */ Datum diff --git a/src/backend/utils/adt/lockfuncs.c b/src/backend/utils/adt/lockfuncs.c index dc58e9cb0a6..2899749abe6 100644 --- a/src/backend/utils/adt/lockfuncs.c +++ b/src/backend/utils/adt/lockfuncs.c @@ -768,7 +768,7 @@ pg_try_advisory_xact_lock_shared_int8(PG_FUNCTION_ARGS) * pg_advisory_unlock(int8) - release exclusive lock on an int8 key * * Returns true if successful, false if lock was not held -*/ + */ Datum pg_advisory_unlock_int8(PG_FUNCTION_ARGS) { @@ -958,7 +958,7 @@ pg_try_advisory_xact_lock_shared_int4(PG_FUNCTION_ARGS) * pg_advisory_unlock(int4, int4) - release exclusive lock on 2 int4 keys * * Returns true if successful, false if lock was not held -*/ + */ Datum pg_advisory_unlock_int4(PG_FUNCTION_ARGS) { diff --git a/src/backend/utils/adt/pgstatfuncs.c b/src/backend/utils/adt/pgstatfuncs.c index 7a9dfa9ba3b..6f9c9c72de5 100644 --- a/src/backend/utils/adt/pgstatfuncs.c +++ b/src/backend/utils/adt/pgstatfuncs.c @@ -1337,10 +1337,10 @@ pg_stat_get_buf_alloc(PG_FUNCTION_ARGS) } /* -* When adding a new column to the pg_stat_io view and the -* pg_stat_get_backend_io() function, add a new enum value here above -* IO_NUM_COLUMNS. -*/ + * When adding a new column to the pg_stat_io view and the + * pg_stat_get_backend_io() function, add a new enum value here above + * IO_NUM_COLUMNS. + */ typedef enum io_stat_col { IO_COL_INVALID = -1, diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c index f2b58ebfe1e..b9449b4574a 100644 --- a/src/backend/utils/adt/selfuncs.c +++ b/src/backend/utils/adt/selfuncs.c @@ -5970,7 +5970,7 @@ examine_variable(PlannerInfo *root, Node *node, int varRelid, /* * strip_all_phvs_deep * Deeply strip all PlaceHolderVars in an expression. - + * * As a performance optimization, we first use a lightweight walker to check * for the presence of any PlaceHolderVars. The expensive mutator is invoked * only if a PlaceHolderVar is found, avoiding unnecessary memory allocation diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c index 88ba4e06745..a20e7ea1d11 100644 --- a/src/backend/utils/adt/timestamp.c +++ b/src/backend/utils/adt/timestamp.c @@ -150,7 +150,8 @@ anytimestamp_typmodout(bool istz, int32 typmod) * USER I/O ROUTINES * *****************************************************************************/ -/* timestamp_in() +/* + * timestamp_in() * Convert a string to internal form. */ Datum @@ -218,7 +219,8 @@ timestamp_in(PG_FUNCTION_ARGS) PG_RETURN_TIMESTAMP(result); } -/* timestamp_out() +/* + * timestamp_out() * Convert a timestamp to external form. */ Datum @@ -330,7 +332,8 @@ timestamp_support(PG_FUNCTION_ARGS) PG_RETURN_POINTER(ret); } -/* timestamp_scale() +/* + * timestamp_scale() * Adjust time type for specified scale factor. * Used by PostgreSQL type system to stuff columns. */ @@ -403,7 +406,8 @@ AdjustTimestampForTypmod(Timestamp *time, int32 typmod, Node *escontext) return true; } -/* timestamptz_in() +/* + * timestamptz_in() * Convert a string to internal form. */ Datum @@ -761,7 +765,8 @@ float8_timestamptz(PG_FUNCTION_ARGS) PG_RETURN_TIMESTAMP(result); } -/* timestamptz_out() +/* + * timestamptz_out() * Convert a timestamp to external form. */ Datum @@ -854,7 +859,8 @@ timestamptztypmodout(PG_FUNCTION_ARGS) } -/* timestamptz_scale() +/* + * timestamptz_scale() * Adjust time type for specified scale factor. * Used by PostgreSQL type system to stuff columns. */ @@ -874,7 +880,8 @@ timestamptz_scale(PG_FUNCTION_ARGS) } -/* interval_in() +/* + * interval_in() * Convert a string to internal form. * * External format(s): @@ -959,7 +966,8 @@ interval_in(PG_FUNCTION_ARGS) PG_RETURN_INTERVAL_P(result); } -/* interval_out() +/* + * interval_out() * Convert a time span to external form. */ Datum @@ -1313,7 +1321,8 @@ interval_support(PG_FUNCTION_ARGS) PG_RETURN_POINTER(ret); } -/* interval_scale() +/* + * interval_scale() * Adjust interval type for specified fields. * Used by PostgreSQL type system to stuff columns. */ @@ -1574,7 +1583,8 @@ out_of_range: PG_RETURN_NULL(); /* keep compiler quiet */ } -/* EncodeSpecialTimestamp() +/* + * EncodeSpecialTimestamp() * Convert reserved timestamp data type to string. */ void @@ -1993,7 +2003,8 @@ timestamp2tm(Timestamp dt, int *tzp, struct pg_tm *tm, fsec_t *fsec, const char } -/* tm2timestamp() +/* + * tm2timestamp() * Convert a tm structure to a timestamp data type. * Note that year is _not_ 1900-based, but is an explicit full value. * Also, month is one-based, _not_ zero-based. @@ -2036,7 +2047,8 @@ tm2timestamp(struct pg_tm *tm, fsec_t fsec, int *tzp, Timestamp *result) } -/* interval2itm() +/* + * interval2itm() * Convert an Interval to a pg_itm structure. * Note: overflow is not possible, because the pg_itm fields are * wide enough for all possible conversion results. @@ -2064,7 +2076,8 @@ interval2itm(Interval span, struct pg_itm *itm) itm->tm_usec = (int) time; } -/* itm2interval() +/* + * itm2interval() * Convert a pg_itm structure to an Interval. * Returns 0 if OK, -1 on overflow. * @@ -2098,7 +2111,8 @@ itm2interval(struct pg_itm *itm, Interval *span) return 0; } -/* itmin2interval() +/* + * itmin2interval() * Convert a pg_itm_in structure to an Interval. * Returns 0 if OK, -1 on overflow. * @@ -2660,7 +2674,8 @@ interval_hash_extended(PG_FUNCTION_ARGS) PG_GETARG_DATUM(1)); } -/* overlaps_timestamp() --- implements the SQL OVERLAPS operator. +/* + * overlaps_timestamp() --- implements the SQL OVERLAPS operator. * * Algorithm is per SQL spec. This is much harder than you'd think * because the spec requires us to deliver a non-null answer in some cases @@ -3074,7 +3089,8 @@ interval_justify_days(PG_FUNCTION_ARGS) PG_RETURN_INTERVAL_P(result); } -/* timestamp_pl_interval() +/* + * timestamp_pl_interval() * Add an interval to a timestamp data type. * Note that interval has provisions for qualitative year/month and day * units, so try to do the right thing with them. @@ -3216,7 +3232,8 @@ timestamp_mi_interval(PG_FUNCTION_ARGS) } -/* timestamptz_pl_interval_internal() +/* + * timestamptz_pl_interval_internal() * Add an interval to a timestamptz, in the given (or session) timezone. * * Note that interval has provisions for qualitative year/month and day @@ -3356,7 +3373,8 @@ timestamptz_pl_interval_internal(TimestampTz timestamp, return result; } -/* timestamptz_mi_interval_internal() +/* + * timestamptz_mi_interval_internal() * As above, but subtract the interval. */ static TimestampTz @@ -3371,7 +3389,8 @@ timestamptz_mi_interval_internal(TimestampTz timestamp, return timestamptz_pl_interval_internal(timestamp, &tspan, attimezone); } -/* timestamptz_pl_interval() +/* + * timestamptz_pl_interval() * Add an interval to a timestamptz, in the session timezone. */ Datum @@ -3392,7 +3411,8 @@ timestamptz_mi_interval(PG_FUNCTION_ARGS) PG_RETURN_TIMESTAMP(timestamptz_mi_interval_internal(timestamp, span, NULL)); } -/* timestamptz_pl_interval_at_zone() +/* + * timestamptz_pl_interval_at_zone() * Add an interval to a timestamptz, in the specified timezone. */ Datum @@ -3417,7 +3437,8 @@ timestamptz_mi_interval_at_zone(PG_FUNCTION_ARGS) PG_RETURN_TIMESTAMP(timestamptz_mi_interval_internal(timestamp, span, attimezone)); } -/* interval_um_internal() +/* + * interval_um_internal() * Negate an interval. */ static void @@ -4276,7 +4297,8 @@ interval_sum(PG_FUNCTION_ARGS) PG_RETURN_INTERVAL_P(result); } -/* timestamp_age() +/* + * timestamp_age() * Calculate time difference while retaining year/month fields. * Note that this does not result in an accurate absolute time span * since year and month are out of context once the arithmetic @@ -4422,7 +4444,8 @@ timestamp_age(PG_FUNCTION_ARGS) } -/* timestamptz_age() +/* + * timestamptz_age() * Calculate time difference while retaining year/month fields. * Note that this does not result in an accurate absolute time span * since year and month are out of context once the arithmetic @@ -4579,7 +4602,8 @@ timestamptz_age(PG_FUNCTION_ARGS) *---------------------------------------------------------*/ -/* timestamp_bin() +/* + * timestamp_bin() * Bin timestamp into specified interval. */ Datum @@ -4650,7 +4674,8 @@ timestamp_bin(PG_FUNCTION_ARGS) PG_RETURN_TIMESTAMP(result); } -/* timestamp_trunc() +/* + * timestamp_trunc() * Truncate timestamp to specified units. */ Datum @@ -4814,7 +4839,8 @@ timestamp_trunc(PG_FUNCTION_ARGS) PG_RETURN_TIMESTAMP(result); } -/* timestamptz_bin() +/* + * timestamptz_bin() * Bin timestamptz into specified interval using specified origin. */ Datum @@ -5066,7 +5092,8 @@ timestamptz_trunc_internal(text *units, TimestampTz timestamp, pg_tz *tzp) return result; } -/* timestamptz_trunc() +/* + * timestamptz_trunc() * Truncate timestamptz to specified units in session timezone. */ Datum @@ -5081,7 +5108,8 @@ timestamptz_trunc(PG_FUNCTION_ARGS) PG_RETURN_TIMESTAMPTZ(result); } -/* timestamptz_trunc_zone() +/* + * timestamptz_trunc_zone() * Truncate timestamptz to specified units in specified timezone. */ Datum @@ -5103,7 +5131,8 @@ timestamptz_trunc_zone(PG_FUNCTION_ARGS) PG_RETURN_TIMESTAMPTZ(result); } -/* interval_trunc() +/* + * interval_trunc() * Extract specified field from interval. */ Datum @@ -5229,7 +5258,8 @@ interval_trunc(PG_FUNCTION_ARGS) PG_RETURN_INTERVAL_P(result); } -/* isoweek2j() +/* + * isoweek2j() * * Return the Julian day which corresponds to the first day (Monday) of the given ISO 8601 year and week. * Julian days are used to convert between ISO week dates and Gregorian dates. @@ -5253,7 +5283,8 @@ isoweek2j(int year, int week) return ((week - 1) * 7) + (day4 - day0); } -/* isoweek2date() +/* + * isoweek2date() * Convert ISO week of year number to date. * The year field must be specified with the ISO year! * karel 2000/08/07 @@ -5264,7 +5295,8 @@ isoweek2date(int woy, int *year, int *mon, int *mday) j2date(isoweek2j(*year, woy), year, mon, mday); } -/* isoweekdate2date() +/* + * isoweekdate2date() * * Convert an ISO 8601 week date (ISO year, ISO week) into a Gregorian date. * Gregorian day of week sent so weekday strings can be supplied. @@ -5285,7 +5317,8 @@ isoweekdate2date(int isoweek, int wday, int *year, int *mon, int *mday) j2date(jday, year, mon, mday); } -/* date2isoweek() +/* + * date2isoweek() * * Returns ISO week number of year. */ @@ -5339,7 +5372,8 @@ date2isoweek(int year, int mon, int mday) } -/* date2isoyear() +/* + * date2isoyear() * * Returns ISO 8601 year number. * Note: zero or negative results follow the year-zero-exists convention. @@ -5396,7 +5430,8 @@ date2isoyear(int year, int mon, int mday) } -/* date2isoyearday() +/* + * date2isoyearday() * * Returns the ISO 8601 day-of-year, given a Gregorian year, month and day. * Possible return values are 1 through 371 (364 in non-leap years). @@ -5472,7 +5507,8 @@ NonFiniteTimestampTzPart(int type, int unit, char *lowunits, } } -/* timestamp_part() and extract_timestamp() +/* + * timestamp_part() and extract_timestamp() * Extract specified field from timestamp. */ static Datum @@ -5745,7 +5781,8 @@ extract_timestamp(PG_FUNCTION_ARGS) return timestamp_part_common(fcinfo, true); } -/* timestamptz_part() and extract_timestamptz() +/* + * timestamptz_part() and extract_timestamptz() * Extract specified field from timestamp with time zone. */ static Datum @@ -6071,7 +6108,8 @@ NonFiniteIntervalPart(int type, int unit, char *lowunits, bool isNegative) } } -/* interval_part() and extract_interval() +/* + * interval_part() and extract_interval() * Extract specified field from interval. */ static Datum @@ -6294,7 +6332,8 @@ extract_interval(PG_FUNCTION_ARGS) } -/* timestamp_zone() +/* + * timestamp_zone() * Encode timestamp type with specified time zone. * This function is just timestamp2timestamptz() except instead of * shifting to the global timezone, we shift to the specified timezone. @@ -6364,7 +6403,8 @@ timestamp_zone(PG_FUNCTION_ARGS) PG_RETURN_TIMESTAMPTZ(result); } -/* timestamp_izone() +/* + * timestamp_izone() * Encode timestamp type with specified time interval as time zone. */ Datum @@ -6404,7 +6444,8 @@ timestamp_izone(PG_FUNCTION_ARGS) PG_RETURN_TIMESTAMPTZ(result); } /* timestamp_izone() */ -/* TimestampTimestampTzRequiresRewrite() +/* + * TimestampTimestampTzRequiresRewrite() * * Returns false if the TimeZone GUC setting causes timestamp_timestamptz and * timestamptz_timestamp to be no-ops, where the return value has the same @@ -6421,7 +6462,8 @@ TimestampTimestampTzRequiresRewrite(void) return true; } -/* timestamp_timestamptz() +/* + * timestamp_timestamptz() * Convert local timestamp to timestamp at GMT */ Datum @@ -6489,7 +6531,8 @@ timestamp2timestamptz(Timestamp timestamp) return timestamp2timestamptz_safe(timestamp, NULL); } -/* timestamptz_timestamp() +/* + * timestamptz_timestamp() * Convert timestamp at GMT to local timestamp */ Datum @@ -6563,7 +6606,8 @@ timestamptz2timestamp_safe(TimestampTz timestamp, Node *escontext) return result; } -/* timestamptz_zone() +/* + * timestamptz_zone() * Evaluate timestamp with time zone type at the specified time zone. * Returns a timestamp without time zone. */ @@ -6627,7 +6671,8 @@ timestamptz_zone(PG_FUNCTION_ARGS) PG_RETURN_TIMESTAMP(result); } -/* timestamptz_izone() +/* + * timestamptz_izone() * Encode timestamp with time zone type with specified time interval as time zone. * Returns a timestamp without time zone. */ @@ -6668,7 +6713,8 @@ timestamptz_izone(PG_FUNCTION_ARGS) PG_RETURN_TIMESTAMP(result); } -/* generate_series_timestamp() +/* + * generate_series_timestamp() * Generate the set of timestamps from start to finish by step */ Datum @@ -6750,7 +6796,8 @@ generate_series_timestamp(PG_FUNCTION_ARGS) } } -/* generate_series_timestamptz() +/* + * generate_series_timestamptz() * Generate the set of timestamps from start to finish by step, * doing arithmetic in the specified or session timezone. */ @@ -6934,7 +6981,8 @@ generate_series_timestamp_support(PG_FUNCTION_ARGS) } -/* timestamp_at_local() +/* + * timestamp_at_local() * timestamptz_at_local() * * The regression tests do not like two functions with the same proargs and diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c index a62e55eec19..45b7ef185a1 100644 --- a/src/backend/utils/adt/varchar.c +++ b/src/backend/utils/adt/varchar.c @@ -346,7 +346,8 @@ bpchar(PG_FUNCTION_ARGS) } -/* char_bpchar() +/* + * char_bpchar() * Convert char to bpchar(1). */ Datum @@ -364,7 +365,8 @@ char_bpchar(PG_FUNCTION_ARGS) } -/* bpchar_name() +/* + * bpchar_name() * Converts a bpchar() type to a NameData type. */ Datum @@ -397,7 +399,8 @@ bpchar_name(PG_FUNCTION_ARGS) PG_RETURN_NAME(result); } -/* name_bpchar() +/* + * name_bpchar() * Converts a NameData type to a bpchar type. * * Uses the text conversion functions, which is only appropriate if BpChar diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c index e86e6bc4839..0c6d3ba4d22 100644 --- a/src/backend/utils/adt/varlena.c +++ b/src/backend/utils/adt/varlena.c @@ -1395,7 +1395,8 @@ varstr_cmp(const char *arg1, int len1, const char *arg2, int len2, Oid collid) return result; } -/* text_cmp() +/* + * text_cmp() * Internal comparison function for text strings. * Returns -1, 0 or 1 */ @@ -2672,7 +2673,8 @@ bttext_pattern_sortsupport(PG_FUNCTION_ARGS) } -/* text_name() +/* + * text_name() * Converts a text type to a Name type. */ Datum @@ -2695,7 +2697,8 @@ text_name(PG_FUNCTION_ARGS) PG_RETURN_NAME(result); } -/* name_text() +/* + * name_text() * Converts a Name type to a text type. */ Datum diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index 1b8a73f589a..50c53b571a0 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -1091,7 +1091,7 @@ errcode_for_socket_access(void) * ereport will provide one for the output methods that need it. */ int -errmsg(const char *fmt,...) +errmsg(const char *fmt, ...) { ErrorData *edata = &errordata[errordata_stack_depth]; MemoryContext oldcontext; @@ -1346,7 +1346,7 @@ backtrace_cleanup(int code, Datum arg) * error recursion. */ int -errmsg_internal(const char *fmt,...) +errmsg_internal(const char *fmt, ...) { ErrorData *edata = &errordata[errordata_stack_depth]; MemoryContext oldcontext; @@ -1370,7 +1370,7 @@ errmsg_internal(const char *fmt,...) */ int errmsg_plural(const char *fmt_singular, const char *fmt_plural, - unsigned long n,...) + unsigned long n, ...) { ErrorData *edata = &errordata[errordata_stack_depth]; MemoryContext oldcontext; @@ -1392,7 +1392,7 @@ errmsg_plural(const char *fmt_singular, const char *fmt_plural, * errdetail --- add a detail error message text to the current error */ int -errdetail(const char *fmt,...) +errdetail(const char *fmt, ...) { ErrorData *edata = &errordata[errordata_stack_depth]; MemoryContext oldcontext; @@ -1419,7 +1419,7 @@ errdetail(const char *fmt,...) * (typically, that they don't seem to be useful to average users). */ int -errdetail_internal(const char *fmt,...) +errdetail_internal(const char *fmt, ...) { ErrorData *edata = &errordata[errordata_stack_depth]; MemoryContext oldcontext; @@ -1440,7 +1440,7 @@ errdetail_internal(const char *fmt,...) * errdetail_log --- add a detail_log error message text to the current error */ int -errdetail_log(const char *fmt,...) +errdetail_log(const char *fmt, ...) { ErrorData *edata = &errordata[errordata_stack_depth]; MemoryContext oldcontext; @@ -1462,7 +1462,7 @@ errdetail_log(const char *fmt,...) */ int errdetail_log_plural(const char *fmt_singular, const char *fmt_plural, - unsigned long n,...) + unsigned long n, ...) { ErrorData *edata = &errordata[errordata_stack_depth]; MemoryContext oldcontext; @@ -1485,7 +1485,7 @@ errdetail_log_plural(const char *fmt_singular, const char *fmt_plural, */ int errdetail_plural(const char *fmt_singular, const char *fmt_plural, - unsigned long n,...) + unsigned long n, ...) { ErrorData *edata = &errordata[errordata_stack_depth]; MemoryContext oldcontext; @@ -1506,7 +1506,7 @@ errdetail_plural(const char *fmt_singular, const char *fmt_plural, * errhint --- add a hint error message text to the current error */ int -errhint(const char *fmt,...) +errhint(const char *fmt, ...) { ErrorData *edata = &errordata[errordata_stack_depth]; MemoryContext oldcontext; @@ -1528,7 +1528,7 @@ errhint(const char *fmt,...) * Non-translated version of errhint(), see also errmsg_internal(). */ int -errhint_internal(const char *fmt,...) +errhint_internal(const char *fmt, ...) { ErrorData *edata = &errordata[errordata_stack_depth]; MemoryContext oldcontext; @@ -1550,7 +1550,7 @@ errhint_internal(const char *fmt,...) */ int errhint_plural(const char *fmt_singular, const char *fmt_plural, - unsigned long n,...) + unsigned long n, ...) { ErrorData *edata = &errordata[errordata_stack_depth]; MemoryContext oldcontext; @@ -1575,7 +1575,7 @@ errhint_plural(const char *fmt_singular, const char *fmt_plural, * states. */ int -errcontext_msg(const char *fmt,...) +errcontext_msg(const char *fmt, ...) { ErrorData *edata = &errordata[errordata_stack_depth]; MemoryContext oldcontext; @@ -1847,7 +1847,7 @@ pre_format_elog_string(int errnumber, const char *domain) } char * -format_elog_string(const char *fmt,...) +format_elog_string(const char *fmt, ...) { ErrorData errdata; ErrorData *edata; @@ -4226,7 +4226,7 @@ append_with_tabs(StringInfo buf, const char *str) * safely (memory context, GUC load etc) */ void -write_stderr(const char *fmt,...) +write_stderr(const char *fmt, ...) { va_list ap; diff --git a/src/backend/utils/error/jsonlog.c b/src/backend/utils/error/jsonlog.c index 2ff6a004046..e5ba22794d2 100644 --- a/src/backend/utils/error/jsonlog.c +++ b/src/backend/utils/error/jsonlog.c @@ -30,7 +30,7 @@ static void appendJSONKeyValueFmt(StringInfo buf, const char *key, bool escape_key, - const char *fmt,...) pg_attribute_printf(4, 5); + const char *fmt, ...) pg_attribute_printf(4, 5); /* * appendJSONKeyValue @@ -68,7 +68,7 @@ appendJSONKeyValue(StringInfo buf, const char *key, const char *value, */ static void appendJSONKeyValueFmt(StringInfo buf, const char *key, - bool escape_key, const char *fmt,...) + bool escape_key, const char *fmt, ...) { int save_errno = errno; size_t len = 128; /* initial assumption about buffer size */ diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c index bfbe0d28075..e4f29c2b1c9 100644 --- a/src/backend/utils/mb/mbutils.c +++ b/src/backend/utils/mb/mbutils.c @@ -1178,7 +1178,8 @@ pg_mbstrlen(const char *mbstr) return len; } -/* returns the length (counted in wchars) of a multibyte string +/* + * returns the length (counted in wchars) of a multibyte string * (stops at the first of "limit" or a NUL) */ int diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index c4c3fbc4fe3..774bbc9be5f 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -261,7 +261,7 @@ static bool valid_custom_variable_name(const char *name); static bool assignable_custom_variable_name(const char *name, bool skip_errors, int elevel); static void do_serialize(char **destptr, Size *maxbytes, - const char *fmt,...) pg_attribute_printf(3, 4); + const char *fmt, ...) pg_attribute_printf(3, 4); static bool call_bool_check_hook(const struct config_generic *conf, bool *newval, void **extra, GucSource source, int elevel); static bool call_int_check_hook(const struct config_generic *conf, int *newval, @@ -5883,7 +5883,7 @@ EstimateGUCStateSpace(void) * maxbytes is not sufficient to copy the string, error out. */ static void -do_serialize(char **destptr, Size *maxbytes, const char *fmt,...) +do_serialize(char **destptr, Size *maxbytes, const char *fmt, ...) { va_list vargs; int n; diff --git a/src/backend/utils/mmgr/bump.c b/src/backend/utils/mmgr/bump.c index bfb5a114147..9bb579935db 100644 --- a/src/backend/utils/mmgr/bump.c +++ b/src/backend/utils/mmgr/bump.c @@ -120,15 +120,15 @@ static inline void BumpBlockFree(BumpContext *set, BumpBlock *block); /* -* BumpContextCreate -* Create a new Bump context. -* -* parent: parent context, or NULL if top-level context -* name: name of context (must be statically allocated) -* minContextSize: minimum context size -* initBlockSize: initial allocation block size -* maxBlockSize: maximum allocation block size -*/ + * BumpContextCreate + * Create a new Bump context. + * + * parent: parent context, or NULL if top-level context + * name: name of context (must be statically allocated) + * minContextSize: minimum context size + * initBlockSize: initial allocation block size + * maxBlockSize: maximum allocation block size + */ MemoryContext BumpContextCreate(MemoryContext parent, const char *name, Size minContextSize, Size initBlockSize, Size maxBlockSize) diff --git a/src/backend/utils/mmgr/slab.c b/src/backend/utils/mmgr/slab.c index dd1db9566d1..2ad325547fd 100644 --- a/src/backend/utils/mmgr/slab.c +++ b/src/backend/utils/mmgr/slab.c @@ -172,7 +172,7 @@ typedef struct SlabBlock * SlabChunkIndex * Get the 0-based index of how many chunks into the block the given * chunk is. -*/ + */ #define SlabChunkIndex(slab, block, chunk) \ (((char *) (chunk) - (char *) SlabBlockGetChunk(slab, block, 0)) / \ (slab)->fullChunkSize) diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c index c1a4672aa6f..80dc3bbc8da 100644 --- a/src/bin/pg_basebackup/pg_basebackup.c +++ b/src/bin/pg_basebackup/pg_basebackup.c @@ -1282,7 +1282,7 @@ ReceiveArchiveStream(PGconn *conn, pg_compress_specification *compress) ReceiveCopyData(conn, ReceiveArchiveStreamChunk, &state); /* If we wrote the backup manifest to a file, close the file. */ - if (state.manifest_file !=NULL) + if (state.manifest_file != NULL) { fclose(state.manifest_file); state.manifest_file = NULL; @@ -1341,7 +1341,7 @@ ReceiveArchiveStreamChunk(size_t r, char *copybuf, void *callback_data) /* Sanity check. */ if (state->manifest_buffer != NULL || - state->manifest_file !=NULL) + state->manifest_file != NULL) pg_fatal("archives must precede manifest"); /* Parse the rest of the CopyData message. */ @@ -1406,7 +1406,7 @@ ReceiveArchiveStreamChunk(size_t r, char *copybuf, void *callback_data) appendPQExpBuffer(state->manifest_buffer, copybuf + 1, r - 1); } - else if (state->manifest_file !=NULL) + else if (state->manifest_file != NULL) { /* Manifest data, write to disk. */ if (fwrite(copybuf + 1, r - 1, 1, diff --git a/src/bin/pg_combinebackup/load_manifest.c b/src/bin/pg_combinebackup/load_manifest.c index 2e50b7af4d2..021fd3ffa1d 100644 --- a/src/bin/pg_combinebackup/load_manifest.c +++ b/src/bin/pg_combinebackup/load_manifest.c @@ -69,7 +69,7 @@ static void combinebackup_per_wal_range_cb(JsonManifestParseContext *context, XLogRecPtr start_lsn, XLogRecPtr end_lsn); pg_noreturn static void report_manifest_error(JsonManifestParseContext *context, - const char *fmt,...) + const char *fmt, ...) pg_attribute_printf(2, 3); /* @@ -225,7 +225,7 @@ load_backup_manifest(char *backup_directory) * expects this function not to return. */ static void -report_manifest_error(JsonManifestParseContext *context, const char *fmt,...) +report_manifest_error(JsonManifestParseContext *context, const char *fmt, ...) { va_list ap; diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c index 5539eb8ebef..b5433a75d12 100644 --- a/src/bin/pg_ctl/pg_ctl.c +++ b/src/bin/pg_ctl/pg_ctl.c @@ -114,7 +114,7 @@ static HANDLE shutdownHandles[2]; #endif -static void write_stderr(const char *fmt,...) pg_attribute_printf(1, 2); +static void write_stderr(const char *fmt, ...) pg_attribute_printf(1, 2); static void do_advice(void); static void do_help(void); static void set_mode(char *modeopt); @@ -200,7 +200,7 @@ write_eventlog(int level, const char *line) * not available). */ static void -write_stderr(const char *fmt,...) +write_stderr(const char *fmt, ...) { va_list ap; diff --git a/src/bin/pg_dump/common.c b/src/bin/pg_dump/common.c index d1431c5c24c..dc98c5c5c09 100644 --- a/src/bin/pg_dump/common.c +++ b/src/bin/pg_dump/common.c @@ -253,7 +253,8 @@ getSchemaData(Archive *fout, int *numTablesPtr) return tblinfo; } -/* flagInhTables - +/* + * flagInhTables - * Fill in parent link fields of tables for which we need that information, * mark parents of target tables as interesting, and create * TableAttachInfo objects for partitioned tables with appropriate @@ -448,7 +449,8 @@ flagInhIndexes(Archive *fout, TableInfo tblinfo[], int numTables) } } -/* flagInhAttrs - +/* + * flagInhAttrs - * for each dumpable table in tblinfo, flag its inherited attributes * * What we need to do here is: diff --git a/src/bin/pg_dump/filter.c b/src/bin/pg_dump/filter.c index fbff69d4f7e..8aa3810cb08 100644 --- a/src/bin/pg_dump/filter.c +++ b/src/bin/pg_dump/filter.c @@ -151,7 +151,7 @@ get_object_type(const char *keyword, int size, FilterObjectType *objtype) void -pg_log_filter_error(FilterStateData *fstate, const char *fmt,...) +pg_log_filter_error(FilterStateData *fstate, const char *fmt, ...) { va_list argp; char buf[256]; diff --git a/src/bin/pg_dump/filter.h b/src/bin/pg_dump/filter.h index b87cd6dec58..0cf0d22d159 100644 --- a/src/bin/pg_dump/filter.h +++ b/src/bin/pg_dump/filter.h @@ -63,7 +63,7 @@ typedef enum extern const char *filter_object_type_name(FilterObjectType fot); extern void filter_init(FilterStateData *fstate, const char *filename, exit_function f_exit); extern void filter_free(FilterStateData *fstate); -extern void pg_log_filter_error(FilterStateData *fstate, const char *fmt,...) +extern void pg_log_filter_error(FilterStateData *fstate, const char *fmt, ...) pg_attribute_printf(2, 3); extern bool filter_read_item(FilterStateData *fstate, char **objname, FilterCommandType *comtype, FilterObjectType *objtype); diff --git a/src/bin/pg_dump/pg_backup.h b/src/bin/pg_dump/pg_backup.h index fda912ba0a9..28e7ff6fa16 100644 --- a/src/bin/pg_dump/pg_backup.h +++ b/src/bin/pg_dump/pg_backup.h @@ -339,7 +339,7 @@ extern void SortTocFromFile(Archive *AHX); /* Convenience functions used only when writing DATA */ extern void archputs(const char *s, Archive *AH); -extern int archprintf(Archive *AH, const char *fmt,...) pg_attribute_printf(2, 3); +extern int archprintf(Archive *AH, const char *fmt, ...) pg_attribute_printf(2, 3); #define appendStringLiteralAH(buf,str,AH) \ appendStringLiteral(buf, str, (AH)->encoding, (AH)->std_strings) diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c index fecf6f2d1ce..2fd773ad84f 100644 --- a/src/bin/pg_dump/pg_backup_archiver.c +++ b/src/bin/pg_dump/pg_backup_archiver.c @@ -1674,7 +1674,7 @@ archputs(const char *s, Archive *AH) /* Public */ int -archprintf(Archive *AH, const char *fmt,...) +archprintf(Archive *AH, const char *fmt, ...) { int save_errno = errno; char *p; @@ -1778,7 +1778,7 @@ RestoreOutput(ArchiveHandle *AH, CompressFileHandle *savedOutput) * Print formatted text to the output file (usually stdout). */ int -ahprintf(ArchiveHandle *AH, const char *fmt,...) +ahprintf(ArchiveHandle *AH, const char *fmt, ...) { int save_errno = errno; char *p; @@ -1916,7 +1916,7 @@ ahwrite(const void *ptr, size_t size, size_t nmemb, ArchiveHandle *AH) /* on some error, we may decide to go on... */ void -warn_or_exit_horribly(ArchiveHandle *AH, const char *fmt,...) +warn_or_exit_horribly(ArchiveHandle *AH, const char *fmt, ...) { va_list ap; diff --git a/src/bin/pg_dump/pg_backup_archiver.h b/src/bin/pg_dump/pg_backup_archiver.h index 9c3aca6543a..1218bf6a6a1 100644 --- a/src/bin/pg_dump/pg_backup_archiver.h +++ b/src/bin/pg_dump/pg_backup_archiver.h @@ -396,7 +396,7 @@ extern int parallel_restore(ArchiveHandle *AH, TocEntry *te); extern void on_exit_close_archive(Archive *AHX); extern void replace_on_exit_close_archive(Archive *AHX); -extern void warn_or_exit_horribly(ArchiveHandle *AH, const char *fmt,...) pg_attribute_printf(2, 3); +extern void warn_or_exit_horribly(ArchiveHandle *AH, const char *fmt, ...) pg_attribute_printf(2, 3); /* Options for ArchiveEntry */ typedef struct _archiveOpts @@ -472,6 +472,6 @@ extern void IssueACLPerBlob(ArchiveHandle *AH, TocEntry *te); extern void DropLOIfExists(ArchiveHandle *AH, Oid oid); void ahwrite(const void *ptr, size_t size, size_t nmemb, ArchiveHandle *AH); -int ahprintf(ArchiveHandle *AH, const char *fmt,...) pg_attribute_printf(2, 3); +int ahprintf(ArchiveHandle *AH, const char *fmt, ...) pg_attribute_printf(2, 3); #endif diff --git a/src/bin/pg_dump/pg_backup_custom.c b/src/bin/pg_dump/pg_backup_custom.c index 52990620940..b2062d796f5 100644 --- a/src/bin/pg_dump/pg_backup_custom.c +++ b/src/bin/pg_dump/pg_backup_custom.c @@ -193,7 +193,7 @@ InitArchiveFmt_Custom(ArchiveHandle *AH) * Optional. * * Set up extract format-related TOC data. -*/ + */ static void _ArchiveEntry(ArchiveHandle *AH, TocEntry *te) { @@ -563,7 +563,7 @@ _PrintTocData(ArchiveHandle *AH, TocEntry *te) /* * Print data from current file position. -*/ + */ static void _PrintData(ArchiveHandle *AH) { @@ -617,7 +617,7 @@ _skipLOs(ArchiveHandle *AH) * Skip data from current file position. * Data blocks are formatted as an integer length, followed by data. * A zero length indicates the end of the block. -*/ + */ static void _skipData(ArchiveHandle *AH) { diff --git a/src/bin/pg_dump/pg_backup_directory.c b/src/bin/pg_dump/pg_backup_directory.c index d6a1428c67a..562868cd2ad 100644 --- a/src/bin/pg_dump/pg_backup_directory.c +++ b/src/bin/pg_dump/pg_backup_directory.c @@ -193,7 +193,7 @@ InitArchiveFmt_Directory(ArchiveHandle *AH) * Called by the Archiver when the dumper creates a new TOC entry. * * We determine the filename for this entry. -*/ + */ static void _ArchiveEntry(ArchiveHandle *AH, TocEntry *te) { @@ -372,7 +372,7 @@ _PrintFileData(ArchiveHandle *AH, char *filename) /* * Print data for a given TOC entry -*/ + */ static void _PrintTocData(ArchiveHandle *AH, TocEntry *te) { diff --git a/src/bin/pg_dump/pg_backup_tar.c b/src/bin/pg_dump/pg_backup_tar.c index a3879410c94..ae3a7c80cbf 100644 --- a/src/bin/pg_dump/pg_backup_tar.c +++ b/src/bin/pg_dump/pg_backup_tar.c @@ -102,7 +102,7 @@ static void tarClose(ArchiveHandle *AH, TAR_MEMBER *th); #ifdef __NOT_USED__ static char *tarGets(char *buf, size_t len, TAR_MEMBER *th); #endif -static int tarPrintf(TAR_MEMBER *th, const char *fmt,...) pg_attribute_printf(2, 3); +static int tarPrintf(TAR_MEMBER *th, const char *fmt, ...) pg_attribute_printf(2, 3); static void _tarAddFile(ArchiveHandle *AH, TAR_MEMBER *th); static TAR_MEMBER *_tarPositionTo(ArchiveHandle *AH, const char *filename); @@ -584,7 +584,7 @@ _PrintFileData(ArchiveHandle *AH, char *filename) /* * Print data for a given TOC entry -*/ + */ static void _PrintTocData(ArchiveHandle *AH, TocEntry *te) { @@ -951,7 +951,7 @@ _EndLOs(ArchiveHandle *AH, TocEntry *te) */ static int -tarPrintf(TAR_MEMBER *th, const char *fmt,...) +tarPrintf(TAR_MEMBER *th, const char *fmt, ...) { int save_errno = errno; char *p; diff --git a/src/bin/pg_upgrade/exec.c b/src/bin/pg_upgrade/exec.c index e1de61f36ee..563b4a6b5fa 100644 --- a/src/bin/pg_upgrade/exec.c +++ b/src/bin/pg_upgrade/exec.c @@ -84,7 +84,7 @@ get_bin_version(ClusterInfo *cluster) */ bool exec_prog(const char *log_filename, const char *opt_log_file, - bool report_error, bool exit_on_error, const char *fmt,...) + bool report_error, bool exit_on_error, const char *fmt, ...) { int result = 0; int written; diff --git a/src/bin/pg_upgrade/parallel.c b/src/bin/pg_upgrade/parallel.c index f0406de84ee..f57dbbbb853 100644 --- a/src/bin/pg_upgrade/parallel.c +++ b/src/bin/pg_upgrade/parallel.c @@ -61,7 +61,7 @@ DWORD win32_transfer_all_new_dbs(transfer_thread_arg *args); */ void parallel_exec_prog(const char *log_file, const char *opt_log_file, - const char *fmt,...) + const char *fmt, ...) { va_list args; char cmd[MAX_STRING]; diff --git a/src/bin/pg_upgrade/pg_upgrade.h b/src/bin/pg_upgrade/pg_upgrade.h index 1d767bbda2d..ccd1ac0d013 100644 --- a/src/bin/pg_upgrade/pg_upgrade.h +++ b/src/bin/pg_upgrade/pg_upgrade.h @@ -318,7 +318,7 @@ typedef struct /* * LogOpts -*/ + */ typedef struct { FILE *internal; /* internal log FILE */ @@ -335,7 +335,7 @@ typedef struct /* * UserOpts -*/ + */ typedef struct { bool check; /* check clusters only, don't change any data */ @@ -414,7 +414,7 @@ void generate_old_dump(void); #define EXEC_PSQL_ARGS "--echo-queries --set ON_ERROR_STOP=on --no-psqlrc --dbname=template1" bool exec_prog(const char *log_filename, const char *opt_log_file, - bool report_error, bool exit_on_error, const char *fmt,...) pg_attribute_printf(5, 6); + bool report_error, bool exit_on_error, const char *fmt, ...) pg_attribute_printf(5, 6); void verify_directories(void); bool pid_lock_file_exists(const char *datadir); @@ -474,7 +474,7 @@ void init_tablespaces(void); /* server.c */ PGconn *connectToServer(ClusterInfo *cluster, const char *db_name); -PGresult *executeQueryOrDie(PGconn *conn, const char *fmt,...) pg_attribute_printf(2, 3); +PGresult *executeQueryOrDie(PGconn *conn, const char *fmt, ...) pg_attribute_printf(2, 3); char *cluster_conn_opts(ClusterInfo *cluster); @@ -488,13 +488,13 @@ void check_pghost_envvar(void); char *quote_identifier(const char *s); int get_user_info(char **user_name_p); void check_ok(void); -void report_status(eLogType type, const char *fmt,...) pg_attribute_printf(2, 3); -void pg_log(eLogType type, const char *fmt,...) pg_attribute_printf(2, 3); -pg_noreturn void pg_fatal(const char *fmt,...) pg_attribute_printf(1, 2); +void report_status(eLogType type, const char *fmt, ...) pg_attribute_printf(2, 3); +void pg_log(eLogType type, const char *fmt, ...) pg_attribute_printf(2, 3); +pg_noreturn void pg_fatal(const char *fmt, ...) pg_attribute_printf(1, 2); void end_progress_output(void); void cleanup_output_dirs(void); -void prep_status(const char *fmt,...) pg_attribute_printf(1, 2); -void prep_status_progress(const char *fmt,...) pg_attribute_printf(1, 2); +void prep_status(const char *fmt, ...) pg_attribute_printf(1, 2); +void prep_status_progress(const char *fmt, ...) pg_attribute_printf(1, 2); unsigned int str2uint(const char *str); @@ -512,7 +512,7 @@ MultiXactOffset rewrite_multixacts(MultiXactId from_multi, MultiXactId to_multi) /* parallel.c */ void parallel_exec_prog(const char *log_file, const char *opt_log_file, - const char *fmt,...) pg_attribute_printf(3, 4); + const char *fmt, ...) pg_attribute_printf(3, 4); void parallel_transfer_all_new_dbs(DbInfoArr *old_db_arr, DbInfoArr *new_db_arr, char *old_pgdata, char *new_pgdata, char *old_tablespace, char *new_tablespace); diff --git a/src/bin/pg_upgrade/server.c b/src/bin/pg_upgrade/server.c index 1eb8bc97c05..5d81e4e95b8 100644 --- a/src/bin/pg_upgrade/server.c +++ b/src/bin/pg_upgrade/server.c @@ -121,7 +121,7 @@ cluster_conn_opts(ClusterInfo *cluster) * message and calls exit() to kill the program. */ PGresult * -executeQueryOrDie(PGconn *conn, const char *fmt,...) +executeQueryOrDie(PGconn *conn, const char *fmt, ...) { static char query[QUERY_ALLOC]; va_list args; diff --git a/src/bin/pg_upgrade/util.c b/src/bin/pg_upgrade/util.c index 0f47ed771d5..08d6385b512 100644 --- a/src/bin/pg_upgrade/util.c +++ b/src/bin/pg_upgrade/util.c @@ -29,7 +29,7 @@ static void pg_log_v(eLogType type, const char *fmt, va_list ap) pg_attribute_pr * results and other messages. */ void -report_status(eLogType type, const char *fmt,...) +report_status(eLogType type, const char *fmt, ...) { va_list args; @@ -126,7 +126,7 @@ cleanup_output_dirs(void) * pg_log(PG_FATAL, "failed: %s", message); */ void -prep_status(const char *fmt,...) +prep_status(const char *fmt, ...) { va_list args; char message[MAX_STRING]; @@ -153,7 +153,7 @@ prep_status(const char *fmt,...) * report_status(PG_REPORT, "ok"); */ void -prep_status_progress(const char *fmt,...) +prep_status_progress(const char *fmt, ...) { va_list args; char message[MAX_STRING]; @@ -256,7 +256,7 @@ pg_log_v(eLogType type, const char *fmt, va_list ap) void -pg_log(eLogType type, const char *fmt,...) +pg_log(eLogType type, const char *fmt, ...) { va_list args; @@ -267,7 +267,7 @@ pg_log(eLogType type, const char *fmt,...) void -pg_fatal(const char *fmt,...) +pg_fatal(const char *fmt, ...) { va_list args; diff --git a/src/bin/pg_verifybackup/pg_verifybackup.c b/src/bin/pg_verifybackup/pg_verifybackup.c index bb4fb97219e..bd4fe635c6f 100644 --- a/src/bin/pg_verifybackup/pg_verifybackup.c +++ b/src/bin/pg_verifybackup/pg_verifybackup.c @@ -71,7 +71,7 @@ static void verifybackup_per_wal_range_cb(JsonManifestParseContext *context, XLogRecPtr start_lsn, XLogRecPtr end_lsn); pg_noreturn static void report_manifest_error(JsonManifestParseContext *context, - const char *fmt,...) + const char *fmt, ...) pg_attribute_printf(2, 3); static void verify_tar_backup(verifier_context *context, DIR *dir, @@ -521,7 +521,7 @@ parse_manifest_file(char *manifest_path) * expects this function not to return. */ static void -report_manifest_error(JsonManifestParseContext *context, const char *fmt,...) +report_manifest_error(JsonManifestParseContext *context, const char *fmt, ...) { va_list ap; @@ -1250,7 +1250,7 @@ parse_required_wal(verifier_context *context, char *pg_waldump_path, * context says we should. */ void -report_backup_error(verifier_context *context, const char *pg_restrict fmt,...) +report_backup_error(verifier_context *context, const char *pg_restrict fmt, ...) { va_list ap; @@ -1267,7 +1267,7 @@ report_backup_error(verifier_context *context, const char *pg_restrict fmt,...) * Report a fatal error and exit */ void -report_fatal_error(const char *pg_restrict fmt,...) +report_fatal_error(const char *pg_restrict fmt, ...) { va_list ap; diff --git a/src/bin/pg_verifybackup/pg_verifybackup.h b/src/bin/pg_verifybackup/pg_verifybackup.h index a99d9bfd581..8572c1433dc 100644 --- a/src/bin/pg_verifybackup/pg_verifybackup.h +++ b/src/bin/pg_verifybackup/pg_verifybackup.h @@ -96,9 +96,9 @@ typedef struct verifier_context } verifier_context; extern void report_backup_error(verifier_context *context, - const char *pg_restrict fmt,...) + const char *pg_restrict fmt, ...) pg_attribute_printf(2, 3); -pg_noreturn extern void report_fatal_error(const char *pg_restrict fmt,...) +pg_noreturn extern void report_fatal_error(const char *pg_restrict fmt, ...) pg_attribute_printf(1, 2); extern bool should_ignore_relpath(verifier_context *context, const char *relpath); diff --git a/src/bin/pg_walsummary/pg_walsummary.c b/src/bin/pg_walsummary/pg_walsummary.c index aa214b8616d..c3e98ffe55e 100644 --- a/src/bin/pg_walsummary/pg_walsummary.c +++ b/src/bin/pg_walsummary/pg_walsummary.c @@ -43,7 +43,7 @@ static void help(const char *progname); static int compare_block_numbers(const void *a, const void *b); static int walsummary_read_callback(void *callback_arg, void *data, int length); -static void walsummary_error_callback(void *callback_arg, char *fmt,...) pg_attribute_printf(2, 3); +static void walsummary_error_callback(void *callback_arg, char *fmt, ...) pg_attribute_printf(2, 3); /* * Main program. @@ -227,7 +227,7 @@ compare_block_numbers(const void *a, const void *b) * Error callback. */ void -walsummary_error_callback(void *callback_arg, char *fmt,...) +walsummary_error_callback(void *callback_arg, char *fmt, ...) { va_list ap; diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c index c969afab3a5..69b12a919a4 100644 --- a/src/bin/pgbench/pgbench.c +++ b/src/bin/pgbench/pgbench.c @@ -239,7 +239,7 @@ static int64 random_seed = -1; /* * end of configurable parameters - *********************************************************************/ + */ #define nbranches 1 /* Makes little sense to change this. Change * -s instead */ diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c index 476e7fe6737..1a4e2ea0da8 100644 --- a/src/bin/psql/common.c +++ b/src/bin/psql/common.c @@ -328,7 +328,8 @@ psql_setup_cancel_handler(void) } -/* ConnectionUp +/* + * ConnectionUp * * Returns whether our backend connection is still there. */ @@ -340,7 +341,8 @@ ConnectionUp(void) -/* CheckConnection +/* + * CheckConnection * * Verify that we still have a good connection to the backend, and if not, * see if it can be restored. @@ -2567,7 +2569,8 @@ get_conninfo_value(const char *keyword) return res; } -/* expand_tilde +/* + * expand_tilde * * substitute '~' with HOME or '~username' with username's home dir * diff --git a/src/bin/psql/large_obj.c b/src/bin/psql/large_obj.c index 021f78e0f78..c961300fe98 100644 --- a/src/bin/psql/large_obj.c +++ b/src/bin/psql/large_obj.c @@ -13,10 +13,10 @@ #include "large_obj.h" #include "settings.h" -static void print_lo_result(const char *fmt,...) pg_attribute_printf(1, 2); +static void print_lo_result(const char *fmt, ...) pg_attribute_printf(1, 2); static void -print_lo_result(const char *fmt,...) +print_lo_result(const char *fmt, ...) { va_list ap; diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c index 69d044d405d..7665f0a3124 100644 --- a/src/bin/psql/startup.c +++ b/src/bin/psql/startup.c @@ -840,7 +840,8 @@ process_psqlrc_file(char *filename) -/* showVersion +/* + * showVersion * * This output format is intended to match GNU standards. */ diff --git a/src/bin/psql/stringutils.h b/src/bin/psql/stringutils.h index 01c2f79e597..0d9fe602b53 100644 --- a/src/bin/psql/stringutils.h +++ b/src/bin/psql/stringutils.h @@ -8,8 +8,10 @@ #ifndef STRINGUTILS_H #define STRINGUTILS_H -/* The cooler version of strtok() which knows about quotes and doesn't - * overwrite your input */ +/* + * The cooler version of strtok() which knows about quotes and doesn't + * overwrite your input + */ extern char *strtokx(const char *s, const char *whitespace, const char *delim, diff --git a/src/bin/psql/tab-complete.in.c b/src/bin/psql/tab-complete.in.c index 1335479d2aa..724323ee5f3 100644 --- a/src/bin/psql/tab-complete.in.c +++ b/src/bin/psql/tab-complete.in.c @@ -211,7 +211,8 @@ typedef struct SchemaQuery } SchemaQuery; -/* Store maximum number of records we want from database queries +/* + * Store maximum number of records we want from database queries * (implemented via SELECT ... LIMIT xx). */ static int completion_max_records; @@ -1689,7 +1690,7 @@ TailMatchesArray(bool case_sensitive, static bool TailMatchesImpl(bool case_sensitive, int previous_words_count, char **previous_words, - int narg,...) + int narg, ...) { const char *argarray[64]; va_list args; @@ -1739,7 +1740,7 @@ HeadMatchesArray(bool case_sensitive, static bool HeadMatchesImpl(bool case_sensitive, int previous_words_count, char **previous_words, - int narg,...) + int narg, ...) { const char *argarray[64]; va_list args; @@ -1826,7 +1827,7 @@ MatchesArray(bool case_sensitive, static bool MatchesImpl(bool case_sensitive, int previous_words_count, char **previous_words, - int narg,...) + int narg, ...) { const char *argarray[64]; va_list args; diff --git a/src/common/jsonapi.c b/src/common/jsonapi.c index 12e40f2d564..d3860197dad 100644 --- a/src/common/jsonapi.c +++ b/src/common/jsonapi.c @@ -300,7 +300,7 @@ static JsonIncrementalState failed_inc_oom; * lex_peek * * what is the current look_ahead token? -*/ + */ static inline JsonTokenType lex_peek(JsonLexContext *lex) { diff --git a/src/common/logging.c b/src/common/logging.c index 4a69d96281b..648f2c1d6f1 100644 --- a/src/common/logging.c +++ b/src/common/logging.c @@ -220,7 +220,7 @@ pg_logging_unset_logfile(void) void pg_log_generic(enum pg_log_level level, enum pg_log_part part, - const char *pg_restrict fmt,...) + const char *pg_restrict fmt, ...) { va_list ap; diff --git a/src/common/percentrepl.c b/src/common/percentrepl.c index 525a5ba6cf0..70bbfabd117 100644 --- a/src/common/percentrepl.c +++ b/src/common/percentrepl.c @@ -56,7 +56,7 @@ * revised. */ char * -replace_percent_placeholders(const char *instr, const char *param_name, const char *letters,...) +replace_percent_placeholders(const char *instr, const char *param_name, const char *letters, ...) { StringInfoData result; diff --git a/src/common/psprintf.c b/src/common/psprintf.c index 6f006e0262f..29b09732a5a 100644 --- a/src/common/psprintf.c +++ b/src/common/psprintf.c @@ -40,7 +40,7 @@ * One should therefore think twice about using this in libpq. */ char * -psprintf(const char *fmt,...) +psprintf(const char *fmt, ...) { int save_errno = errno; size_t len = 128; /* initial assumption about buffer size */ diff --git a/src/common/sha2.c b/src/common/sha2.c index 275d796bb97..e94140300ae 100644 --- a/src/common/sha2.c +++ b/src/common/sha2.c @@ -152,7 +152,8 @@ #define sigma1_512(x) (S64(19, (x)) ^ S64(61, (x)) ^ R( 6, (x))) /*** INTERNAL FUNCTION PROTOTYPES *************************************/ -/* NOTE: These should not be accessed directly from outside this +/* + * NOTE: These should not be accessed directly from outside this * library -- they are intended for private internal visibility/use * only. */ diff --git a/src/common/stringinfo.c b/src/common/stringinfo.c index ae39540e468..468954e484e 100644 --- a/src/common/stringinfo.c +++ b/src/common/stringinfo.c @@ -142,7 +142,7 @@ resetStringInfo(StringInfo str) * strcat. */ void -appendStringInfo(StringInfo str, const char *fmt,...) +appendStringInfo(StringInfo str, const char *fmt, ...) { int save_errno = errno; diff --git a/src/common/wchar.c b/src/common/wchar.c index 4c77e3e1dc8..926823cabec 100644 --- a/src/common/wchar.c +++ b/src/common/wchar.c @@ -618,7 +618,8 @@ mbbisearch(pg_wchar ucs, const struct mbinterval *table, int max) } -/* The following functions define the column width of an ISO 10646 +/* + * The following functions define the column width of an ISO 10646 * character as follows: * * - The null character (U+0000) has a column width of 0. diff --git a/src/fe_utils/option_utils.c b/src/fe_utils/option_utils.c index 8d0659c1164..c8bba075c1f 100644 --- a/src/fe_utils/option_utils.c +++ b/src/fe_utils/option_utils.c @@ -122,7 +122,7 @@ parse_sync_method(const char *optarg, DataDirSyncMethod *sync_method) * parameter (it discovers the number of arguments automagically). */ void -check_mut_excl_opts_internal(int n,...) +check_mut_excl_opts_internal(int n, ...) { char *first = NULL; va_list args; diff --git a/src/include/access/amapi.h b/src/include/access/amapi.h index ecfbd017d66..79240333530 100644 --- a/src/include/access/amapi.h +++ b/src/include/access/amapi.h @@ -154,7 +154,8 @@ typedef void (*amcostestimate_function) (PlannerInfo *root, double *indexCorrelation, double *indexPages); -/* estimate height of a tree-structured index +/* + * estimate height of a tree-structured index * * XXX This just computes a value that is later used by amcostestimate. This * API could be expanded to support passing more values if the need arises. diff --git a/src/include/access/amvalidate.h b/src/include/access/amvalidate.h index b82998778ac..debd1ed37a4 100644 --- a/src/include/access/amvalidate.h +++ b/src/include/access/amvalidate.h @@ -29,7 +29,7 @@ typedef struct OpFamilyOpFuncGroup /* Functions in access/index/amvalidate.c */ extern List *identify_opfamily_groups(CatCList *oprlist, CatCList *proclist); extern bool check_amproc_signature(Oid funcid, Oid restype, bool exact, - int minargs, int maxargs,...); + int minargs, int maxargs, ...); extern bool check_amoptsproc_signature(Oid funcid); extern bool check_amop_signature(Oid opno, Oid restype, Oid lefttype, Oid righttype); diff --git a/src/include/backup/walsummary.h b/src/include/backup/walsummary.h index 60157e0ac50..093b42df473 100644 --- a/src/include/backup/walsummary.h +++ b/src/include/backup/walsummary.h @@ -44,6 +44,6 @@ extern void RemoveWalSummaryIfOlderThan(WalSummaryFile *ws, extern int ReadWalSummary(void *wal_summary_io, void *data, int length); extern int WriteWalSummary(void *wal_summary_io, void *data, int length); -extern void ReportWalSummaryError(void *callback_arg, char *fmt,...) pg_attribute_printf(2, 3); +extern void ReportWalSummaryError(void *callback_arg, char *fmt, ...) pg_attribute_printf(2, 3); #endif /* WALSUMMARY_H */ diff --git a/src/include/catalog/pg_db_role_setting.h b/src/include/catalog/pg_db_role_setting.h index f1cbba020b2..55da8288a07 100644 --- a/src/include/catalog/pg_db_role_setting.h +++ b/src/include/catalog/pg_db_role_setting.h @@ -48,7 +48,7 @@ CATALOG(pg_db_role_setting,2964,DbRoleSettingRelationId) BKI_SHARED_RELATION END_CATALOG_STRUCT -typedef FormData_pg_db_role_setting * Form_pg_db_role_setting; +typedef FormData_pg_db_role_setting *Form_pg_db_role_setting; DECLARE_TOAST_WITH_MACRO(pg_db_role_setting, 2966, 2967, PgDbRoleSettingToastTable, PgDbRoleSettingToastIndex); diff --git a/src/include/common/blkreftable.h b/src/include/common/blkreftable.h index b5b5517f660..42b11b0a2b1 100644 --- a/src/include/common/blkreftable.h +++ b/src/include/common/blkreftable.h @@ -44,7 +44,7 @@ typedef struct BlockRefTableWriter BlockRefTableWriter; * report_error_fn should not return. */ typedef int (*io_callback_fn) (void *callback_arg, void *data, int length); -typedef void (*report_error_fn) (void *callback_arg, char *msg,...) pg_attribute_printf(2, 3); +typedef void (*report_error_fn) (void *callback_arg, char *msg, ...) pg_attribute_printf(2, 3); /* diff --git a/src/include/common/fe_memutils.h b/src/include/common/fe_memutils.h index 62bb9dcd9eb..d5c6d37bb66 100644 --- a/src/include/common/fe_memutils.h +++ b/src/include/common/fe_memutils.h @@ -95,7 +95,7 @@ extern void *repalloc_mul(void *p, Size s1, Size s2); #define repalloc_array(pointer, type, count) ((type *) repalloc_mul(pointer, sizeof(type), count)) /* sprintf into a palloc'd buffer --- these are in psprintf.c */ -extern char *psprintf(const char *fmt,...) pg_attribute_printf(1, 2); +extern char *psprintf(const char *fmt, ...) pg_attribute_printf(1, 2); extern size_t pvsnprintf(char *buf, size_t len, const char *fmt, va_list args) pg_attribute_printf(3, 0); #endif /* FE_MEMUTILS_H */ diff --git a/src/include/common/hashfn_unstable.h b/src/include/common/hashfn_unstable.h index 06bdf6d5866..5248446bd58 100644 --- a/src/include/common/hashfn_unstable.h +++ b/src/include/common/hashfn_unstable.h @@ -22,30 +22,31 @@ * notice follows: */ -/* The MIT License - - Copyright (C) 2012 Zilong Tan (eric.zltan@gmail.com) - - Permission is hereby granted, free of charge, to any person - obtaining a copy of this software and associated documentation - files (the "Software"), to deal in the Software without - restriction, including without limitation the rights to use, copy, - modify, merge, publish, distribute, sublicense, and/or sell copies - of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. -*/ +/* + * The MIT License + * + * Copyright (C) 2012 Zilong Tan (eric.zltan@gmail.com) + * + * Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, + * modify, merge, publish, distribute, sublicense, and/or sell copies + * of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ /* * fasthash as implemented here has two interfaces: diff --git a/src/include/common/logging.h b/src/include/common/logging.h index 06c202dbe2d..da62b14b2e3 100644 --- a/src/include/common/logging.h +++ b/src/include/common/logging.h @@ -95,7 +95,7 @@ void pg_logging_set_logfile(FILE *logfile); void pg_logging_unset_logfile(void); void pg_log_generic(enum pg_log_level level, enum pg_log_part part, - const char *pg_restrict fmt,...) + const char *pg_restrict fmt, ...) pg_attribute_printf(3, 4); void pg_log_generic_v(enum pg_log_level level, enum pg_log_part part, const char *pg_restrict fmt, va_list ap) diff --git a/src/include/common/parse_manifest.h b/src/include/common/parse_manifest.h index 35a3b5ca66c..95ba885afe6 100644 --- a/src/include/common/parse_manifest.h +++ b/src/include/common/parse_manifest.h @@ -34,7 +34,7 @@ typedef void (*json_manifest_per_wal_range_callback) (JsonManifestParseContext * TimeLineID tli, XLogRecPtr start_lsn, XLogRecPtr end_lsn); typedef void (*json_manifest_error_callback) (JsonManifestParseContext *, - const char *fmt,...) pg_attribute_printf(2, 3); + const char *fmt, ...) pg_attribute_printf(2, 3); struct JsonManifestParseContext { diff --git a/src/include/common/percentrepl.h b/src/include/common/percentrepl.h index 9c0322dd446..9e7727f63a2 100644 --- a/src/include/common/percentrepl.h +++ b/src/include/common/percentrepl.h @@ -13,6 +13,6 @@ #ifndef PERCENTREPL_H #define PERCENTREPL_H -extern char *replace_percent_placeholders(const char *instr, const char *param_name, const char *letters,...); +extern char *replace_percent_placeholders(const char *instr, const char *param_name, const char *letters, ...); #endif /* PERCENTREPL_H */ diff --git a/src/include/executor/tuptable.h b/src/include/executor/tuptable.h index d7e8e72aeae..3db6c9c9bd0 100644 --- a/src/include/executor/tuptable.h +++ b/src/include/executor/tuptable.h @@ -480,7 +480,8 @@ ExecClearTuple(TupleTableSlot *slot) return slot; } -/* ExecMaterializeSlot - force a slot into the "materialized" state. +/* + * ExecMaterializeSlot - force a slot into the "materialized" state. * * This causes the slot's tuple to be a local copy not dependent on any * external storage (i.e. pointing into a Buffer, or having allocations in diff --git a/src/include/fe_utils/conditional.h b/src/include/fe_utils/conditional.h index 17b0ac837fb..2ed796b5c50 100644 --- a/src/include/fe_utils/conditional.h +++ b/src/include/fe_utils/conditional.h @@ -66,7 +66,7 @@ typedef struct IfStackElem typedef struct ConditionalStackData { IfStackElem *head; -} ConditionalStackData; +} ConditionalStackData; typedef struct ConditionalStackData *ConditionalStack; diff --git a/src/include/fe_utils/option_utils.h b/src/include/fe_utils/option_utils.h index d975db77af2..f70b6159099 100644 --- a/src/include/fe_utils/option_utils.h +++ b/src/include/fe_utils/option_utils.h @@ -24,7 +24,7 @@ extern bool option_parse_int(const char *optarg, const char *optname, int *result); extern bool parse_sync_method(const char *optarg, DataDirSyncMethod *sync_method); -extern void check_mut_excl_opts_internal(int n,...); +extern void check_mut_excl_opts_internal(int n, ...); /* see comment for check_mut_excl_opts_internal() in option_utils.c for info */ #define check_mut_excl_opts(set, opt, ...) \ diff --git a/src/include/fmgr.h b/src/include/fmgr.h index 10d02bdb79f..38e143ac670 100644 --- a/src/include/fmgr.h +++ b/src/include/fmgr.h @@ -554,7 +554,8 @@ extern int no_such_variable *------------------------------------------------------------------------- */ -/* These are for invocation of a specifically named function with a +/* + * These are for invocation of a specifically named function with a * directly-computed parameter list. Note that neither arguments nor result * are allowed to be NULL. Also, the function cannot be one that needs to * look at FmgrInfo, since there won't be any. @@ -603,7 +604,8 @@ extern Datum CallerFInfoFunctionCall1(PGFunction func, FmgrInfo *flinfo, extern Datum CallerFInfoFunctionCall2(PGFunction func, FmgrInfo *flinfo, Oid collation, Datum arg1, Datum arg2); -/* These are for invocation of a previously-looked-up function with a +/* + * These are for invocation of a previously-looked-up function with a * directly-computed parameter list. Note that neither arguments nor result * are allowed to be NULL. */ @@ -639,7 +641,8 @@ extern Datum FunctionCall9Coll(FmgrInfo *flinfo, Oid collation, Datum arg6, Datum arg7, Datum arg8, Datum arg9); -/* These are for invocation of a function identified by OID with a +/* + * These are for invocation of a function identified by OID with a * directly-computed parameter list. Note that neither arguments nor result * are allowed to be NULL. These are essentially fmgr_info() followed by * FunctionCallN(). If the same function is to be invoked repeatedly, do the @@ -677,7 +680,8 @@ extern Datum OidFunctionCall9Coll(Oid functionId, Oid collation, Datum arg6, Datum arg7, Datum arg8, Datum arg9); -/* These macros allow the collation argument to be omitted (with a default of +/* + * These macros allow the collation argument to be omitted (with a default of * InvalidOid, ie, no collation). They exist mostly for backwards * compatibility of source code. */ diff --git a/src/include/jit/llvmjit_emit.h b/src/include/jit/llvmjit_emit.h index 089945391ee..0e089b9569b 100644 --- a/src/include/jit/llvmjit_emit.h +++ b/src/include/jit/llvmjit_emit.h @@ -159,14 +159,14 @@ l_load_gep1(LLVMBuilderRef b, LLVMTypeRef t, LLVMValueRef v, LLVMValueRef idx, c } /* separate, because pg_attribute_printf(2, 3) can't appear in definition */ -static inline LLVMBasicBlockRef l_bb_before_v(LLVMBasicBlockRef r, const char *fmt,...) pg_attribute_printf(2, 3); +static inline LLVMBasicBlockRef l_bb_before_v(LLVMBasicBlockRef r, const char *fmt, ...) pg_attribute_printf(2, 3); /* * Insert a new basic block, just before r, the name being determined by fmt * and arguments. */ static inline LLVMBasicBlockRef -l_bb_before_v(LLVMBasicBlockRef r, const char *fmt,...) +l_bb_before_v(LLVMBasicBlockRef r, const char *fmt, ...) { char buf[512]; va_list args; @@ -182,14 +182,14 @@ l_bb_before_v(LLVMBasicBlockRef r, const char *fmt,...) } /* separate, because pg_attribute_printf(2, 3) can't appear in definition */ -static inline LLVMBasicBlockRef l_bb_append_v(LLVMValueRef f, const char *fmt,...) pg_attribute_printf(2, 3); +static inline LLVMBasicBlockRef l_bb_append_v(LLVMValueRef f, const char *fmt, ...) pg_attribute_printf(2, 3); /* * Insert a new basic block after previous basic blocks, the name being * determined by fmt and arguments. */ static inline LLVMBasicBlockRef -l_bb_append_v(LLVMValueRef f, const char *fmt,...) +l_bb_append_v(LLVMValueRef f, const char *fmt, ...) { char buf[512]; va_list args; diff --git a/src/include/lib/stringinfo.h b/src/include/lib/stringinfo.h index 079652c8ce4..e3f4b922300 100644 --- a/src/include/lib/stringinfo.h +++ b/src/include/lib/stringinfo.h @@ -196,7 +196,7 @@ extern void resetStringInfo(StringInfo str); * to str if necessary. This is sort of like a combination of sprintf and * strcat. */ -extern void appendStringInfo(StringInfo str, const char *fmt,...) pg_attribute_printf(2, 3); +extern void appendStringInfo(StringInfo str, const char *fmt, ...) pg_attribute_printf(2, 3); /*------------------------ * appendStringInfoVA diff --git a/src/include/libpq/pg-gssapi.h b/src/include/libpq/pg-gssapi.h index 094ae924e82..d64f2da1515 100644 --- a/src/include/libpq/pg-gssapi.h +++ b/src/include/libpq/pg-gssapi.h @@ -27,12 +27,12 @@ /* IWYU pragma: end_exports */ /* -* On Windows, includes a #define for X509_NAME, which breaks our -* ability to use OpenSSL's version of that symbol if is pulled -* in after ... and, at least on some builds, it is. We -* can't reliably fix that by re-ordering #includes, because libpq/libpq-be.h -* #includes . Instead, just zap the #define again here. -*/ + * On Windows, includes a #define for X509_NAME, which breaks our + * ability to use OpenSSL's version of that symbol if is pulled + * in after ... and, at least on some builds, it is. We + * can't reliably fix that by re-ordering #includes, because libpq/libpq-be.h + * #includes . Instead, just zap the #define again here. + */ #ifdef X509_NAME #undef X509_NAME #endif diff --git a/src/include/optimizer/geqo.h b/src/include/optimizer/geqo.h index 890b47d281b..59d1964a748 100644 --- a/src/include/optimizer/geqo.h +++ b/src/include/optimizer/geqo.h @@ -11,12 +11,13 @@ *------------------------------------------------------------------------- */ -/* contributed by: - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= - * Martin Utesch * Institute of Automatic Control * - = = University of Mining and Technology = - * utesch@aut.tu-freiberg.de * Freiberg, Germany * - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= +/* + * contributed by: + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= + * * Martin Utesch * Institute of Automatic Control * + * = = University of Mining and Technology = + * * utesch@aut.tu-freiberg.de * Freiberg, Germany * + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= */ #ifndef GEQO_H @@ -30,17 +31,17 @@ /* GEQO debug flag */ /* - #define GEQO_DEBUG + * #define GEQO_DEBUG */ /* choose one recombination mechanism here */ /* - #define ERX - #define PMX - #define CX - #define PX - #define OX1 - #define OX2 + * #define ERX + * #define PMX + * #define CX + * #define PX + * #define OX1 + * #define OX2 */ #define ERX diff --git a/src/include/optimizer/geqo_copy.h b/src/include/optimizer/geqo_copy.h index 55e0d535812..b18e20b0f0c 100644 --- a/src/include/optimizer/geqo_copy.h +++ b/src/include/optimizer/geqo_copy.h @@ -11,12 +11,13 @@ *------------------------------------------------------------------------- */ -/* contributed by: - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= - * Martin Utesch * Institute of Automatic Control * - = = University of Mining and Technology = - * utesch@aut.tu-freiberg.de * Freiberg, Germany * - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= +/* + * contributed by: + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= + * * Martin Utesch * Institute of Automatic Control * + * = = University of Mining and Technology = + * * utesch@aut.tu-freiberg.de * Freiberg, Germany * + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= */ #ifndef GEQO_COPY_H diff --git a/src/include/optimizer/geqo_gene.h b/src/include/optimizer/geqo_gene.h index 408462db666..6001bd2d06e 100644 --- a/src/include/optimizer/geqo_gene.h +++ b/src/include/optimizer/geqo_gene.h @@ -11,12 +11,13 @@ *------------------------------------------------------------------------- */ -/* contributed by: - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= - * Martin Utesch * Institute of Automatic Control * - = = University of Mining and Technology = - * utesch@aut.tu-freiberg.de * Freiberg, Germany * - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= +/* + * contributed by: + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= + * * Martin Utesch * Institute of Automatic Control * + * = = University of Mining and Technology = + * * utesch@aut.tu-freiberg.de * Freiberg, Germany * + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= */ @@ -25,8 +26,10 @@ #include "nodes/nodes.h" -/* we presume that int instead of Relid - is o.k. for Gene; so don't change it! */ +/* + * we presume that int instead of Relid + * is o.k. for Gene; so don't change it! + */ typedef int Gene; typedef struct Chromosome diff --git a/src/include/optimizer/geqo_misc.h b/src/include/optimizer/geqo_misc.h index 0525bea5547..d4f9e5d401b 100644 --- a/src/include/optimizer/geqo_misc.h +++ b/src/include/optimizer/geqo_misc.h @@ -11,12 +11,13 @@ *------------------------------------------------------------------------- */ -/* contributed by: - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= - * Martin Utesch * Institute of Automatic Control * - = = University of Mining and Technology = - * utesch@aut.tu-freiberg.de * Freiberg, Germany * - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= +/* + * contributed by: + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= + * * Martin Utesch * Institute of Automatic Control * + * = = University of Mining and Technology = + * * utesch@aut.tu-freiberg.de * Freiberg, Germany * + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= */ #ifndef GEQO_MISC_H diff --git a/src/include/optimizer/geqo_mutation.h b/src/include/optimizer/geqo_mutation.h index a433da0ae0f..5ab02e5a274 100644 --- a/src/include/optimizer/geqo_mutation.h +++ b/src/include/optimizer/geqo_mutation.h @@ -11,12 +11,13 @@ *------------------------------------------------------------------------- */ -/* contributed by: - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= - * Martin Utesch * Institute of Automatic Control * - = = University of Mining and Technology = - * utesch@aut.tu-freiberg.de * Freiberg, Germany * - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= +/* + * contributed by: + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= + * * Martin Utesch * Institute of Automatic Control * + * = = University of Mining and Technology = + * * utesch@aut.tu-freiberg.de * Freiberg, Germany * + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= */ #ifndef GEQO_MUTATION_H diff --git a/src/include/optimizer/geqo_pool.h b/src/include/optimizer/geqo_pool.h index bd3de6248a7..911a07988de 100644 --- a/src/include/optimizer/geqo_pool.h +++ b/src/include/optimizer/geqo_pool.h @@ -11,12 +11,13 @@ *------------------------------------------------------------------------- */ -/* contributed by: - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= - * Martin Utesch * Institute of Automatic Control * - = = University of Mining and Technology = - * utesch@aut.tu-freiberg.de * Freiberg, Germany * - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= +/* + * contributed by: + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= + * * Martin Utesch * Institute of Automatic Control * + * = = University of Mining and Technology = + * * utesch@aut.tu-freiberg.de * Freiberg, Germany * + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= */ diff --git a/src/include/optimizer/geqo_random.h b/src/include/optimizer/geqo_random.h index a6f34d2ba5f..2a8741c35b2 100644 --- a/src/include/optimizer/geqo_random.h +++ b/src/include/optimizer/geqo_random.h @@ -11,12 +11,13 @@ *------------------------------------------------------------------------- */ -/* contributed by: - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= - * Martin Utesch * Institute of Automatic Control * - = = University of Mining and Technology = - * utesch@aut.tu-freiberg.de * Freiberg, Germany * - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= +/* + * contributed by: + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= + * * Martin Utesch * Institute of Automatic Control * + * = = University of Mining and Technology = + * * utesch@aut.tu-freiberg.de * Freiberg, Germany * + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= */ /* -- parts of this are adapted from D. Whitley's Genitor algorithm -- */ diff --git a/src/include/optimizer/geqo_recombination.h b/src/include/optimizer/geqo_recombination.h index 1c07c923490..21b4227f62b 100644 --- a/src/include/optimizer/geqo_recombination.h +++ b/src/include/optimizer/geqo_recombination.h @@ -11,12 +11,13 @@ *------------------------------------------------------------------------- */ -/* contributed by: - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= - * Martin Utesch * Institute of Automatic Control * - = = University of Mining and Technology = - * utesch@aut.tu-freiberg.de * Freiberg, Germany * - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= +/* + * contributed by: + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= + * * Martin Utesch * Institute of Automatic Control * + * = = University of Mining and Technology = + * * utesch@aut.tu-freiberg.de * Freiberg, Germany * + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= */ /* -- parts of this are adapted from D. Whitley's Genitor algorithm -- */ diff --git a/src/include/optimizer/geqo_selection.h b/src/include/optimizer/geqo_selection.h index a1e82d88f60..1e41ef7d3ba 100644 --- a/src/include/optimizer/geqo_selection.h +++ b/src/include/optimizer/geqo_selection.h @@ -11,12 +11,13 @@ *------------------------------------------------------------------------- */ -/* contributed by: - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= - * Martin Utesch * Institute of Automatic Control * - = = University of Mining and Technology = - * utesch@aut.tu-freiberg.de * Freiberg, Germany * - =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= +/* + * contributed by: + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= + * * Martin Utesch * Institute of Automatic Control * + * = = University of Mining and Technology = + * * utesch@aut.tu-freiberg.de * Freiberg, Germany * + * =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= */ diff --git a/src/include/port.h b/src/include/port.h index d3924ece96c..074a8c7e5f1 100644 --- a/src/include/port.h +++ b/src/include/port.h @@ -232,13 +232,13 @@ pg_ascii_tolower(unsigned char ch) #endif extern int pg_vsnprintf(char *str, size_t count, const char *fmt, va_list args) pg_attribute_printf(3, 0); -extern int pg_snprintf(char *str, size_t count, const char *fmt,...) pg_attribute_printf(3, 4); +extern int pg_snprintf(char *str, size_t count, const char *fmt, ...) pg_attribute_printf(3, 4); extern int pg_vsprintf(char *str, const char *fmt, va_list args) pg_attribute_printf(2, 0); -extern int pg_sprintf(char *str, const char *fmt,...) pg_attribute_printf(2, 3); +extern int pg_sprintf(char *str, const char *fmt, ...) pg_attribute_printf(2, 3); extern int pg_vfprintf(FILE *stream, const char *fmt, va_list args) pg_attribute_printf(2, 0); -extern int pg_fprintf(FILE *stream, const char *fmt,...) pg_attribute_printf(2, 3); +extern int pg_fprintf(FILE *stream, const char *fmt, ...) pg_attribute_printf(2, 3); extern int pg_vprintf(const char *fmt, va_list args) pg_attribute_printf(1, 0); -extern int pg_printf(const char *fmt,...) pg_attribute_printf(1, 2); +extern int pg_printf(const char *fmt, ...) pg_attribute_printf(1, 2); #ifndef WIN32 /* @@ -361,7 +361,7 @@ extern bool rmtree(const char *path, bool rmtopdir); * passing of other special options. */ extern HANDLE pgwin32_open_handle(const char *, int, bool); -extern int pgwin32_open(const char *, int,...); +extern int pgwin32_open(const char *, int, ...); extern FILE *pgwin32_fopen(const char *, const char *); #define open(a,b,c) pgwin32_open(a,b,c) #define fopen(a,b) pgwin32_fopen(a,b) diff --git a/src/include/postgres.h b/src/include/postgres.h index 87f6bd49499..660c1791a8e 100644 --- a/src/include/postgres.h +++ b/src/include/postgres.h @@ -552,7 +552,7 @@ Float8GetDatum(float8 X) * * This enum can be used for values that want to distinguish between true, * false, and unset. -*/ + */ typedef enum pg_ternary { PG_TERNARY_FALSE = 0, diff --git a/src/include/tsearch/ts_type.h b/src/include/tsearch/ts_type.h index 847f6d3497e..f0c68d0638a 100644 --- a/src/include/tsearch/ts_type.h +++ b/src/include/tsearch/ts_type.h @@ -228,7 +228,8 @@ typedef TSQueryData *TSQuery; #define HDRSIZETQ ( VARHDRSZ + sizeof(int32) ) -/* Computes the size of header and all QueryItems. size is the number of +/* + * Computes the size of header and all QueryItems. size is the number of * QueryItems, and lenofoperand is the total length of all operands */ #define COMPUTESIZE(size, lenofoperand) ( HDRSIZETQ + (size) * sizeof(QueryItem) + (lenofoperand) ) diff --git a/src/include/utils/datetime.h b/src/include/utils/datetime.h index f77c6acd8b6..87c50eebf12 100644 --- a/src/include/utils/datetime.h +++ b/src/include/utils/datetime.h @@ -228,7 +228,8 @@ typedef struct DynamicZoneAbbrev } DynamicZoneAbbrev; -/* FMODULO() +/* + * FMODULO() * Macro to replace modf(), which is broken on some platforms. * t = input and remainder * q = integer part @@ -240,7 +241,8 @@ do { \ if ((q) != 0) (t) -= rint((q) * (u)); \ } while(0) -/* TMODULO() +/* + * TMODULO() * Like FMODULO(), but work on the timestamp datatype (now always int64). * We assume that int64 follows the C99 semantics for division (negative * quotients truncate towards zero). diff --git a/src/include/utils/elog.h b/src/include/utils/elog.h index 9c1e75c59ac..6ae376ba001 100644 --- a/src/include/utils/elog.h +++ b/src/include/utils/elog.h @@ -179,29 +179,29 @@ extern int errcode(int sqlerrcode); extern int errcode_for_file_access(void); extern int errcode_for_socket_access(void); -extern int errmsg(const char *fmt,...) pg_attribute_printf(1, 2); -extern int errmsg_internal(const char *fmt,...) pg_attribute_printf(1, 2); +extern int errmsg(const char *fmt, ...) pg_attribute_printf(1, 2); +extern int errmsg_internal(const char *fmt, ...) pg_attribute_printf(1, 2); extern int errmsg_plural(const char *fmt_singular, const char *fmt_plural, - unsigned long n,...) pg_attribute_printf(1, 4) pg_attribute_printf(2, 4); + unsigned long n, ...) pg_attribute_printf(1, 4) pg_attribute_printf(2, 4); -extern int errdetail(const char *fmt,...) pg_attribute_printf(1, 2); -extern int errdetail_internal(const char *fmt,...) pg_attribute_printf(1, 2); +extern int errdetail(const char *fmt, ...) pg_attribute_printf(1, 2); +extern int errdetail_internal(const char *fmt, ...) pg_attribute_printf(1, 2); -extern int errdetail_log(const char *fmt,...) pg_attribute_printf(1, 2); +extern int errdetail_log(const char *fmt, ...) pg_attribute_printf(1, 2); extern int errdetail_log_plural(const char *fmt_singular, const char *fmt_plural, - unsigned long n,...) pg_attribute_printf(1, 4) pg_attribute_printf(2, 4); + unsigned long n, ...) pg_attribute_printf(1, 4) pg_attribute_printf(2, 4); extern int errdetail_plural(const char *fmt_singular, const char *fmt_plural, - unsigned long n,...) pg_attribute_printf(1, 4) pg_attribute_printf(2, 4); + unsigned long n, ...) pg_attribute_printf(1, 4) pg_attribute_printf(2, 4); -extern int errhint(const char *fmt,...) pg_attribute_printf(1, 2); -extern int errhint_internal(const char *fmt,...) pg_attribute_printf(1, 2); +extern int errhint(const char *fmt, ...) pg_attribute_printf(1, 2); +extern int errhint_internal(const char *fmt, ...) pg_attribute_printf(1, 2); extern int errhint_plural(const char *fmt_singular, const char *fmt_plural, - unsigned long n,...) pg_attribute_printf(1, 4) pg_attribute_printf(2, 4); + unsigned long n, ...) pg_attribute_printf(1, 4) pg_attribute_printf(2, 4); /* * errcontext() is typically called in error context callback functions, not @@ -215,7 +215,7 @@ extern int errhint_plural(const char *fmt_singular, const char *fmt_plural, extern int set_errcontext_domain(const char *domain); -extern int errcontext_msg(const char *fmt,...) pg_attribute_printf(1, 2); +extern int errcontext_msg(const char *fmt, ...) pg_attribute_printf(1, 2); extern int errhidestmt(bool hide_stmt); extern int errhidecontext(bool hide_ctx); @@ -303,7 +303,7 @@ extern void errsave_finish(struct Node *context, /* Support for constructing error strings separately from ereport() calls */ extern void pre_format_elog_string(int errnumber, const char *domain); -extern char *format_elog_string(const char *fmt,...) pg_attribute_printf(1, 2); +extern char *format_elog_string(const char *fmt, ...) pg_attribute_printf(1, 2); /* Support for attaching context information to error reports */ @@ -529,7 +529,7 @@ extern void write_jsonlog(ErrorData *edata); * not available). Used before ereport/elog can be used * safely (memory context, GUC load etc) */ -extern void write_stderr(const char *fmt,...) pg_attribute_printf(1, 2); +extern void write_stderr(const char *fmt, ...) pg_attribute_printf(1, 2); extern void vwrite_stderr(const char *fmt, va_list ap) pg_attribute_printf(1, 0); #endif /* ELOG_H */ diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h index afca0107a2b..0e934158b60 100644 --- a/src/include/utils/palloc.h +++ b/src/include/utils/palloc.h @@ -161,7 +161,7 @@ extern char *pnstrdup(const char *in, Size len); extern char *pchomp(const char *in); /* sprintf into a palloc'd buffer --- these are in psprintf.c */ -extern char *psprintf(const char *fmt,...) pg_attribute_printf(1, 2); +extern char *psprintf(const char *fmt, ...) pg_attribute_printf(1, 2); extern size_t pvsnprintf(char *buf, size_t len, const char *fmt, va_list args) pg_attribute_printf(3, 0); #endif /* PALLOC_H */ diff --git a/src/include/utils/tuplestore.h b/src/include/utils/tuplestore.h index f638b96e156..aaacd281874 100644 --- a/src/include/utils/tuplestore.h +++ b/src/include/utils/tuplestore.h @@ -34,7 +34,8 @@ #include "executor/tuptable.h" -/* Tuplestorestate is an opaque type whose details are not known outside +/* + * Tuplestorestate is an opaque type whose details are not known outside * tuplestore.c. */ typedef struct Tuplestorestate Tuplestorestate; diff --git a/src/interfaces/ecpg/compatlib/informix.c b/src/interfaces/ecpg/compatlib/informix.c index ca11a81f1bc..6faa1dced88 100644 --- a/src/interfaces/ecpg/compatlib/informix.c +++ b/src/interfaces/ecpg/compatlib/informix.c @@ -520,11 +520,11 @@ rdatestr(date d, char *str) } /* -* -* the input for this function is mmddyyyy and any non-numeric -* character can be used as a separator -* -*/ + * + * the input for this function is mmddyyyy and any non-numeric + * character can be used as a separator + * + */ int rstrdate(const char *str, date * d) { diff --git a/src/interfaces/ecpg/ecpglib/descriptor.c b/src/interfaces/ecpg/ecpglib/descriptor.c index 1ad5f2d88cc..4e816879617 100644 --- a/src/interfaces/ecpg/ecpglib/descriptor.c +++ b/src/interfaces/ecpg/ecpglib/descriptor.c @@ -1,4 +1,5 @@ -/* dynamic SQL support routines +/* + * dynamic SQL support routines * * src/interfaces/ecpg/ecpglib/descriptor.c */ @@ -231,7 +232,7 @@ get_char_item(int lineno, void *var, enum ECPGttype vartype, char *value, int va } bool -ECPGget_desc(int lineno, const char *desc_name, int index,...) +ECPGget_desc(int lineno, const char *desc_name, int index, ...) { va_list args; PGresult *ECPGresult; @@ -618,7 +619,7 @@ set_desc_attr(struct descriptor_item *desc_item, struct variable *var, bool -ECPGset_desc(int lineno, const char *desc_name, int index,...) +ECPGset_desc(int lineno, const char *desc_name, int index, ...) { va_list args; struct descriptor *desc; @@ -860,7 +861,7 @@ ecpg_find_desc(int line, const char *name) } bool -ECPGdescribe(int line, int compat, bool input, const char *connection_name, const char *stmt_name,...) +ECPGdescribe(int line, int compat, bool input, const char *connection_name, const char *stmt_name, ...) { bool ret = false; struct connection *con; diff --git a/src/interfaces/ecpg/ecpglib/ecpglib_extern.h b/src/interfaces/ecpg/ecpglib/ecpglib_extern.h index c92f0aa1081..0b8cea6196d 100644 --- a/src/interfaces/ecpg/ecpglib/ecpglib_extern.h +++ b/src/interfaces/ecpg/ecpglib/ecpglib_extern.h @@ -214,7 +214,7 @@ void ecpg_raise(int line, int code, const char *sqlstate, const char *str); void ecpg_raise_backend(int line, PGresult *result, PGconn *conn, int compat); char *ecpg_prepared(const char *name, struct connection *con); bool ecpg_deallocate_all_conn(int lineno, enum COMPAT_MODE c, struct connection *con); -void ecpg_log(const char *format,...) pg_attribute_printf(1, 2); +void ecpg_log(const char *format, ...) pg_attribute_printf(1, 2); bool ecpg_auto_prepare(int lineno, const char *connection_name, const int compat, char **name, const char *query); bool ecpg_register_prepared_stmt(struct statement *stmt); @@ -239,8 +239,10 @@ extern char *ecpg_gettext(const char *msgid) pg_attribute_format_arg(1); #define ecpg_gettext(x) (x) #endif -/* SQLSTATE values generated or processed by ecpglib (intentionally - * not exported -- users should refer to the codes directly) */ +/* + * SQLSTATE values generated or processed by ecpglib (intentionally + * not exported -- users should refer to the codes directly) + */ #define ECPG_SQLSTATE_NO_DATA "02000" #define ECPG_SQLSTATE_USING_CLAUSE_DOES_NOT_MATCH_PARAMETERS "07001" diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c index ba41732dec6..02380dafd9d 100644 --- a/src/interfaces/ecpg/ecpglib/execute.c +++ b/src/interfaces/ecpg/ecpglib/execute.c @@ -5,13 +5,16 @@ * All the tedious messing around with tuples is supposed to be hidden * by this function. */ -/* Author: Linus Tolke - (actually most if the code is "borrowed" from the distribution and just - slightly modified) +/* + * Author: Linus Tolke + * (actually most if the code is "borrowed" from the distribution and just + * slightly modified) */ -/* Taken over as part of PostgreSQL by Michael Meskes - on Feb. 5th, 1998 */ +/* + * Taken over as part of PostgreSQL by Michael Meskes + * on Feb. 5th, 1998 + */ #define POSTGRES_ECPG_INTERNAL #include "postgres_fe.h" @@ -2289,7 +2292,7 @@ fail: * The input/output parameters are passed as variable-length argument list. */ bool -ECPGdo(const int lineno, const int compat, const int force_indicator, const char *connection_name, const bool questionmarks, const int st, const char *query,...) +ECPGdo(const int lineno, const int compat, const int force_indicator, const char *connection_name, const bool questionmarks, const int st, const char *query, ...) { va_list args; bool ret; diff --git a/src/interfaces/ecpg/ecpglib/misc.c b/src/interfaces/ecpg/ecpglib/misc.c index 40ea174ae9f..354a2e731fc 100644 --- a/src/interfaces/ecpg/ecpglib/misc.c +++ b/src/interfaces/ecpg/ecpglib/misc.c @@ -229,7 +229,7 @@ ECPGdebug(int n, FILE *dbgs) } void -ecpg_log(const char *format,...) +ecpg_log(const char *format, ...) { va_list ap; const char *intl_format; diff --git a/src/interfaces/ecpg/include/ecpgerrno.h b/src/interfaces/ecpg/include/ecpgerrno.h index c4bc526463d..6928d44ee99 100644 --- a/src/interfaces/ecpg/include/ecpgerrno.h +++ b/src/interfaces/ecpg/include/ecpgerrno.h @@ -9,7 +9,8 @@ #define ECPG_NO_ERROR 0 #define ECPG_NOT_FOUND 100 -/* system error codes returned by ecpglib get the correct number, +/* + * system error codes returned by ecpglib get the correct number, * but are made negative */ #define ECPG_OUT_OF_MEMORY -ENOMEM @@ -52,8 +53,10 @@ #define ECPG_DUPLICATE_KEY -403 #define ECPG_SUBSELECT_NOT_ONE -404 -/* for compatibility we define some different error codes for the same error - * if adding a new one make sure to not double define it */ +/* + * for compatibility we define some different error codes for the same error + * if adding a new one make sure to not double define it + */ #define ECPG_INFORMIX_DUPLICATE_KEY -239 #define ECPG_INFORMIX_SUBSELECT_NOT_ONE -284 diff --git a/src/interfaces/ecpg/include/ecpglib.h b/src/interfaces/ecpg/include/ecpglib.h index dbf3cc3a0c2..1d971d5893d 100644 --- a/src/interfaces/ecpg/include/ecpglib.h +++ b/src/interfaces/ecpg/include/ecpglib.h @@ -29,7 +29,7 @@ bool ECPGconnect(int lineno, int c, const char *name, const char *user, const char *passwd, const char *connection_name, int autocommit); bool ECPGdo(const int lineno, const int compat, const int force_indicator, const char *connection_name, const bool questionmarks, - const int st, const char *query,...); + const int st, const char *query, ...); bool ECPGtrans(int lineno, const char *connection_name, const char *transaction); bool ECPGdisconnect(int lineno, const char *connection_name); bool ECPGprepare(int lineno, const char *connection_name, const bool questionmarks, @@ -55,14 +55,14 @@ bool ECPGdo_descriptor(int line, const char *connection, bool ECPGdeallocate_desc(int line, const char *name); bool ECPGallocate_desc(int line, const char *name); bool ECPGget_desc_header(int lineno, const char *desc_name, int *count); -bool ECPGget_desc(int lineno, const char *desc_name, int index,...); +bool ECPGget_desc(int lineno, const char *desc_name, int index, ...); bool ECPGset_desc_header(int lineno, const char *desc_name, int count); -bool ECPGset_desc(int lineno, const char *desc_name, int index,...); +bool ECPGset_desc(int lineno, const char *desc_name, int index, ...); void ECPGset_noind_null(enum ECPGttype type, void *ptr); bool ECPGis_noind_null(enum ECPGttype type, const void *ptr); bool ECPGdescribe(int line, int compat, bool input, - const char *connection_name, const char *stmt_name,...); + const char *connection_name, const char *stmt_name, ...); void ECPGset_var(int number, void *pointer, int lineno); void *ECPGget_var(int number); diff --git a/src/interfaces/ecpg/pgtypeslib/dt.h b/src/interfaces/ecpg/pgtypeslib/dt.h index 00a45799d55..83e6cad167d 100644 --- a/src/interfaces/ecpg/pgtypeslib/dt.h +++ b/src/interfaces/ecpg/pgtypeslib/dt.h @@ -208,7 +208,8 @@ typedef struct } datetkn; -/* FMODULO() +/* + * FMODULO() * Macro to replace modf(), which is broken on some platforms. * t = input and remainder * q = integer part @@ -220,7 +221,8 @@ do { \ if ((q) != 0) (t) -= rint((q) * (u)); \ } while(0) -/* TMODULO() +/* + * TMODULO() * Like FMODULO(), but work on the timestamp datatype (now always int64). * We assume that int64 follows the C99 semantics for division (negative * quotients truncate towards zero). diff --git a/src/interfaces/ecpg/pgtypeslib/dt_common.c b/src/interfaces/ecpg/pgtypeslib/dt_common.c index c4119ab7932..3ed5ad06c06 100644 --- a/src/interfaces/ecpg/pgtypeslib/dt_common.c +++ b/src/interfaces/ecpg/pgtypeslib/dt_common.c @@ -528,7 +528,8 @@ datebsearch(const char *key, const datetkn *base, unsigned int nel) return NULL; } -/* DecodeUnits() +/* + * DecodeUnits() * Decode text string using lookup table. * This routine supports time interval decoding. */ @@ -626,7 +627,8 @@ j2date(int jd, int *year, int *month, int *day) *month = (quad + 10) % 12 + 1; } /* j2date() */ -/* DecodeSpecial() +/* + * DecodeSpecial() * Decode text string using lookup table. * Implement a cache lookup since it is likely that dates * will be related in format. @@ -662,7 +664,8 @@ DecodeSpecial(int field, char *lowtoken, int *val) return type; } /* DecodeSpecial() */ -/* EncodeDateOnly() +/* + * EncodeDateOnly() * Encode date as local time. */ void @@ -731,7 +734,8 @@ TrimTrailingZeros(char *str) } } -/* EncodeDateTime() +/* + * EncodeDateTime() * Encode date and time interpreted as local time. * * tm and fsec are the value to encode, print_tz determines whether to include @@ -1080,7 +1084,8 @@ dt2time(double jd, int *hour, int *min, int *sec, fsec_t *fsec) -/* DecodeNumberField() +/* + * DecodeNumberField() * Interpret numeric string as a concatenated date or time field. * Use the context of previously decoded fields to help with * the interpretation. @@ -1192,7 +1197,8 @@ DecodeNumberField(int len, char *str, int fmask, } /* DecodeNumberField() */ -/* DecodeNumber() +/* + * DecodeNumber() * Interpret plain numeric field as a date value in context. */ static int @@ -1300,7 +1306,8 @@ DecodeNumber(int flen, char *str, int fmask, return 0; } /* DecodeNumber() */ -/* DecodeDate() +/* + * DecodeDate() * Decode date string which includes delimiters. * Insist on a complete set of fields. */ @@ -1428,7 +1435,8 @@ DecodeDate(char *str, int fmask, int *tmask, struct tm *tm, bool EuroDates) } /* DecodeDate() */ -/* DecodeTime() +/* + * DecodeTime() * Decode time string which includes delimiters. * Only check the lower limit on hours, since this same code * can be used to represent time spans. @@ -1492,7 +1500,8 @@ DecodeTime(char *str, int *tmask, struct tm *tm, fsec_t *fsec) return 0; } /* DecodeTime() */ -/* DecodeTimezone() +/* + * DecodeTimezone() * Interpret string as a numeric timezone. * * Note: we allow timezone offsets up to 13:59. There are places that @@ -1537,7 +1546,8 @@ DecodeTimezone(char *str, int *tzp) } /* DecodeTimezone() */ -/* DecodePosixTimezone() +/* + * DecodePosixTimezone() * Interpret string as a POSIX-compatible timezone: * PST-hh:mm * PST+h @@ -1578,7 +1588,8 @@ DecodePosixTimezone(char *str, int *tzp) return 0; } /* DecodePosixTimezone() */ -/* ParseDateTime() +/* + * ParseDateTime() * Break string into tokens based on a date/time context. * Several field types are assigned: * DTK_NUMBER - digits and (possibly) a decimal point @@ -1758,7 +1769,8 @@ ParseDateTime(char *timestr, char *lowstr, } /* ParseDateTime() */ -/* DecodeDateTime() +/* + * DecodeDateTime() * Interpret previously parsed fields for general date and time. * Return 0 if full date, 1 if only time, and -1 if problems. * External format(s): @@ -2345,10 +2357,12 @@ DecodeDateTime(char **field, int *ftype, int nf, return 0; } /* DecodeDateTime() */ -/* Function works as follows: +/* + * Function works as follows: * * - * */ + * + */ static char * find_end_token(char *str, char *fmt) diff --git a/src/interfaces/ecpg/pgtypeslib/interval.c b/src/interfaces/ecpg/pgtypeslib/interval.c index 463455398f1..a61d66ab2c9 100644 --- a/src/interfaces/ecpg/pgtypeslib/interval.c +++ b/src/interfaces/ecpg/pgtypeslib/interval.c @@ -12,7 +12,8 @@ #include "pgtypes_interval.h" #include "pgtypeslib_extern.h" -/* copy&pasted from .../src/backend/utils/adt/datetime.c +/* + * copy&pasted from .../src/backend/utils/adt/datetime.c * and changed struct pg_tm to struct tm */ static void @@ -30,7 +31,8 @@ AdjustFractSeconds(double frac, struct /* pg_ */ tm *tm, fsec_t *fsec, int scale } -/* copy&pasted from .../src/backend/utils/adt/datetime.c +/* + * copy&pasted from .../src/backend/utils/adt/datetime.c * and changed struct pg_tm to struct tm */ static void @@ -83,7 +85,8 @@ ISO8601IntegerWidth(const char *fieldstart) } -/* copy&pasted from .../src/backend/utils/adt/datetime.c +/* + * copy&pasted from .../src/backend/utils/adt/datetime.c * and changed struct pg_tm to struct tm */ static inline void @@ -98,7 +101,8 @@ ClearPgTm(struct /* pg_ */ tm *tm, fsec_t *fsec) *fsec = 0; } -/* copy&pasted from .../src/backend/utils/adt/datetime.c +/* + * copy&pasted from .../src/backend/utils/adt/datetime.c * * * changed struct pg_tm to struct tm * @@ -304,7 +308,8 @@ DecodeISO8601Interval(char *str, -/* copy&pasted from .../src/backend/utils/adt/datetime.c +/* + * copy&pasted from .../src/backend/utils/adt/datetime.c * with 3 exceptions * * * changed struct pg_tm to struct tm @@ -746,7 +751,8 @@ AppendSeconds(char *cp, int sec, fsec_t fsec, int precision, bool fillzeros) } -/* copy&pasted from .../src/backend/utils/adt/datetime.c +/* + * copy&pasted from .../src/backend/utils/adt/datetime.c * * Change pg_tm to tm */ @@ -931,7 +937,8 @@ EncodeInterval(struct /* pg_ */ tm *tm, fsec_t fsec, int style, char *str) } -/* interval2tm() +/* + * interval2tm() * Convert an interval data type to a tm structure. */ static int diff --git a/src/interfaces/ecpg/pgtypeslib/pgtypeslib_extern.h b/src/interfaces/ecpg/pgtypeslib/pgtypeslib_extern.h index 8e980966b0e..ce2f14fab76 100644 --- a/src/interfaces/ecpg/pgtypeslib/pgtypeslib_extern.h +++ b/src/interfaces/ecpg/pgtypeslib/pgtypeslib_extern.h @@ -5,8 +5,10 @@ #include "pgtypes_error.h" -/* These are the constants that decide which printf() format we'll use in - * order to get a string representation of the value */ +/* + * These are the constants that decide which printf() format we'll use in + * order to get a string representation of the value + */ #define PGTYPES_TYPE_NOTHING 0 #define PGTYPES_TYPE_STRING_MALLOCED 1 #define PGTYPES_TYPE_STRING_CONSTANT 2 diff --git a/src/interfaces/ecpg/pgtypeslib/timestamp.c b/src/interfaces/ecpg/pgtypeslib/timestamp.c index 9bf1b914553..46cd20974eb 100644 --- a/src/interfaces/ecpg/pgtypeslib/timestamp.c +++ b/src/interfaces/ecpg/pgtypeslib/timestamp.c @@ -26,7 +26,8 @@ dt2local(timestamp dt, int tz) return dt; } /* dt2local() */ -/* tm2timestamp() +/* + * tm2timestamp() * Convert a tm structure to a timestamp data type. * Note that year is _not_ 1900-based, but is an explicit full value. * Also, month is one-based, _not_ zero-based. @@ -73,7 +74,8 @@ SetEpochTimestamp(void) return dt; } /* SetEpochTimestamp() */ -/* timestamp2tm() +/* + * timestamp2tm() * Convert timestamp data type to POSIX time structure. * Note that year is _not_ 1900-based, but is an explicit full value. * Also, month is one-based, _not_ zero-based. @@ -180,9 +182,11 @@ timestamp2tm(timestamp dt, int *tzp, struct tm *tm, fsec_t *fsec, const char **t return 0; } /* timestamp2tm() */ -/* EncodeSpecialTimestamp() +/* + * EncodeSpecialTimestamp() * * Convert reserved timestamp data type to string. - * */ + * + */ static void EncodeSpecialTimestamp(timestamp dt, char *str) { @@ -841,14 +845,14 @@ PGTYPEStimestamp_defmt_asc(const char *str, const char *fmt, timestamp * d) } /* -* add an interval to a time stamp -* -* *tout = tin + span -* -* returns 0 if successful -* returns -1 if it fails -* -*/ + * add an interval to a time stamp + * + * *tout = tin + span + * + * returns 0 if successful + * returns -1 if it fails + * + */ int PGTYPEStimestamp_add_interval(timestamp * tin, interval * span, timestamp * tout) @@ -896,14 +900,14 @@ PGTYPEStimestamp_add_interval(timestamp * tin, interval * span, timestamp * tout /* -* subtract an interval from a time stamp -* -* *tout = tin - span -* -* returns 0 if successful -* returns -1 if it fails -* -*/ + * subtract an interval from a time stamp + * + * *tout = tin - span + * + * returns 0 if successful + * returns -1 if it fails + * + */ int PGTYPEStimestamp_sub_interval(timestamp * tin, interval * span, timestamp * tout) diff --git a/src/interfaces/ecpg/preproc/descriptor.c b/src/interfaces/ecpg/preproc/descriptor.c index e8c7016bdc1..fb3ac99cd0c 100644 --- a/src/interfaces/ecpg/preproc/descriptor.c +++ b/src/interfaces/ecpg/preproc/descriptor.c @@ -320,11 +320,12 @@ output_set_descr(const char *desc_name, const char *index) whenever_action(2 | 1); } -/* I consider dynamic allocation overkill since at most two descriptor - variables are possible per statement. (input and output descriptor) - And descriptors are no normal variables, so they don't belong into - the variable list. -*/ +/* + * I consider dynamic allocation overkill since at most two descriptor + * variables are possible per statement. (input and output descriptor) + * And descriptors are no normal variables, so they don't belong into + * the variable list. + */ #define MAX_DESCRIPTOR_NAMELEN 128 struct variable * diff --git a/src/interfaces/ecpg/preproc/preproc_extern.h b/src/interfaces/ecpg/preproc/preproc_extern.h index 2c89e30621e..c61f054873b 100644 --- a/src/interfaces/ecpg/preproc/preproc_extern.h +++ b/src/interfaces/ecpg/preproc/preproc_extern.h @@ -85,11 +85,11 @@ extern void *loc_alloc(size_t size); extern char *loc_strdup(const char *string); extern void reclaim_local_storage(void); extern char *cat2_str(const char *str1, const char *str2); -extern char *cat_str(int count,...); +extern char *cat_str(int count, ...); extern char *make2_str(const char *str1, const char *str2); extern char *make3_str(const char *str1, const char *str2, const char *str3); -extern void mmerror(int error_code, enum errortype type, const char *error,...) pg_attribute_printf(3, 4); -pg_noreturn extern void mmfatal(int error_code, const char *error,...) pg_attribute_printf(2, 3); +extern void mmerror(int error_code, enum errortype type, const char *error, ...) pg_attribute_printf(3, 4); +pg_noreturn extern void mmfatal(int error_code, const char *error, ...) pg_attribute_printf(2, 3); extern void output_get_descr_header(const char *desc_name); extern void output_get_descr(const char *desc_name, const char *index); extern void output_set_descr_header(const char *desc_name); diff --git a/src/interfaces/ecpg/preproc/type.c b/src/interfaces/ecpg/preproc/type.c index 9f6dacd2aea..eec87c9cae1 100644 --- a/src/interfaces/ecpg/preproc/type.c +++ b/src/interfaces/ecpg/preproc/type.c @@ -194,19 +194,20 @@ get_type(enum ECPGttype type) return NULL; } -/* Dump a type. - The type is dumped as: - type-tag - enum ECPGttype - reference-to-variable - char * - size - long size of this field (if varchar) - arrsize - long number of elements in the arr - offset - offset to the next element - Where: - type-tag is one of the simple types or varchar. - reference-to-variable can be a reference to a struct element. - arrsize is the size of the array in case of array fetches. Otherwise 0. - size is the maxsize in case it is a varchar. Otherwise it is the size of - the variable (required to do array fetches of structs). +/* + * Dump a type. + * The type is dumped as: + * type-tag - enum ECPGttype + * reference-to-variable - char * + * size - long size of this field (if varchar) + * arrsize - long number of elements in the arr + * offset - offset to the next element + * Where: + * type-tag is one of the simple types or varchar. + * reference-to-variable can be a reference to a struct element. + * arrsize is the size of the array in case of array fetches. Otherwise 0. + * size is the maxsize in case it is a varchar. Otherwise it is the size of + * the variable (required to do array fetches of structs). */ static void ECPGdump_a_simple(FILE *o, const char *name, enum ECPGttype type, char *varcharsize, @@ -382,8 +383,10 @@ ECPGdump_a_type(FILE *o, const char *name, struct ECPGtype *type, const int brac } -/* If size is NULL, then the offset is 0, if not use size as a - string, it represents the offset needed if we are in an array of structs. */ +/* + * If size is NULL, then the offset is 0, if not use size as a + * string, it represents the offset needed if we are in an array of structs. + */ static void ECPGdump_a_simple(FILE *o, const char *name, enum ECPGttype type, char *varcharsize, diff --git a/src/interfaces/ecpg/preproc/type.h b/src/interfaces/ecpg/preproc/type.h index 3d99e1703de..7affe60099d 100644 --- a/src/interfaces/ecpg/preproc/type.h +++ b/src/interfaces/ecpg/preproc/type.h @@ -47,15 +47,16 @@ struct ECPGstruct_member *ECPGstruct_member_dup(struct ECPGstruct_member *rm); void ECPGfree_struct_member(struct ECPGstruct_member *rm); void ECPGfree_type(struct ECPGtype *type); -/* Dump a type. - The type is dumped as: - type-tag reference-to-variable arrsize size - Where: - type-tag is one of the simple types or varchar. - reference-to-variable can be a reference to a struct element. - arrsize is the size of the array in case of array fetches. Otherwise 0. - size is the maxsize in case it is a varchar. Otherwise it is the size of - the variable (required to do array fetches of structs). +/* + * Dump a type. + * The type is dumped as: + * type-tag reference-to-variable arrsize size + * Where: + * type-tag is one of the simple types or varchar. + * reference-to-variable can be a reference to a struct element. + * arrsize is the size of the array in case of array fetches. Otherwise 0. + * size is the maxsize in case it is a varchar. Otherwise it is the size of + * the variable (required to do array fetches of structs). */ void ECPGdump_a_type(FILE *o, const char *name, struct ECPGtype *type, const int brace_level, const char *ind_name, diff --git a/src/interfaces/ecpg/preproc/util.c b/src/interfaces/ecpg/preproc/util.c index f177df32488..ba1f049a87d 100644 --- a/src/interfaces/ecpg/preproc/util.c +++ b/src/interfaces/ecpg/preproc/util.c @@ -47,7 +47,7 @@ vmmerror(int error_code, enum errortype type, const char *error, va_list ap) /* Report an error or warning */ void -mmerror(int error_code, enum errortype type, const char *error,...) +mmerror(int error_code, enum errortype type, const char *error, ...) { va_list ap; @@ -58,7 +58,7 @@ mmerror(int error_code, enum errortype type, const char *error,...) /* Report an error and abandon execution */ void -mmfatal(int error_code, const char *error,...) +mmfatal(int error_code, const char *error, ...) { va_list ap; @@ -217,7 +217,7 @@ cat2_str(const char *str1, const char *str2) * Concatenate N strings, inserting spaces between them unless they are empty */ char * -cat_str(int count,...) +cat_str(int count, ...) { va_list args; int i; diff --git a/src/interfaces/ecpg/preproc/variable.c b/src/interfaces/ecpg/preproc/variable.c index ad5201a222f..abfd009c323 100644 --- a/src/interfaces/ecpg/preproc/variable.c +++ b/src/interfaces/ecpg/preproc/variable.c @@ -447,9 +447,11 @@ reset_variables(void) argsresult = NULL; } -/* Insert a new variable into our request list. +/* + * Insert a new variable into our request list. * Note: The list is dumped from the end, - * so we have to add new entries at the beginning */ + * so we have to add new entries at the beginning + */ void add_variable_to_head(struct arguments **list, struct variable *var, struct variable *ind) { @@ -506,9 +508,10 @@ remove_variable_from_list(struct arguments **list, struct variable *var) } } -/* Dump out a list of all the variable on this list. - This is a recursive function that works from the end of the list and - deletes the list as we go on. +/* + * Dump out a list of all the variable on this list. + * This is a recursive function that works from the end of the list and + * deletes the list as we go on. */ void dump_variables(struct arguments *list, int mode) diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c index 0dfd892df11..7b8edacbfde 100644 --- a/src/interfaces/libpq/fe-exec.c +++ b/src/interfaces/libpq/fe-exec.c @@ -941,7 +941,7 @@ pqPrepareAsyncResult(PGconn *conn) * a trailing newline, and should not be more than one line). */ void -pqInternalNotice(const PGNoticeHooks *hooks, const char *fmt,...) +pqInternalNotice(const PGNoticeHooks *hooks, const char *fmt, ...) { char msgBuf[1024]; va_list args; @@ -3911,7 +3911,8 @@ PQgetvalue(const PGresult *res, int tup_num, int field_num) return res->tuples[tup_num][field_num].value; } -/* PQgetlength: +/* + * PQgetlength: * returns the actual length of a field value in bytes. */ int @@ -3925,7 +3926,8 @@ PQgetlength(const PGresult *res, int tup_num, int field_num) return 0; } -/* PQgetisnull: +/* + * PQgetisnull: * returns the null status of a field value. */ int @@ -3939,7 +3941,8 @@ PQgetisnull(const PGresult *res, int tup_num, int field_num) return 0; } -/* PQnparams: +/* + * PQnparams: * returns the number of input parameters of a prepared statement. */ int @@ -3950,7 +3953,8 @@ PQnparams(const PGresult *res) return res->numParameters; } -/* PQparamtype: +/* + * PQparamtype: * returns type Oid of the specified statement parameter. */ Oid @@ -3965,7 +3969,8 @@ PQparamtype(const PGresult *res, int param_num) } -/* PQsetnonblocking: +/* + * PQsetnonblocking: * sets the PGconn's database connection non-blocking if the arg is true * or makes it blocking if the arg is false, this will not protect * you from PQexec(), you'll only be safe when using the non-blocking API. diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c index 13775cfb8b9..325a485ef53 100644 --- a/src/interfaces/libpq/fe-misc.c +++ b/src/interfaces/libpq/fe-misc.c @@ -1372,7 +1372,7 @@ libpq_ngettext(const char *msgid, const char *msgid_plural, unsigned long n) * newline. */ void -libpq_append_error(PQExpBuffer errorMessage, const char *fmt,...) +libpq_append_error(PQExpBuffer errorMessage, const char *fmt, ...) { int save_errno = errno; bool done; @@ -1401,7 +1401,7 @@ libpq_append_error(PQExpBuffer errorMessage, const char *fmt,...) * format should not end with a newline. */ void -libpq_append_conn_error(PGconn *conn, const char *fmt,...) +libpq_append_conn_error(PGconn *conn, const char *fmt, ...) { int save_errno = errno; bool done; diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h index f06e7a972c3..8ecb9b4a4c7 100644 --- a/src/interfaces/libpq/libpq-fe.h +++ b/src/interfaces/libpq/libpq-fe.h @@ -204,30 +204,35 @@ typedef enum PQAUTHDATA_OAUTH_BEARER_TOKEN_V2, /* newest API for OAuth Bearer tokens */ } PGauthData; -/* PGconn encapsulates a connection to the backend. +/* + * PGconn encapsulates a connection to the backend. * The contents of this struct are not supposed to be known to applications. */ typedef struct pg_conn PGconn; -/* PGcancelConn encapsulates a cancel connection to the backend. +/* + * PGcancelConn encapsulates a cancel connection to the backend. * The contents of this struct are not supposed to be known to applications. */ typedef struct pg_cancel_conn PGcancelConn; -/* PGresult encapsulates the result of a query (or more precisely, of a single +/* + * PGresult encapsulates the result of a query (or more precisely, of a single * SQL command --- a query string given to PQsendQuery can contain multiple * commands and thus return multiple PGresult objects). * The contents of this struct are not supposed to be known to applications. */ typedef struct pg_result PGresult; -/* PGcancel encapsulates the information needed to cancel a running +/* + * PGcancel encapsulates the information needed to cancel a running * query on an existing connection. * The contents of this struct are not supposed to be known to applications. */ typedef struct pg_cancel PGcancel; -/* PGnotify represents the occurrence of a NOTIFY message. +/* + * PGnotify represents the occurrence of a NOTIFY message. * Ideally this would be an opaque typedef, but it's so simple that it's * unlikely to change. * NOTE: in Postgres 6.4 and later, the be_pid is the notifying backend's, @@ -435,8 +440,10 @@ extern void *PQsslStruct(PGconn *conn, const char *struct_name); extern const char *PQsslAttribute(PGconn *conn, const char *attribute_name); extern const char *const *PQsslAttributeNames(PGconn *conn); -/* Get the OpenSSL structure associated with a connection. Returns NULL for - * unencrypted connections or if any other TLS library is in use. */ +/* + * Get the OpenSSL structure associated with a connection. Returns NULL for + * unencrypted connections or if any other TLS library is in use. + */ extern void *PQgetssl(PGconn *conn); /* Tell libpq whether it needs to initialize OpenSSL */ diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h index cb038bf0057..461b39620c3 100644 --- a/src/interfaces/libpq/libpq-int.h +++ b/src/interfaces/libpq/libpq-int.h @@ -90,7 +90,8 @@ typedef struct * hence there is no need for multiple descriptor sets. */ -/* Subsidiary-storage management structure for PGresult. +/* + * Subsidiary-storage management structure for PGresult. * See space management routines in fe-exec.c for details. * Note that space[k] refers to the k'th byte starting from the physical * head of the block --- it's a union, not a struct! @@ -292,7 +293,8 @@ typedef struct pgLobjfuncs Oid fn_lo_write; /* OID of backend function LOwrite */ } PGlobjfuncs; -/* PGdataValue represents a data field value being passed to a row processor. +/* + * PGdataValue represents a data field value being passed to a row processor. * It could be either text or binary data; text data is not zero-terminated. * A SQL NULL is represented by len < 0; then value is still valid but there * are no data bytes there. @@ -689,7 +691,8 @@ struct pg_conn }; -/* String descriptions of the ExecStatusTypes. +/* + * String descriptions of the ExecStatusTypes. * direct use of this array is deprecated; call PQresStatus() instead. */ extern char *const pgresStatus[]; @@ -753,7 +756,7 @@ extern char *pqResultStrdup(PGresult *res, const char *str); extern void pqClearAsyncResult(PGconn *conn); extern void pqSaveErrorResult(PGconn *conn); extern PGresult *pqPrepareAsyncResult(PGconn *conn); -extern void pqInternalNotice(const PGNoticeHooks *hooks, const char *fmt,...) pg_attribute_printf(2, 3); +extern void pqInternalNotice(const PGNoticeHooks *hooks, const char *fmt, ...) pg_attribute_printf(2, 3); extern void pqSaveMessageField(PGresult *res, char code, const char *value); extern int pqSaveParameterStatus(PGconn *conn, const char *name, @@ -961,8 +964,8 @@ extern char *libpq_ngettext(const char *msgid, const char *msgid_plural, unsigne */ #undef _ -extern void libpq_append_error(PQExpBuffer errorMessage, const char *fmt,...) pg_attribute_printf(2, 3); -extern void libpq_append_conn_error(PGconn *conn, const char *fmt,...) pg_attribute_printf(2, 3); +extern void libpq_append_error(PQExpBuffer errorMessage, const char *fmt, ...) pg_attribute_printf(2, 3); +extern void libpq_append_conn_error(PGconn *conn, const char *fmt, ...) pg_attribute_printf(2, 3); extern void libpq_append_grease_info(PGconn *conn); /* diff --git a/src/interfaces/libpq/pqexpbuffer.c b/src/interfaces/libpq/pqexpbuffer.c index 153ae6af6cb..7563993f6d6 100644 --- a/src/interfaces/libpq/pqexpbuffer.c +++ b/src/interfaces/libpq/pqexpbuffer.c @@ -232,7 +232,7 @@ enlargePQExpBuffer(PQExpBuffer str, size_t needed) * resetPQExpBuffer() followed by appendPQExpBuffer(). */ void -printfPQExpBuffer(PQExpBuffer str, const char *fmt,...) +printfPQExpBuffer(PQExpBuffer str, const char *fmt, ...) { int save_errno = errno; va_list args; @@ -262,7 +262,7 @@ printfPQExpBuffer(PQExpBuffer str, const char *fmt,...) * strcat. */ void -appendPQExpBuffer(PQExpBuffer str, const char *fmt,...) +appendPQExpBuffer(PQExpBuffer str, const char *fmt, ...) { int save_errno = errno; va_list args; diff --git a/src/interfaces/libpq/pqexpbuffer.h b/src/interfaces/libpq/pqexpbuffer.h index dc83f4ffe86..2741bb9e2ff 100644 --- a/src/interfaces/libpq/pqexpbuffer.h +++ b/src/interfaces/libpq/pqexpbuffer.h @@ -146,7 +146,7 @@ extern int enlargePQExpBuffer(PQExpBuffer str, size_t needed); * This is a convenience routine that does the same thing as * resetPQExpBuffer() followed by appendPQExpBuffer(). */ -extern void printfPQExpBuffer(PQExpBuffer str, const char *fmt,...) pg_attribute_printf(2, 3); +extern void printfPQExpBuffer(PQExpBuffer str, const char *fmt, ...) pg_attribute_printf(2, 3); /*------------------------ * appendPQExpBuffer @@ -155,7 +155,7 @@ extern void printfPQExpBuffer(PQExpBuffer str, const char *fmt,...) pg_attribute * to str if necessary. This is sort of like a combination of sprintf and * strcat. */ -extern void appendPQExpBuffer(PQExpBuffer str, const char *fmt,...) pg_attribute_printf(2, 3); +extern void appendPQExpBuffer(PQExpBuffer str, const char *fmt, ...) pg_attribute_printf(2, 3); /*------------------------ * appendPQExpBufferVA diff --git a/src/pl/plpython/plpy_elog.c b/src/pl/plpython/plpy_elog.c index e109888cced..7c5ddb06ea8 100644 --- a/src/pl/plpython/plpy_elog.c +++ b/src/pl/plpython/plpy_elog.c @@ -41,7 +41,7 @@ static bool set_string_attr(PyObject *obj, char *attrname, char *str); * in the context. */ void -PLy_elog_impl(int elevel, const char *fmt,...) +PLy_elog_impl(int elevel, const char *fmt, ...) { int save_errno = errno; char *volatile xmsg = NULL; @@ -487,7 +487,7 @@ get_source_line(const char *src, int lineno) /* call PyErr_SetString with a vprint interface and translation support */ void -PLy_exception_set(PyObject *exc, const char *fmt,...) +PLy_exception_set(PyObject *exc, const char *fmt, ...) { char buf[1024]; va_list ap; @@ -503,7 +503,7 @@ PLy_exception_set(PyObject *exc, const char *fmt,...) void PLy_exception_set_plural(PyObject *exc, const char *fmt_singular, const char *fmt_plural, - unsigned long n,...) + unsigned long n, ...) { char buf[1024]; va_list ap; @@ -589,7 +589,8 @@ get_string_attr(PyObject *obj, char *attrname, char **str) Py_XDECREF(val); } -/* set an object attribute to a string value, returns true when the set was +/* + * set an object attribute to a string value, returns true when the set was * successful */ static bool diff --git a/src/pl/plpython/plpy_elog.h b/src/pl/plpython/plpy_elog.h index dc65f2f6ee2..3150f9e72ca 100644 --- a/src/pl/plpython/plpy_elog.h +++ b/src/pl/plpython/plpy_elog.h @@ -34,12 +34,12 @@ extern PyObject *PLy_exc_spi_error; } while(0) #endif /* HAVE__BUILTIN_CONSTANT_P */ -extern PGDLLEXPORT void PLy_elog_impl(int elevel, const char *fmt,...) pg_attribute_printf(2, 3); +extern PGDLLEXPORT void PLy_elog_impl(int elevel, const char *fmt, ...) pg_attribute_printf(2, 3); -extern PGDLLEXPORT void PLy_exception_set(PyObject *exc, const char *fmt,...) pg_attribute_printf(2, 3); +extern PGDLLEXPORT void PLy_exception_set(PyObject *exc, const char *fmt, ...) pg_attribute_printf(2, 3); extern PGDLLEXPORT void PLy_exception_set_plural(PyObject *exc, const char *fmt_singular, const char *fmt_plural, - unsigned long n,...) pg_attribute_printf(2, 5) pg_attribute_printf(3, 5); + unsigned long n, ...) pg_attribute_printf(2, 5) pg_attribute_printf(3, 5); extern PGDLLEXPORT void PLy_exception_set_with_details(PyObject *excclass, ErrorData *edata); diff --git a/src/pl/plpython/plpy_exec.c b/src/pl/plpython/plpy_exec.c index 0117f1e77ef..de0dad1f533 100644 --- a/src/pl/plpython/plpy_exec.c +++ b/src/pl/plpython/plpy_exec.c @@ -306,7 +306,8 @@ PLy_exec_function(FunctionCallInfo fcinfo, PLyProcedure *proc) return rv; } -/* trigger subhandler +/* + * trigger subhandler * * the python function is expected to return Py_None if the tuple is * acceptable and unmodified. Otherwise it should return a PyUnicode diff --git a/src/pl/plpython/plpy_spi.c b/src/pl/plpython/plpy_spi.c index 46f2ca0f792..4ad40bf78f3 100644 --- a/src/pl/plpython/plpy_spi.c +++ b/src/pl/plpython/plpy_spi.c @@ -28,7 +28,8 @@ static PyObject *PLy_spi_execute_fetch_result(SPITupleTable *tuptable, static void PLy_spi_exception_set(PyObject *excclass, ErrorData *edata); -/* prepare(query="select * from foo") +/* + * prepare(query="select * from foo") * prepare(query="select * from foo where bar = $1", params=["text"]) * prepare(query="select * from foo where bar = $1", params=["text"], limit=5) */ @@ -143,7 +144,8 @@ PLy_spi_prepare(PyObject *self, PyObject *args) return (PyObject *) plan; } -/* execute(query="select * from foo", limit=5) +/* + * execute(query="select * from foo", limit=5) * execute(plan=plan, values=(foo, bar), limit=5) */ PyObject * diff --git a/src/pl/plpython/plpython_system.h b/src/pl/plpython/plpython_system.h index d581518ef0b..1d5c525b020 100644 --- a/src/pl/plpython/plpython_system.h +++ b/src/pl/plpython/plpython_system.h @@ -34,8 +34,10 @@ #define HAVE_SNPRINTF 1 #if defined(_MSC_VER) && defined(_DEBUG) -/* Python uses #pragma to bring in a non-default libpython on VC++ if - * _DEBUG is defined */ +/* + * Python uses #pragma to bring in a non-default libpython on VC++ if + * _DEBUG is defined + */ #undef _DEBUG /* Also hide away errcode, since we load Python.h before postgres.h */ #define errcode __msvc_errcode diff --git a/src/port/dirmod.c b/src/port/dirmod.c index 467b50d6f09..f1f33023a3b 100644 --- a/src/port/dirmod.c +++ b/src/port/dirmod.c @@ -99,7 +99,7 @@ pgrename(const char *from, const char *to) * Check if _pglstat64()'s reason for failure was STATUS_DELETE_PENDING. * This doesn't apply to Cygwin, which has its own lstat() that would report * the case as EACCES. -*/ + */ static bool lstat_error_was_status_delete_pending(void) { diff --git a/src/port/inet_aton.c b/src/port/inet_aton.c index adaf18adb39..367fccde422 100644 --- a/src/port/inet_aton.c +++ b/src/port/inet_aton.c @@ -1,4 +1,5 @@ -/* src/port/inet_aton.c +/* + * src/port/inet_aton.c * * This inet_aton() function was taken from the GNU C library and * incorporated into Postgres for those systems which do not have this @@ -36,7 +37,8 @@ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. */ + * SUCH DAMAGE. + */ #include "c.h" diff --git a/src/port/open.c b/src/port/open.c index 2cd26060aa3..4be08b2cf13 100644 --- a/src/port/open.c +++ b/src/port/open.c @@ -165,7 +165,7 @@ pgwin32_open_handle(const char *fileName, int fileFlags, bool backup_semantics) } int -pgwin32_open(const char *fileName, int fileFlags,...) +pgwin32_open(const char *fileName, int fileFlags, ...) { HANDLE h; int fd; diff --git a/src/port/pqsignal.c b/src/port/pqsignal.c index dd43f9eb262..a8a1cd2074c 100644 --- a/src/port/pqsignal.c +++ b/src/port/pqsignal.c @@ -92,7 +92,7 @@ static volatile pqsigfunc pqsignal_handlers[PG_NSIG]; */ #if defined(USE_SIGACTION) && defined(USE_SIGINFO) static void -wrapper_handler(int postgres_signal_arg, siginfo_t * info, void *context) +wrapper_handler(int postgres_signal_arg, siginfo_t *info, void *context) #else /* no USE_SIGINFO */ static void wrapper_handler(int postgres_signal_arg) diff --git a/src/port/snprintf.c b/src/port/snprintf.c index 5deee44d3a2..2189ebfe399 100644 --- a/src/port/snprintf.c +++ b/src/port/snprintf.c @@ -199,7 +199,7 @@ pg_vsnprintf(char *str, size_t count, const char *fmt, va_list args) } int -pg_snprintf(char *str, size_t count, const char *fmt,...) +pg_snprintf(char *str, size_t count, const char *fmt, ...) { int len; va_list args; @@ -227,7 +227,7 @@ pg_vsprintf(char *str, const char *fmt, va_list args) } int -pg_sprintf(char *str, const char *fmt,...) +pg_sprintf(char *str, const char *fmt, ...) { int len; va_list args; @@ -261,7 +261,7 @@ pg_vfprintf(FILE *stream, const char *fmt, va_list args) } int -pg_fprintf(FILE *stream, const char *fmt,...) +pg_fprintf(FILE *stream, const char *fmt, ...) { int len; va_list args; @@ -279,7 +279,7 @@ pg_vprintf(const char *fmt, va_list args) } int -pg_printf(const char *fmt,...) +pg_printf(const char *fmt, ...) { int len; va_list args; diff --git a/src/port/strlcat.c b/src/port/strlcat.c index 190e57338e0..8335e895a5c 100644 --- a/src/port/strlcat.c +++ b/src/port/strlcat.c @@ -1,7 +1,8 @@ /* * src/port/strlcat.c * - * $OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $ */ + * $OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $ + */ /* * Copyright (c) 1998 Todd C. Miller diff --git a/src/port/strsep.c b/src/port/strsep.c index 564125c5101..dc7cfaea3d7 100644 --- a/src/port/strsep.c +++ b/src/port/strsep.c @@ -1,7 +1,8 @@ /* * src/port/strsep.c * - * $OpenBSD: strsep.c,v 1.8 2015/08/31 02:53:57 guenther Exp $ */ + * $OpenBSD: strsep.c,v 1.8 2015/08/31 02:53:57 guenther Exp $ + */ /*- * Copyright (c) 1990, 1993 diff --git a/src/port/win32security.c b/src/port/win32security.c index 46d2fc774b4..d3ca70f0eac 100644 --- a/src/port/win32security.c +++ b/src/port/win32security.c @@ -17,7 +17,7 @@ #include "postgres_fe.h" #endif -static void log_error(const char *fmt,...) pg_attribute_printf(1, 2); +static void log_error(const char *fmt, ...) pg_attribute_printf(1, 2); /* @@ -25,7 +25,7 @@ static void log_error(const char *fmt,...) pg_attribute_printf(1, 2); * message. */ static void -log_error(const char *fmt,...) +log_error(const char *fmt, ...) { va_list ap; diff --git a/src/test/locale/test-ctype.c b/src/test/locale/test-ctype.c index a3f896c5ecb..36e487277f9 100644 --- a/src/test/locale/test-ctype.c +++ b/src/test/locale/test-ctype.c @@ -3,22 +3,22 @@ */ /* - - test-ctype.c - -Written by Oleg BroytMann, phd2@earthling.net - with help from Oleg Bartunov, oleg@sai.msu.su -Copyright (C) 1998 PhiloSoft Design - -This is copyrighted but free software. You can use it, modify and distribute -in original or modified form providing that the author's names and the above -copyright notice will remain. - -Disclaimer, legal notice and absence of warranty. - This software provided "as is" without any kind of warranty. In no event -the author shall be liable for any damage, etc. - -*/ + * + * test-ctype.c + * + * Written by Oleg BroytMann, phd2@earthling.net + * with help from Oleg Bartunov, oleg@sai.msu.su + * Copyright (C) 1998 PhiloSoft Design + * + * This is copyrighted but free software. You can use it, modify and distribute + * in original or modified form providing that the author's names and the above + * copyright notice will remain. + * + * Disclaimer, legal notice and absence of warranty. + * This software provided "as is" without any kind of warranty. In no event + * the author shall be liable for any damage, etc. + * + */ #include #include diff --git a/src/test/modules/libpq_pipeline/libpq_pipeline.c b/src/test/modules/libpq_pipeline/libpq_pipeline.c index aa0a6bbe762..ee3e2ec7570 100644 --- a/src/test/modules/libpq_pipeline/libpq_pipeline.c +++ b/src/test/modules/libpq_pipeline/libpq_pipeline.c @@ -24,7 +24,7 @@ static void exit_nicely(PGconn *conn); -pg_noreturn static void pg_fatal_impl(int line, const char *fmt,...) +pg_noreturn static void pg_fatal_impl(int line, const char *fmt, ...) pg_attribute_printf(2, 3); static bool process_result(PGconn *conn, PGresult *res, int results, int numsent); @@ -72,7 +72,7 @@ exit_nicely(PGconn *conn) */ #define pg_fatal(...) pg_fatal_impl(__LINE__, __VA_ARGS__) pg_noreturn static void -pg_fatal_impl(int line, const char *fmt,...) +pg_fatal_impl(int line, const char *fmt, ...) { va_list args; diff --git a/src/test/modules/test_tidstore/test_tidstore.c b/src/test/modules/test_tidstore/test_tidstore.c index bfc40bce24c..60446e484d3 100644 --- a/src/test/modules/test_tidstore/test_tidstore.c +++ b/src/test/modules/test_tidstore/test_tidstore.c @@ -93,7 +93,7 @@ offsetnumber_cmp(const void *a, const void *b) * on TopMemoryContext, otherwise on DSA. Although the tidstore * is created on DSA, only the same process can subsequently use * the tidstore. The tidstore handle is not shared anywhere. -*/ + */ Datum test_create(PG_FUNCTION_ARGS) { diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c index c26efeba1ee..1c052cc0fbf 100644 --- a/src/test/regress/pg_regress.c +++ b/src/test/regress/pg_regress.c @@ -149,12 +149,12 @@ static void make_directory(const char *dir); static void test_status_print(bool ok, const char *testname, double runtime, bool parallel); static void test_status_ok(const char *testname, double runtime, bool parallel); static void test_status_failed(const char *testname, double runtime, bool parallel); -static void bail_out(bool noatexit, const char *fmt,...) pg_attribute_printf(2, 3); -static void emit_tap_output(TAPtype type, const char *fmt,...) pg_attribute_printf(2, 3); +static void bail_out(bool noatexit, const char *fmt, ...) pg_attribute_printf(2, 3); +static void emit_tap_output(TAPtype type, const char *fmt, ...) pg_attribute_printf(2, 3); static void emit_tap_output_v(TAPtype type, const char *fmt, va_list argp) pg_attribute_printf(2, 0); static StringInfo psql_start_command(void); -static void psql_add_command(StringInfo buf, const char *query,...) pg_attribute_printf(2, 3); +static void psql_add_command(StringInfo buf, const char *query, ...) pg_attribute_printf(2, 3); static void psql_end_command(StringInfo buf, const char *database); /* @@ -257,7 +257,7 @@ split_to_stringlist(const char *s, const char *delim, _stringlist **listhead) * exit handlers, thus avoid any risk of bottomless recursion calls to exit. */ static void -bail_out(bool noatexit, const char *fmt,...) +bail_out(bool noatexit, const char *fmt, ...) { va_list ap; @@ -333,7 +333,7 @@ test_status_failed(const char *testname, double runtime, bool parallel) static void -emit_tap_output(TAPtype type, const char *fmt,...) +emit_tap_output(TAPtype type, const char *fmt, ...) { va_list argp; @@ -1140,7 +1140,7 @@ psql_start_command(void) } static void -psql_add_command(StringInfo buf, const char *query,...) +psql_add_command(StringInfo buf, const char *query, ...) { StringInfoData cmdbuf; const char *cmdptr; diff --git a/src/test/regress/regress.c b/src/test/regress/regress.c index 2bcb5559a45..4927f1ddcbf 100644 --- a/src/test/regress/regress.c +++ b/src/test/regress/regress.c @@ -162,7 +162,8 @@ overpaid(PG_FUNCTION_ARGS) PG_RETURN_BOOL(salary > 699); } -/* New type "widget" +/* + * New type "widget" * This used to be "circle", but I added circle to builtins, * so needed to make sure the names do not collide. - tgl 97/04/21 */ diff --git a/src/timezone/localtime.c b/src/timezone/localtime.c index ac0376b0c4d..fb04b4cf6bf 100644 --- a/src/timezone/localtime.c +++ b/src/timezone/localtime.c @@ -201,7 +201,8 @@ union local_storage /* We don't need the "fullname" member */ }; -/* Load tz data from the file named NAME into *SP. Read extended +/* + * Load tz data from the file named NAME into *SP. Read extended * format if DOEXTEND. Use *LSP for temporary storage. Return 0 on * success, an errno value on failure. * PG: If "canonname" is not NULL, then on success the canonical spelling of @@ -578,7 +579,8 @@ tzloadbody(char const *name, char *canonname, struct state *sp, bool doextend, return 0; } -/* Load tz data from the file named NAME into *SP. Read extended +/* + * Load tz data from the file named NAME into *SP. Read extended * format if DOEXTEND. Return 0 on success, an errno value on failure. * PG: If "canonname" is not NULL, then on success the canonical spelling of * given name is stored there (the buffer must be > TZ_STRLEN_MAX bytes!). diff --git a/src/timezone/zic.c b/src/timezone/zic.c index 2f36486a350..739974bf481 100644 --- a/src/timezone/zic.c +++ b/src/timezone/zic.c @@ -54,9 +54,11 @@ static ptrdiff_t const PTRDIFF_MAX = MAXVAL(ptrdiff_t, TYPE_BIT(ptrdiff_t)); #define _Alignof(type) offsetof(struct { char a; type b; }, b) #endif -/* The type for line numbers. Use PRIdMAX to format them; formerly - there was also "#define PRIdLINENO PRIdMAX" and formats used - PRIdLINENO, but xgettext cannot grok that. */ +/* + * The type for line numbers. Use PRIdMAX to format them; formerly + * there was also "#define PRIdLINENO PRIdMAX" and formats used + * PRIdLINENO, but xgettext cannot grok that. + */ typedef intmax_t lineno_t; struct rule @@ -123,8 +125,8 @@ extern int link(const char *target, const char *linkname); #endif static void verror(const char *const string, va_list args) pg_attribute_printf(1, 0); -static void error(const char *const string,...) pg_attribute_printf(1, 2); -static void warning(const char *const string,...) pg_attribute_printf(1, 2); +static void error(const char *const string, ...) pg_attribute_printf(1, 2); +static void warning(const char *const string, ...) pg_attribute_printf(1, 2); static void addtt(zic_t starttime, int type); static int addtype(zic_t utoff, char const *abbr, bool isdst, bool ttisstd, bool ttisut); @@ -164,11 +166,13 @@ enum { PERCENT_Z_LEN_BOUND = sizeof "+995959" - 1}; -/* If true, work around a bug in Qt 5.6.1 and earlier, which mishandles - TZif files whose POSIX-TZ-style strings contain '<'; see - QTBUG-53071 . This - workaround will no longer be needed when Qt 5.6.1 and earlier are - obsolete, say in the year 2021. */ +/* + * If true, work around a bug in Qt 5.6.1 and earlier, which mishandles + * TZif files whose POSIX-TZ-style strings contain '<'; see + * QTBUG-53071 . This + * workaround will no longer be needed when Qt 5.6.1 and earlier are + * obsolete, say in the year 2021. + */ #ifndef WORK_AROUND_QTBUG_53071 enum { @@ -515,7 +519,7 @@ verror(const char *const string, va_list args) } static void -error(const char *const string,...) +error(const char *const string, ...) { va_list args; @@ -526,7 +530,7 @@ error(const char *const string,...) } static void -warning(const char *const string,...) +warning(const char *const string, ...) { va_list args; @@ -569,9 +573,11 @@ usage(FILE *stream, int status) exit(status); } -/* Change the working directory to DIR, possibly creating DIR and its - ancestors. After this is done, all files are accessed with names - relative to DIR. */ +/* + * Change the working directory to DIR, possibly creating DIR and its + * ancestors. After this is done, all files are accessed with names + * relative to DIR. + */ static void change_directory(char const *dir) { @@ -599,8 +605,10 @@ change_directory(char const *dir) static zic_t const min_time = MINVAL(zic_t, TIME_T_BITS_IN_FILE); static zic_t const max_time = MAXVAL(zic_t, TIME_T_BITS_IN_FILE); -/* The minimum, and one less than the maximum, values specified by - the -r option. These default to MIN_TIME and MAX_TIME. */ +/* + * The minimum, and one less than the maximum, values specified by + * the -r option. These default to MIN_TIME and MAX_TIME. + */ static zic_t lo_time = MINVAL(zic_t, TIME_T_BITS_IN_FILE); static zic_t hi_time = MAXVAL(zic_t, TIME_T_BITS_IN_FILE); @@ -610,8 +618,10 @@ static zic_t leapexpires = -1; /* The time specified by an #expires comment, or negative if no such line. */ static zic_t comment_leapexpires = -1; -/* Set the time range of the output to TIMERANGE. - Return true if successful. */ +/* + * Set the time range of the output to TIMERANGE. + * Return true if successful. + */ static bool timerange_option(char *timerange) { @@ -649,9 +659,11 @@ static const char *directory; static const char *leapsec; static const char *tzdefault; -/* -1 if the TZif output file should be slim, 0 if default, 1 if the - output should be fat for backward compatibility. ZIC_BLOAT_DEFAULT - determines the default. */ +/* + * -1 if the TZif output file should be slim, 0 if default, 1 if the + * output should be fat for backward compatibility. ZIC_BLOAT_DEFAULT + * determines the default. + */ static int bloat; static bool @@ -1004,8 +1016,10 @@ relname(char const *target, char const *linkname) } #endif /* HAVE_SYMLINK */ -/* Hard link FROM to TO, following any symbolic links. - Return 0 if successful, an error number otherwise. */ +/* + * Hard link FROM to TO, following any symbolic links. + * Return 0 if successful, an error number otherwise. + */ static int hardlinkerr(char const *target, char const *linkname) { @@ -3534,8 +3548,10 @@ is_alpha(char a) } } -/* If A is an uppercase character in the C locale, return its lowercase - counterpart. Otherwise, return A. */ +/* + * If A is an uppercase character in the C locale, return its lowercase + * counterpart. Otherwise, return A. + */ static char lowerit(char a) { @@ -3929,10 +3945,12 @@ newabbr(const char *string) charcnt += i; } -/* Ensure that the directories of ARGNAME exist, by making any missing - ones. If ANCESTORS, do this only for ARGNAME's ancestors; otherwise, - do it for ARGNAME too. Exit with failure if there is trouble. - Do not consider an existing non-directory to be trouble. */ +/* + * Ensure that the directories of ARGNAME exist, by making any missing + * ones. If ANCESTORS, do this only for ARGNAME's ancestors; otherwise, + * do it for ARGNAME too. Exit with failure if there is trouble. + * Do not consider an existing non-directory to be trouble. + */ static void mkdirs(char const *argname, bool ancestors) { diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 06532bf7152..cbd9e10fc1d 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -7,7 +7,6 @@ ASN1_OBJECT ASN1_OCTET_STRING ASN1_STRING ATAlterConstraint -AttrResultArgMap AV A_ArrayExpr A_Const @@ -184,6 +183,7 @@ AttrDefault AttrMap AttrMissing AttrNumber +AttrResultArgMap AttributeOpts AuthRequest AuthToken @@ -359,8 +359,6 @@ BufferAccessStrategy BufferAccessStrategyType BufferCacheOsPagesContext BufferCacheOsPagesRec -BufferCachePagesContext -BufferCachePagesRec BufferDesc BufferDescPadded BufferHeapTupleTableSlot @@ -458,7 +456,6 @@ ClosestMatchState Clump ClusterInfo ClusterParams -ClusterStmt CmdType CoalesceExpr CoerceParamHook @@ -515,6 +512,7 @@ ConcurrentChangeKind ConditionVariable ConditionVariableMinimallyPadded ConditionalStack +ConditionalStackData ConfigData ConfigVariable ConflictTupleInfo @@ -614,9 +612,7 @@ CustomScan CustomScanMethods CustomScanState CycleCtr -DataChecksumsWorkerOperation DBState -DbOidName DCHCacheEntry DEADLOCK_INFO DECountItem @@ -633,14 +629,14 @@ DSMREntryType DSMRegistryCtxStruct DSMRegistryEntry DWORD +DWORD64 DataChecksumsStateStruct DataChecksumsWorkerDatabase +DataChecksumsWorkerOperation DataChecksumsWorkerResult DataDirSyncMethod DataDumperPtr DataPageDeleteStack -DdlOptType -DdlOption DataTypesUsageChecks DataTypesUsageVersionCheck DatabaseInfo @@ -651,6 +647,9 @@ DatumTupleFields DbInfo DbInfoArr DbLocaleInfo +DbOidName +DdlOptType +DdlOption DeClonePtrType DeadLockState DeallocateStmt @@ -806,6 +805,7 @@ ExplainForeignModify_function ExplainForeignScan_function ExplainFormat ExplainOneQuery_hook_type +ExplainOptionGUCCheckHandler ExplainOptionHandler ExplainSerializeOption ExplainState @@ -832,7 +832,6 @@ ExtensionInfo ExtensionLocation ExtensionSiblingCache ExtensionVersionInfo -FastPathMeta FDWCollateState FD_SET FILE @@ -843,6 +842,7 @@ FSMPage FSMPageData FakeRelCacheEntry FakeRelCacheEntryData +FastPathMeta FastPathStrongRelationLockData FdwInfo FdwRoutine @@ -912,6 +912,7 @@ FormData_pg_collation FormData_pg_constraint FormData_pg_conversion FormData_pg_database +FormData_pg_db_role_setting FormData_pg_default_acl FormData_pg_depend FormData_pg_enum @@ -976,6 +977,7 @@ Form_pg_collation Form_pg_constraint Form_pg_conversion Form_pg_database +Form_pg_db_role_setting Form_pg_default_acl Form_pg_depend Form_pg_enum @@ -996,6 +998,11 @@ Form_pg_opfamily Form_pg_partitioned_table Form_pg_policy Form_pg_proc +Form_pg_propgraph_element +Form_pg_propgraph_element_label +Form_pg_propgraph_label +Form_pg_propgraph_label_property +Form_pg_propgraph_property Form_pg_publication Form_pg_publication_namespace Form_pg_publication_rel @@ -1268,6 +1275,7 @@ HeapTupleHeader HeapTupleHeaderData HeapTupleTableSlot HistControl +HostCacheEntry HostsFileLoadResult HostsLine HotStandbyState @@ -1294,6 +1302,7 @@ IfStackElem ImportForeignSchemaStmt ImportForeignSchemaType ImportForeignSchema_function +ImportForeignStatistics_function ImportQual InProgressEnt InProgressIO @@ -1326,7 +1335,6 @@ IndexElem IndexFetchHeapData IndexFetchTableData IndexInfo -IndexInsertState IndexList IndexOnlyScan IndexOnlyScanState @@ -1639,6 +1647,7 @@ LoadStmt LocalBufferLookupEnt LocalPgBackendStatus LocalTransactionId +Location LocationIndex LocationLen LockAcquireResult @@ -1882,6 +1891,7 @@ Offset OffsetNumber OffsetVarNodes_context Oid +Oid8 OidOptions OkeysState OldMultiXactReader @@ -2121,8 +2131,8 @@ PVIndVacStatus PVOID PVShared PVSharedCostParams -PVWorkerUsage PVWorkerStats +PVWorkerUsage PX_Alias PX_Cipher PX_Combo @@ -2518,6 +2528,7 @@ RTEPermissionInfo RWConflict RWConflictData RWConflictPoolHeader +RadixSortInfo Range RangeBound RangeBox @@ -2613,7 +2624,9 @@ RelocationBufferInfo RelptrFreePageBtree RelptrFreePageManager RelptrFreePageSpanLeader +RemoteAttributeMapping RemoteSlot +RemoteStatsResults RenameStmt ReopenPtrType ReorderBuffer @@ -2740,6 +2753,7 @@ SIZE_T SMgrRelation SMgrRelationData SMgrSortArray +SN_local SOCKADDR SOCKET SPELL @@ -2883,10 +2897,13 @@ ShellTypeInfo ShippableCacheEntry ShippableCacheKey ShmemAllocatorData +ShmemAttachCallback ShmemCallbacks -ShmemIndexEnt ShmemHashOpts +ShmemIndexEnt +ShmemInitCallback ShmemRequest +ShmemRequestCallback ShmemRequestKind ShmemStructOpts ShutdownForeignScan_function @@ -2988,9 +3005,9 @@ StartLOPtrType StartLOsPtrType StartReplicationCmd StartupStatusEnum +StatApproxReadStreamPrivate StatEntry StatExtEntry -StatApproxReadStreamPrivate StateFileChunk StatisticExtInfo StatsBuildData @@ -3054,6 +3071,7 @@ SyncRequestHandler SyncRequestType SyncStandbySlotsConfigData SyncingRelationsState +SysCacheIdentifier SysFKRelationship SysScanDesc SysScanDescData @@ -3643,6 +3661,7 @@ brin_column_state brin_serialize_callback_type btree_gin_convert_function btree_gin_leftmost_function +build_simple_rel_hook_type bytea cached_re_str canonicalize_state @@ -3802,7 +3821,6 @@ generate_series_timestamptz_fctx generate_subscripts_fctx get_attavgwidth_hook_type get_index_stats_hook_type -get_relation_info_hook_type get_relation_stats_hook_type gid_t gin_leafpage_items_state @@ -3840,6 +3858,7 @@ having_collation_ctx heap_page_items_state help_handler hlCheck +host_cache_hash hstoreCheckKeyLen_t hstoreCheckValLen_t hstorePairs_t @@ -3888,7 +3907,9 @@ itemIdCompact itemIdCompactData iterator jmp_buf +join_path_setup_hook_type join_search_hook_type +joinrel_setup_hook_type json_aelem_action json_manifest_error_callback json_manifest_per_file_callback @@ -3900,7 +3921,6 @@ json_scalar_action json_struct_action keepwal_entry keepwal_hash -keyEntryData key_t lclContext lclTocEntry @@ -3935,7 +3955,6 @@ mac8KEY macKEY macaddr macaddr8 -macaddr_sortsupport_state manifest_data manifest_file manifest_files_hash @@ -3960,7 +3979,6 @@ movedb_failure_params multirange_bsearch_comparison multirange_unnest_fctx mxact -mxtruncinfo needs_fmgr_hook_type network_sortsupport_state nl_item @@ -3997,7 +4015,6 @@ pe_test_vector pendingPosition pending_label pgParameterStatus -pgoff_t pg_atomic_flag pg_atomic_uint32 pg_atomic_uint64 @@ -4031,6 +4048,7 @@ pg_locale_t pg_mb_radix_tree pg_md5_ctx pg_on_exit_callback +pg_plan_advice_advisor_hook pg_prng_state pg_re_flags pg_regex_t @@ -4067,16 +4085,15 @@ pg_utf_to_local_combined pg_uuid_t pg_wchar pg_wchar_tbl +pgoff_t pgp_armor_headers_state pgpa_advice_item pgpa_advice_tag_type pgpa_advice_target pgpa_identifier pgpa_index_target -pgpa_index_type pgpa_itm_type pgpa_jo_outcome -pgpa_join_class pgpa_join_member pgpa_join_state pgpa_join_strategy @@ -4099,15 +4116,19 @@ pgpa_trove_lookup_type pgpa_trove_result pgpa_trove_slice pgpa_unrolled_join +pgpa_yy_extra_type pgsa_entry pgsa_entry_key pgsa_saved_entry pgsa_saved_stash pgsa_saved_stash_table_hash +pgsa_saved_stash_table_iterator pgsa_shared_state pgsa_stash pgsa_stash_count +pgsa_stash_count_table_hash pgsa_stash_name +pgsa_stash_name_table_hash pgsa_writer_context pgsocket pgsql_thing_t @@ -4155,6 +4176,7 @@ post_parse_analyze_hook_type postprocess_result_function pqbool pqsigfunc +pqsigfunc_legacy printQueryOpt printTableContent printTableFooter @@ -4190,7 +4212,6 @@ qc_hash_func qsort_arg_comparator qsort_comparator query_pathkeys_callback -RadixSortInfo rangeTableEntry_used_context rank_context rbt_allocfunc @@ -4222,11 +4243,9 @@ relopt_ternary relopt_type relopt_value relopts_validator -RemoteAttributeMapping remoteConn remoteConnHashEnt remoteDep -RemoteStatsResults remove_nulling_relids_context rendezvousHashEntry rep @@ -4271,6 +4290,7 @@ shmem_hash_allocator shmem_request_hook_type shmem_startup_hook_type sig_atomic_t +siginfo_t sigjmp_buf signedbitmapword sigset_t diff --git a/src/tutorial/complex.c b/src/tutorial/complex.c index 46dc54e62d0..05e33fbafb8 100644 --- a/src/tutorial/complex.c +++ b/src/tutorial/complex.c @@ -1,11 +1,11 @@ /* * src/tutorial/complex.c * - ****************************************************************************** - This file contains routines that can be bound to a Postgres backend and - called by the backend in the process of processing queries. The calling - format for these routines is dictated by Postgres architecture. -******************************************************************************/ + * + * This file contains routines that can be bound to a Postgres backend and + * called by the backend in the process of processing queries. The calling + * format for these routines is dictated by Postgres architecture. + */ #include "postgres.h"