Skip to content

Commit b5bce6c

Browse files
tglsfdctglsfdc
committed
Final pgindent + perltidy run for 9.6.
1 parent 05d8dec commit b5bce6c

File tree

26 files changed

+175
-151
lines changed

26 files changed

+175
-151
lines changed

‎src/backend/access/brin/brin_validate.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,8 @@ brinvalidate(Oid opclassoid)
264264
continue; /* got it */
265265
ereport(INFO,
266266
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
267-
errmsg("brin operator class \"%s\" is missing support function %d",
268-
opclassname, i)));
267+
errmsg("brin operator class \"%s\" is missing support function %d",
268+
opclassname, i)));
269269
result = false;
270270
}
271271

‎src/backend/access/gin/ginvalidate.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,8 @@ ginvalidate(Oid opclassoid)
243243
continue; /* don't need both, see check below loop */
244244
ereport(INFO,
245245
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
246-
errmsg("gin operator class \"%s\" is missing support function %d",
247-
opclassname, i)));
246+
errmsg("gin operator class \"%s\" is missing support function %d",
247+
opclassname, i)));
248248
result = false;
249249
}
250250
if (!opclassgroup ||

‎src/backend/access/gist/gistvalidate.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,8 @@ gistvalidate(Oid opclassoid)
261261
continue; /* optional methods */
262262
ereport(INFO,
263263
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
264-
errmsg("gist operator class \"%s\" is missing support function %d",
265-
opclassname, i)));
264+
errmsg("gist operator class \"%s\" is missing support function %d",
265+
opclassname, i)));
266266
result = false;
267267
}
268268

‎src/backend/access/hash/hashvalidate.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,9 @@ hashvalidate(Oid opclassoid)
186186
{
187187
ereport(INFO,
188188
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
189-
errmsg("hash operator family \"%s\" lacks support function for operator %s",
190-
opfamilyname,
191-
format_operator(oprform->amopopr))));
189+
errmsg("hash operator family \"%s\" lacks support function for operator %s",
190+
opfamilyname,
191+
format_operator(oprform->amopopr))));
192192
result = false;
193193
}
194194
}

‎src/backend/access/heap/heapam.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4571,7 +4571,7 @@ heap_lock_tuple(Relation relation, HeapTuple tuple,
45714571
ItemId lp;
45724572
Page page;
45734573
Buffer vmbuffer = InvalidBuffer;
4574-
BlockNumber block;
4574+
BlockNumber block;
45754575
TransactionId xid,
45764576
xmax;
45774577
uint16 old_infomask,
@@ -5643,7 +5643,7 @@ static HTSU_Result
56435643
heap_lock_updated_tuple_rec(Relation rel, ItemPointer tid, TransactionId xid,
56445644
LockTupleMode mode)
56455645
{
5646-
HTSU_Result result;
5646+
HTSU_Result result;
56475647
ItemPointerData tupid;
56485648
HeapTupleData mytup;
56495649
Buffer buf;
@@ -6698,6 +6698,7 @@ heap_prepare_freeze_tuple(HeapTupleHeader tuple, TransactionId cutoff_xid,
66986698
if (tuple->t_infomask & HEAP_MOVED)
66996699
{
67006700
xid = HeapTupleHeaderGetXvac(tuple);
6701+
67016702
/*
67026703
* For Xvac, we ignore the cutoff_xid and just always perform the
67036704
* freeze operation. The oldest release in which such a value can
@@ -8841,9 +8842,9 @@ heap_xlog_lock(XLogReaderState *record)
88418842
*/
88428843
if (xlrec->flags & XLH_LOCK_ALL_FROZEN_CLEARED)
88438844
{
8844-
RelFileNode rnode;
8845+
RelFileNode rnode;
88458846
Buffer vmbuffer = InvalidBuffer;
8846-
BlockNumber block;
8847+
BlockNumber block;
88478848
Relation reln;
88488849

88498850
XLogRecGetBlockTag(record, 0, &rnode, NULL, &block);
@@ -8914,9 +8915,9 @@ heap_xlog_lock_updated(XLogReaderState *record)
89148915
*/
89158916
if (xlrec->flags & XLH_LOCK_ALL_FROZEN_CLEARED)
89168917
{
8917-
RelFileNode rnode;
8918+
RelFileNode rnode;
89188919
Buffer vmbuffer = InvalidBuffer;
8919-
BlockNumber block;
8920+
BlockNumber block;
89208921
Relation reln;
89218922

89228923
XLogRecGetBlockTag(record, 0, &rnode, NULL, &block);

‎src/backend/access/heap/tuptoaster.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1667,7 +1667,7 @@ toast_delete_datum(Relation rel, Datum value)
16671667
HeapTuple toasttup;
16681668
int num_indexes;
16691669
int validIndex;
1670-
SnapshotData SnapshotToast;
1670+
SnapshotData SnapshotToast;
16711671

16721672
if (!VARATT_IS_EXTERNAL_ONDISK(attr))
16731673
return;
@@ -1734,7 +1734,7 @@ toastrel_valueid_exists(Relation toastrel, Oid valueid)
17341734
int num_indexes;
17351735
int validIndex;
17361736
Relation *toastidxs;
1737-
SnapshotData SnapshotToast;
1737+
SnapshotData SnapshotToast;
17381738

17391739
/* Fetch a valid index relation */
17401740
validIndex = toast_open_indexes(toastrel,
@@ -1819,7 +1819,7 @@ toast_fetch_datum(struct varlena * attr)
18191819
int32 chunksize;
18201820
int num_indexes;
18211821
int validIndex;
1822-
SnapshotData SnapshotToast;
1822+
SnapshotData SnapshotToast;
18231823

18241824
if (!VARATT_IS_EXTERNAL_ONDISK(attr))
18251825
elog(ERROR, "toast_fetch_datum shouldn't be called for non-ondisk datums");
@@ -1998,7 +1998,7 @@ toast_fetch_datum_slice(struct varlena * attr, int32 sliceoffset, int32 length)
19981998
int32 chcpyend;
19991999
int num_indexes;
20002000
int validIndex;
2001-
SnapshotData SnapshotToast;
2001+
SnapshotData SnapshotToast;
20022002

20032003
if (!VARATT_IS_EXTERNAL_ONDISK(attr))
20042004
elog(ERROR, "toast_fetch_datum_slice shouldn't be called for non-ondisk datums");
@@ -2094,7 +2094,7 @@ toast_fetch_datum_slice(struct varlena * attr, int32 sliceoffset, int32 length)
20942094
init_toast_snapshot(&SnapshotToast);
20952095
nextidx = startchunk;
20962096
toastscan = systable_beginscan_ordered(toastrel, toastidxs[validIndex],
2097-
&SnapshotToast, nscankeys, toastkey);
2097+
&SnapshotToast, nscankeys, toastkey);
20982098
while ((ttup = systable_getnext_ordered(toastscan, ForwardScanDirection)) != NULL)
20992099
{
21002100
/*

‎src/backend/commands/variable.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -776,7 +776,7 @@ assign_client_encoding(const char *newval, void *extra)
776776
*/
777777
ereport(ERROR,
778778
(errcode(ERRCODE_INVALID_TRANSACTION_STATE),
779-
errmsg("cannot change client_encoding in a parallel worker")));
779+
errmsg("cannot change client_encoding in a parallel worker")));
780780
}
781781

782782
/* We do not expect an error if PrepareClientEncoding succeeded */

‎src/backend/replication/libpqwalreceiver/libpqwalreceiver.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ libpqrcv_get_conninfo(void)
129129
{
130130
PQconninfoOption *conn_opts;
131131
PQconninfoOption *conn_opt;
132-
PQExpBufferData buf;
132+
PQExpBufferData buf;
133133
char *retval;
134134

135135
Assert(streamConn != NULL);
@@ -145,7 +145,7 @@ libpqrcv_get_conninfo(void)
145145
/* build a clean connection string from pieces */
146146
for (conn_opt = conn_opts; conn_opt->keyword != NULL; conn_opt++)
147147
{
148-
bool obfuscate;
148+
bool obfuscate;
149149

150150
/* Skip debug and empty options */
151151
if (strchr(conn_opt->dispchar, 'D') ||

‎src/backend/replication/syncrep.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,10 +193,11 @@ SyncRepWaitForLSN(XLogRecPtr lsn, bool commit)
193193
ResetLatch(MyLatch);
194194

195195
/*
196-
* Acquiring the lock is not needed, the latch ensures proper barriers.
197-
* If it looks like we're done, we must really be done, because once
198-
* walsender changes the state to SYNC_REP_WAIT_COMPLETE, it will never
199-
* update it again, so we can't be seeing a stale value in that case.
196+
* Acquiring the lock is not needed, the latch ensures proper
197+
* barriers. If it looks like we're done, we must really be done,
198+
* because once walsender changes the state to SYNC_REP_WAIT_COMPLETE,
199+
* it will never update it again, so we can't be seeing a stale value
200+
* in that case.
200201
*/
201202
if (MyProc->syncRepState == SYNC_REP_WAIT_COMPLETE)
202203
break;

‎src/backend/tsearch/spell.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,8 @@ getNextFlagFromString(IspellDict *Conf, char **sflagset, char *sflag)
433433
if (Conf->flagMode == FM_LONG && maxstep > 0)
434434
ereport(ERROR,
435435
(errcode(ERRCODE_CONFIG_FILE_ERROR),
436-
errmsg("invalid affix flag \"%s\" with \"long\" flag value", sbuf)));
436+
errmsg("invalid affix flag \"%s\" with \"long\" flag value",
437+
sbuf)));
437438

438439
*sflag = '\0';
439440
}
@@ -1263,8 +1264,9 @@ NIImportOOAffixes(IspellDict *Conf, const char *filename)
12631264
else if (STRNCMP(s, "default") != 0)
12641265
ereport(ERROR,
12651266
(errcode(ERRCODE_CONFIG_FILE_ERROR),
1266-
errmsg("Ispell dictionary supports only \"default\", "
1267-
"\"long\", and \"num\" flag value")));
1267+
errmsg("Ispell dictionary supports only "
1268+
"\"default\", \"long\", "
1269+
"and \"num\" flag values")));
12681270
}
12691271
}
12701272

0 commit comments

Comments
 (0)