Skip to content

Commit 5cbfce5

Browse files
committed
Initial pgindent and pgperltidy run for v13.
Includes some manual cleanup of places that pgindent messed up, most of which weren't per project style anyway. Notably, it seems some people didn't absorb the style rules of commit c9d2977, because there were a bunch of new occurrences of function calls with a newline just after the left paren, all with faulty expectations about how the rest of the call would get indented.
1 parent 1255466 commit 5cbfce5

File tree

198 files changed

+2021
-1788
lines changed

Some content is hidden

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

198 files changed

+2021
-1788
lines changed

contrib/adminpack/adminpack.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ Datum
217217
pg_file_sync(PG_FUNCTION_ARGS)
218218
{
219219
char *filename;
220-
struct stat fst;
220+
struct stat fst;
221221

222222
filename = convert_and_check_filename(PG_GETARG_TEXT_PP(0));
223223

contrib/intarray/_int_bool.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ checkcondition_arr(void *checkval, ITEM *item, void *options)
256256
static bool
257257
checkcondition_bit(void *checkval, ITEM *item, void *siglen)
258258
{
259-
return GETBIT(checkval, HASHVAL(item->val, (int)(intptr_t) siglen));
259+
return GETBIT(checkval, HASHVAL(item->val, (int) (intptr_t) siglen));
260260
}
261261

262262
/*
@@ -300,7 +300,7 @@ bool
300300
signconsistent(QUERYTYPE *query, BITVECP sign, int siglen, bool calcnot)
301301
{
302302
return execute(GETQUERY(query) + query->size - 1,
303-
(void *) sign, (void *)(intptr_t) siglen, calcnot,
303+
(void *) sign, (void *) (intptr_t) siglen, calcnot,
304304
checkcondition_bit);
305305
}
306306

contrib/ltree/_ltree_gist.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -407,8 +407,8 @@ gist_te(ltree_gist *key, ltree *query, int siglen)
407407

408408
typedef struct LtreeSignature
409409
{
410-
BITVECP sign;
411-
int siglen;
410+
BITVECP sign;
411+
int siglen;
412412
} LtreeSignature;
413413

414414
static bool

contrib/ltree/ltree.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ typedef struct
272272
#define LTG_GETRNODE(x, siglen) ( LTG_ISONENODE(x) ? LTG_NODE(x) : LTG_RNODE(x, siglen) )
273273

274274
extern ltree_gist *ltree_gist_alloc(bool isalltrue, BITVECP sign, int siglen,
275-
ltree *left, ltree *right);
275+
ltree *left, ltree *right);
276276

277277
/* GiST support for ltree[] */
278278

contrib/ltree/ltree_gist.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ ltree_gist_alloc(bool isalltrue, BITVECP sign, int siglen,
4040
ltree *left, ltree *right)
4141
{
4242
int32 size = LTG_HDRSIZE + (isalltrue ? 0 : siglen) +
43-
(left ? VARSIZE(left) + (right ? VARSIZE(right) : 0) : 0);
43+
(left ? VARSIZE(left) + (right ? VARSIZE(right) : 0) : 0);
4444
ltree_gist *result = palloc(size);
4545

4646
SET_VARSIZE(result, size);
@@ -557,8 +557,8 @@ gist_between(ltree_gist *key, lquery *query, int siglen)
557557

558558
typedef struct LtreeSignature
559559
{
560-
BITVECP sign;
561-
int siglen;
560+
BITVECP sign;
561+
int siglen;
562562
} LtreeSignature;
563563

564564
static bool

contrib/pg_stat_statements/pg_stat_statements.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2681,6 +2681,7 @@ JumbleRowMarks(pgssJumbleState *jstate, List *rowMarks)
26812681
foreach(lc, rowMarks)
26822682
{
26832683
RowMarkClause *rowmark = lfirst_node(RowMarkClause, lc);
2684+
26842685
if (!rowmark->pushedDown)
26852686
{
26862687
APP_JUMB(rowmark->rti);

contrib/pg_visibility/pg_visibility.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ pg_truncate_visibility_map(PG_FUNCTION_ARGS)
384384
Oid relid = PG_GETARG_OID(0);
385385
Relation rel;
386386
ForkNumber fork;
387-
BlockNumber block;
387+
BlockNumber block;
388388

389389
rel = relation_open(relid, AccessExclusiveLock);
390390

contrib/postgres_fdw/connection.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,8 +303,8 @@ connect_pg_server(ForeignServer *server, UserMapping *user)
303303
/*
304304
* Check that non-superuser has used password to establish connection;
305305
* otherwise, he's piggybacking on the postgres server's user
306-
* identity. See also dblink_security_check() in contrib/dblink
307-
* and check_conn_params.
306+
* identity. See also dblink_security_check() in contrib/dblink and
307+
* check_conn_params.
308308
*/
309309
if (!superuser_arg(user->userid) && UserMappingPasswordRequired(user) &&
310310
!PQconnectionUsedPassword(conn))
@@ -361,6 +361,7 @@ UserMappingPasswordRequired(UserMapping *user)
361361
foreach(cell, user->options)
362362
{
363363
DefElem *def = (DefElem *) lfirst(cell);
364+
364365
if (strcmp(def->defname, "password_required") == 0)
365366
return defGetBoolean(def);
366367
}

contrib/postgres_fdw/option.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -144,13 +144,13 @@ postgres_fdw_validator(PG_FUNCTION_ARGS)
144144
}
145145
else if (strcmp(def->defname, "password_required") == 0)
146146
{
147-
bool pw_required = defGetBoolean(def);
147+
bool pw_required = defGetBoolean(def);
148148

149149
/*
150150
* Only the superuser may set this option on a user mapping, or
151151
* alter a user mapping on which this option is set. We allow a
152-
* user to clear this option if it's set - in fact, we don't have a
153-
* choice since we can't see the old mapping when validating an
152+
* user to clear this option if it's set - in fact, we don't have
153+
* a choice since we can't see the old mapping when validating an
154154
* alter.
155155
*/
156156
if (!superuser() && !pw_required)
@@ -204,11 +204,11 @@ InitPgFdwOptions(void)
204204
{"fetch_size", ForeignServerRelationId, false},
205205
{"fetch_size", ForeignTableRelationId, false},
206206
{"password_required", UserMappingRelationId, false},
207+
207208
/*
208209
* sslcert and sslkey are in fact libpq options, but we repeat them
209-
* here to allow them to appear in both foreign server context
210-
* (when we generate libpq options) and user mapping context
211-
* (from here).
210+
* here to allow them to appear in both foreign server context (when
211+
* we generate libpq options) and user mapping context (from here).
212212
*/
213213
{"sslcert", UserMappingRelationId, true},
214214
{"sslkey", UserMappingRelationId, true},

doc/src/sgml/mk_feature_tables.pl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,10 @@
5555
print " <entry>$feature_id</entry>\n";
5656
}
5757
print " <entry>",
58-
defined($feature_packages{$feature_id}) ? $feature_packages{$feature_id} : "",
59-
"</entry>\n";
58+
defined($feature_packages{$feature_id})
59+
? $feature_packages{$feature_id}
60+
: "",
61+
"</entry>\n";
6062
if ($subfeature_id)
6163
{
6264
print " <entry>$subfeature_name</entry>\n";

0 commit comments

Comments
 (0)