8000 Initial pgindent run with pg_bsd_indent version 2.0. · postgrespro/postgres@e3860ff · GitHub
[go: up one dir, main page]
Skip to content

Commit e3860ff

Browse files
tglsfdctglsfdc
committed
Initial pgindent run with pg_bsd_indent version 2.0.
The new indent version includes numerous fixes thanks to Piotr Stefaniak. The main changes visible in this commit are: * Nicer formatting of function-pointer declarations. * No longer unexpectedly removes spaces in expressions using casts, sizeof, or offsetof. * No longer wants to add a space in "struct structname *varname", as well as some similar cases for const- or volatile-qualified pointers. * Declarations using PG_USED_FOR_ASSERTS_ONLY are formatted more nicely. * Fixes bug where comments following declarations were sometimes placed with no space separating them from the code. * Fixes some odd decisions for comments following case labels. * Fixes some cases where comments following code were indented to less than the expected column 33. On the less good side, it now tends to put more whitespace around typedef names that are not listed in typedefs.list. This might encourage us to put more effort into typedef name collection; it's not really a bug in indent itself. There are more changes coming after this round, having to do with comment indentation and alignment of lines appearing within parentheses. I wanted to limit the size of the diffs to something that could be reviewed without one's eyes completely glazing over, so it seemed better to split up the changes as much as practical. Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us
1 parent 8ff6d4e commit e3860ff

File tree

379 files changed

+1726
-1708
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

379 files changed

+1726
-1708
lines changed

‎contrib/bloom/blutils.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ _PG_init(void)
7575
bl_relopt_tab[i + 1].optname = MemoryContextStrdup(TopMemoryContext,
7676
buf);
7777
bl_relopt_tab[i + 1].opttype = RELOPT_TYPE_INT;
78-
bl_relopt_tab[i + 1].offset = offsetof(BloomOptions, bitSize[0]) +sizeof(int) * i;
78+
bl_relopt_tab[i + 1].offset = offsetof(BloomOptions, bitSize[0]) + sizeof(int) * i;
7979
}
8080
}
8181

‎contrib/btree_gist/btree_utils_var.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ gbt_var_key_readable(const GBT_VARKEY *k)
7272
* Create a leaf-entry to store in the index, from a single Datum.
7373
*/
7474
static GBT_VARKEY *
75-
gbt_var_key_from_datum(const struct varlena * u)
75+
gbt_var_key_from_datum(const struct varlena *u)
7676
{
7777
int32 lowersize = VARSIZE(u);
7878
GBT_VARKEY *r;

‎contrib/dblink/dblink.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ dblink_conn_not_avail(const char *conname)
179179

180180
static void
181181
dblink_get_conn(char *conname_or_str,
182-
PGconn *volatile * conn_p, char **conname_p, volatile bool *freeconn_p)
182+
PGconn *volatile *conn_p, char **conname_p, volatile bool *freeconn_p)
183183
{
184184
remoteConn *rconn = getConnectionByName(conname_or_str);
185185
PGconn *conn;
@@ -723,7 +723,7 @@ dblink_record_internal(FunctionCallInfo fcinfo, bool is_async)
723723
/* shouldn't happen */
724724
elog(ERROR, "wrong number of arguments");
725725
}
726-
else /* is_async */
726+
else /* is_async */
727727
{
728728
/* get async result */
729729
conname = text_to_cstring(PG_GETARG_TEXT_PP(0));

‎contrib/fuzzystrmatch/fuzzystrmatch.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ _metaphone(char *word, /* IN */
389389
/*-- Allocate memory for our phoned_phrase --*/
390390
if (max_phonemes == 0)
391391
{ /* Assume largest possible */
392-
*phoned_word = palloc(sizeof(char) * strlen(word) +1);
392+
*phoned_word = palloc(sizeof(char) * strlen(word) + 1);
393393
}
394394
else
395395
{
@@ -722,7 +722,7 @@ _metaphone(char *word, /* IN */
722722
End_Phoned_Word;
723723

724724
return (META_SUCCESS);
725-
} /* END metaphone */
725+
} /* END metaphone */
726726

727727

728728
/*

‎contrib/intarray/_int_gin.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ ginint4_queryextract(PG_FUNCTION_ARGS)
9393
case RTOldContainsStrategyNumber:
9494
if (*nentries > 0)
9595
*searchMode = GIN_SEARCH_MODE_DEFAULT;
96-
else /* everything contains the empty set */
96+
else /* everything contains the empty set */
9797
*searchMode = GIN_SEARCH_MODE_ALL;
9898
break;
9999
default:

‎contrib/ltree/lquery_op.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ static struct
147147
{
148148
bool muse;
149149
uint32 high_pos;
150-
} SomeStack =
150+
} SomeStack =
151151

152152
{
153153
false, 0,

‎contrib/oid2name/oid2name.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ void sql_exec_dumpalltbspc(PGconn *, struct options *);
5757

5858
/* function to parse command line options and check for some usage errors. */
5959
void
60-
get_opts(int argc, char **argv, struct options * my_opts)
60+
get_opts(int argc, char **argv, struct options *my_opts)
6161
{
6262
int c;
6363
const char *progname;
@@ -260,7 +260,7 @@ get_comma_elts(eary *eary)
260260

261261
/* establish connection with database. */
262262
PGconn *
263-
sql_conn(struct options * my_opts)
263+
sql_conn(struct options *my_opts)
264264
{
265265
PGconn *conn;
266266
bool have_password = false;
@@ -411,7 +411,7 @@ sql_exec(PGconn *conn, const char *todo, bool quiet)
411411
* Dump all databases. There are no system objects to worry about.
412412
*/
413413
void
414-
sql_exec_dumpalldbs(PGconn *conn, struct options * opts)
414+
sql_exec_dumpalldbs(PGconn *conn, struct options *opts)
415415
{
416416
char todo[1024];
417417

@@ -428,7 +428,7 @@ sql_exec_dumpalldbs(PGconn *conn, struct options * opts)
428428
* Dump all tables, indexes and sequences in the current database.
429429
*/
430430
void
431-
sql_exec_dumpalltables(PGconn *conn, struct options * opts)
431+
sql_exec_dumpalltables(PGconn *conn, struct options *opts)
432432
{
433433
char todo[1024];
434434
char *addfields = ",c.oid AS \"Oid\", nspname AS \"Schema\", spcname as \"Tablespace\" ";
@@ -460,7 +460,7 @@ sql_exec_dumpalltables(PGconn *conn, struct options * opts)
460460
* given objects in the current database.
461461
*/
462462
void
463-
sql_exec_searchtables(PGconn *conn, struct options * opts)
463+
sql_exec_searchtables(PGconn *conn, struct options *opts)
464464
{
465465
char *todo;
466466
char *qualifiers,
@@ -516,7 +516,7 @@ sql_exec_searchtables(PGconn *conn, struct options * opts)
516516
CppAsString2(RELKIND_SEQUENCE) ","
517517
CppAsString2(RELKIND_TOASTVALUE) ") AND\n"
518518
" t.oid = CASE\n"
519-
" WHEN reltablespace <> 0 THEN reltablespace\n"
519+
" WHEN reltablespace <> 0 THEN reltablespace\n"
520520
" ELSE dattablespace\n"
521521
" END AND\n"
522522
" (%s)\n"
@@ -530,7 +530,7 @@ sql_exec_searchtables(PGconn *conn, struct options * opts)
530530
}
531531

532532
void
533-
sql_exec_dumpalltbspc(PGconn *conn, struct options * opts)
533+
sql_exec_dumpalltbspc(PGconn *conn, struct options *opts)
534534
{
535535
char todo[1024];
536536

‎contrib/pg_stat_statements/pg_stat_statements.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ typedef enum
250250
PGSS_TRACK_NONE, /* track no statements */
251251
PGSS_TRACK_TOP, /* only top level statements */
252252
PGSS_TRACK_ALL /* all statements, including nested ones */
253-
} PGSSTrackLevel;
253+
} PGSSTrackLevel;
254254

255255
static const struct config_enum_entry track_options[] =
256256
{

‎contrib/pg_trgm/trgm_op.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ generate_trgm(char *str, int slen)
325325

326326
protect_out_of_mem(slen);
327327

328-
trg = (TRGM *) palloc(TRGMHDRSIZE + sizeof(trgm) * (slen / 2 + 1) *3);
328+
trg = (TRGM *) palloc(TRGMHDRSIZE + sizeof(trgm) * (slen / 2 + 1) * 3);
329329
trg->flag = ARRKEY;
330330

331331
len = generate_trgm_only(GETARR(trg), str, slen);
@@ -572,8 +572,8 @@ calc_word_similarity(char *str1, int slen1, char *str2, int slen2,
572572
protect_out_of_mem(slen1 + slen2);
573573

574574
/* Make positional trigrams */
575-
trg1 = (trgm *) palloc(sizeof(trgm) * (slen1 / 2 + 1) *3);
576-
trg2 = (trgm *) palloc(sizeof(trgm) * (slen2 / 2 + 1) *3);
575+
trg1 = (trgm *) palloc(sizeof(trgm) * (slen1 / 2 + 1) * 3);
576+
trg2 = (trgm *) palloc(sizeof(trgm) * (slen2 / 2 + 1) * 3);
577577

578578
len1 = generate_trgm_only(trg1, str1, slen1);
579579
len2 = generate_trgm_only(trg2, str2, slen2);
@@ -806,7 +806,7 @@ generate_wildcard_trgm(const char *str, int slen)
806806

807807
protect_out_of_mem(slen);
808808

809-
trg = (TRGM *) palloc(TRGMHDRSIZE + sizeof(trgm) * (slen / 2 + 1) *3);
809+
trg = (TRGM *) palloc(TRGMHDRSIZE + sizeof(trgm) * (slen / 2 + 1) * 3);
810810
trg->flag = ARRKEY;
811811
SET_VARSIZE(trg, TRGMHDRSIZE);
812812

‎contrib/pg_visibility/pg_visibility.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ collect_visibility_data(Oid relid, bool include_pd)
481481
check_relation_relkind(rel);
482482

483483
nblocks = RelationGetNumberOfBlocks(rel);
484-
info = palloc0(offsetof(vbits, bits) +nblocks);
484+
info = palloc0(offsetof(vbits, bits) + nblocks);
485485
info->next = 0;
486486
info->count = nblocks;
487487

0 commit comments

Comments
 (0)
0