Skip to content

Commit 24d2b26

Browse files
alvherrealvherre
committed
Remove extraneous blank lines before block-closing braces
These are useless and distracting. We wouldn't have written the code with them to begin with, so there's no reason to keep them. Author: Justin Pryzby <pryzby@telsasoft.com> Discussion: https://postgr.es/m/20220411020336.GB26620@telsasoft.com Discussion: https://postgr.es/m/attachment/133167/0016-Extraneous-blank-lines.patch
1 parent ed0fbc8 commit 24d2b26

File tree

100 files changed

+2
-138
lines changed

Some content is hidden

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

100 files changed

+2
-138
lines changed

‎contrib/btree_gist/btree_bit.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ gbt_bit_l2n(GBT_VARKEY *leaf, FmgrInfo *flinfo)
104104
pfree(o);
105105

106106
return out;
107-
108107
}
109108

110109
static const gbtree_vinfo tinfo =

‎contrib/btree_gist/btree_cash.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@ gbt_cash_penalty(PG_FUNCTION_ARGS)
195195
penalty_num(result, origentry->lower, origentry->upper, newentry->lower, newentry->upper);
196196

197197
PG_RETURN_POINTER(result);
198-
199198
}
200199

201200
Datum

‎contrib/btree_gist/btree_float4.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@ gbt_float4_penalty(PG_FUNCTION_ARGS)
190190
penalty_num(result, origentry->lower, origentry->upper, newentry->lower, newentry->upper);
191191

192192
PG_RETURN_POINTER(result);
193-
194193
}
195194

196195
Datum

‎contrib/btree_gist/btree_float8.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@ gbt_float8_penalty(PG_FUNCTION_ARGS)
197197
penalty_num(result, origentry->lower, origentry->upper, newentry->lower, newentry->upper);
198198

199199
PG_RETURN_POINTER(result);
200-
201200
}
202201

203202
Datum

‎contrib/btree_gist/btree_inet.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ gbt_inet_penalty(PG_FUNCTION_ARGS)
165165
penalty_num(result, origentry->lower, origentry->upper, newentry->lower, newentry->upper);
166166

167167
PG_RETURN_POINTER(result);
168-
169168
}
170169

171170
Datum

‎contrib/btree_gist/btree_interval.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,6 @@ gbt_intv_compress(PG_FUNCTION_ARGS)
173173
}
174174

175175
PG_RETURN_POINTER(retval);
176-
177176
}
178177

179178
Datum
@@ -276,7 +275,6 @@ gbt_intv_penalty(PG_FUNCTION_ARGS)
276275
penalty_num(result, iorg[0], iorg[1], inew[0], inew[1]);
277276

278277
PG_RETURN_POINTER(result);
279-
280278
}
281279

282280
Datum

‎contrib/btree_gist/btree_macaddr.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ gbt_macad_penalty(PG_FUNCTION_ARGS)
174174
penalty_num(result, iorg[0], iorg[1], inew[0], inew[1]);
175175

176176
PG_RETURN_POINTER(result);
177-
178177
}
179178

180179
Datum

‎contrib/btree_gist/btree_macaddr8.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ gbt_macad8_penalty(PG_FUNCTION_ARGS)
174174
penalty_num(result, iorg[0], iorg[1], inew[0], inew[1]);
175175

176176
PG_RETURN_POINTER(result);
177-
178177
}
179178

180179
Datum

‎contrib/btree_gist/btree_ts.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,6 @@ gbt_ts_penalty(PG_FUNCTION_ARGS)
377377
penalty_num(result, orgdbl[0], orgdbl[1], newdbl[0], newdbl[1]);
378378

379379
PG_RETURN_POINTER(result);
380-
381380
}
382381

383382

‎contrib/dblink/dblink.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,7 +1004,6 @@ materializeResult(FunctionCallInfo fcinfo, PGconn *conn, PGresult *res)
10041004

10051005
/* clean up GUC settings, if we changed any */
10061006
restoreLocalGucs(nestlevel);
1007-
10081007
}
10091008
}
10101009
PG_FINALLY();
@@ -2635,7 +2634,6 @@ deleteConnection(const char *name)
26352634
ereport(ERROR,
26362635
(errcode(ERRCODE_UNDEFINED_OBJECT),
26372636
errmsg("undefined connection name")));
2638-
26392637
}
26402638

26412639
static void

‎contrib/intarray/_int_bool.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,6 @@ makepol(WORKSTATE *state)
210210
(errcode(ERRCODE_SYNTAX_ERROR),
211211
errmsg("syntax error")));
212212
return ERR;
213-
214213
}
215214
}
216215

‎contrib/ltree/ltxtquery_io.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,6 @@ makepol(QPRS_STATE *state)
260260
errmsg("syntax error")));
261261

262262
return ERR;
263-
264263
}
265264
}
266265
while (lenstack)

‎contrib/pg_stat_statements/pg_stat_statements.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1849,7 +1849,6 @@ pg_stat_statements_internal(FunctionCallInfo fcinfo,
18491849

18501850
if (qbuffer)
18511851
free(qbuffer);
1852-
18531852
}
18541853

18551854
/* Number of output arguments (columns) for pg_stat_statements_info */

‎contrib/postgres_fdw/connection.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1734,7 +1734,6 @@ postgres_fdw_get_connections(PG_FUNCTION_ARGS)
17341734
tuplestore_putvalues(rsinfo->setResult, rsinfo->setDesc, values, nulls);
17351735
}
17361736

1737-
17381737
PG_RETURN_VOID();
17391738
}
17401739

‎contrib/spi/refint.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -497,12 +497,10 @@ check_foreign_key(PG_FUNCTION_ARGS)
497497
nv, (is_char_type > 0) ? "'" : "", (k < nkeys) ? ", " : "");
498498
}
499499
strcat(sql, " where ");
500-
501500
}
502501
else
503502
/* DELETE */
504503
snprintf(sql, sizeof(sql), "delete from %s where ", relname);
505-
506504
}
507505

508506
/*

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,6 @@ typedef struct BloomFilter
257257

258258
/* data of the bloom filter */
259259
char data[FLEXIBLE_ARRAY_MEMBER];
260-
261260
} BloomFilter;
262261

263262

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,6 @@ ginPlaceToPage(GinBtree btree, GinBtreeStack *stack,
527527
BufferGetBlockNumber(stack->buffer),
528528
BufferGetBlockNumber(rbuffer));
529529
}
530-
531530
}
532531
else
533532
{

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8481,7 +8481,6 @@ log_heap_new_cid(Relation relation, HeapTuple tup)
84818481
{
84828482
xlrec.cmin = InvalidCommandId;
84838483
xlrec.cmax = HeapTupleHeaderGetRawCommandId(hdr);
8484-
84858484
}
84868485
xlrec.combocid = InvalidCommandId;
84878486
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2073,7 +2073,6 @@ lazy_scan_noprune(LVRelState *vacrel,
20732073
elog(ERROR, "unexpected HeapTupleSatisfiesVacuum result");
20742074
break;
20752075
}
2076-
20772076
}
20782077

20792078
vacrel->offnum = InvalidOffsetNumber;

‎src/backend/access/nbtree/nbtsplitloc.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ typedef struct
3535
/* split point identifying fields (returned by _bt_findsplitloc) */
3636
OffsetNumber firstrightoff; /* first origpage item on rightpage */
3737
bool newitemonleft; /* new item goes on left, or right? */
38-
3938
} SplitPoint;
4039

4140
typedef struct

‎src/backend/access/nbtree/nbtutils.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2116,14 +2116,12 @@ btoptions(Datum reloptions, bool validate)
21162116
offsetof(BTOptions, vacuum_cleanup_index_scale_factor)},
21172117
{"deduplicate_items", RELOPT_TYPE_BOOL,
21182118
offsetof(BTOptions, deduplicate_items)}
2119-
21202119
};
21212120

21222121
return (bytea *) build_reloptions(reloptions, validate,
21232122
RELOPT_KIND_BTREE,
21242123
sizeof(BTOptions),
21252124
tab, lengthof(tab));
2126-
21272125
}
21282126

21292127
/*
@@ -2591,7 +2589,6 @@ _bt_check_natts(Relation rel, bool heapkeyspace, Page page, OffsetNumber offnum)
25912589

25922590
/* Use generic heapkeyspace pivot tuple handling */
25932591
}
2594-
25952592
}
25962593

25972594
/* Handle heapkeyspace pivot tuples (excluding minus infinity items) */

‎src/backend/access/rmgrdesc/gistdesc.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ out_gistxlogDelete(StringInfo buf, gistxlogDelete *xlrec)
3838
{
3939
appendStringInfo(buf, "delete: latestRemovedXid %u, nitems: %u",
4040
xlrec->latestRemovedXid, xlrec->ntodelete);
41-
4241
}
4342

4443
static void

‎src/backend/access/spgist/spgutils.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -747,7 +747,6 @@ spgoptions(Datum reloptions, bool validate)
747747
RELOPT_KIND_SPGIST,
748748
sizeof(SpGistOptions),
749749
tab, lengthof(tab));
750-
751750
}
752751

753752
/*

‎src/backend/access/table/tableam.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,6 @@ simple_table_tuple_update(Relation rel, ItemPointer otid,
381381
elog(ERROR, "unrecognized table_tuple_update status: %u", result);
382382
break;
383383
}
384-
385384
}
386385

387386

‎src/backend/access/transam/xlogrecovery.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1790,7 +1790,6 @@ PerformWalRecovery(void)
17901790
/* there are no WAL records following the checkpoint */
17911791
ereport(LOG,
17921792
(errmsg("redo is not required")));
1793-
17941793
}
17951794

17961795
/*

‎src/backend/catalog/objectaddress.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,7 +1007,6 @@ get_object_address(ObjectType objtype, Node *object,
10071007
address.objectId = get_domain_constraint_oid(domaddr.objectId,
10081008
constrname, missing_ok);
10091009
address.objectSubId = 0;
1010-
10111010
}
10121011
break;
10131012
case OBJECT_DATABASE:
@@ -5621,7 +5620,6 @@ getObjectIdentityParts(const ObjectAddress *object,
56215620
systable_endscan(rcscan);
56225621
table_close(defaclrel, AccessShareLock);
56235622
break;
5624-
56255623
}
56265624

56275625
defacl = (Form_pg_default_acl) GETSTRUCT(tup);

‎src/backend/catalog/pg_attrdef.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ StoreAttrDefault(Relation rel, AttrNumber attnum,
167167

168168
if (!missingIsNull)
169169
pfree(DatumGetPointer(missingval));
170-
171170
}
172171
table_close(attrrel, RowExclusiveLock);
173172
heap_freetuple(atttup);

‎src/backend/commands/copyto.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ typedef struct CopyToStateData
9797
FmgrInfo *out_functions; /* lookup info for output functions */
9898
MemoryContext rowcontext; /* per-row evaluation context */
9999
uint64 bytes_processed; /* number of bytes processed so far */
100-
101100
} CopyToStateData;
102101

103102
/* DestReceiver for COPY (query) TO */

‎src/backend/commands/subscriptioncmds.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1570,7 +1570,6 @@ DropSubscription(DropSubscriptionStmt *stmt, bool isTopLevel)
15701570
*/
15711571
if (slotname)
15721572
ReplicationSlotDropAtPubNode(wrconn, slotname, false);
1573-
15741573
}
15751574
PG_FINALLY();
15761575
{

‎src/backend/commands/tablecmds.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -945,7 +945,6 @@ DefineRelation(CreateStmt *stmt, char relkind, Oid ownerId,
945945
ereport(ERROR,
946946
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
947947
errmsg("specifying a table access method is not supported on a partitioned table")));
948-
949948
}
950949
else if (RELKIND_HAS_TABLE_AM(relkind))
951950
accessMethod = default_table_access_method;
@@ -3773,7 +3772,6 @@ RenameConstraint(RenameStmt *stmt)
37733772
stmt->relation->inh), /* recursive? */
37743773
false, /* recursing? */
37753774
0 /* expected inhcount */ );
3776-
37773775
}
37783776

37793777
/*
@@ -17451,7 +17449,6 @@ ComputePartitionAttrs(ParseState *pstate, Relation rel, List *partParams, AttrNu
1745117449
errmsg("data type %s has no default operator class for access method \"%s\"",
1745217450
format_type_be(atttype), "btree"),
1745317451
errhint("You must specify a btree operator class or define a default btree operator class for the data type.")));
17454-
1745517452
}
1745617453
}
1745717454
else

‎src/backend/executor/execParallel.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1439,7 +1439,6 @@ ParallelQueryMain(dsm_segment *seg, shm_toc *toc)
14391439

14401440
paramexec_space = dsa_get_address(area, fpes->param_exec);
14411441
RestoreParamExecParams(paramexec_space, queryDesc->estate);
1442-
14431442
}
14441443
pwcxt.toc = toc;
14451444
pwcxt.seg = seg;

‎src/backend/executor/execReplication.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,6 @@ ExecSimpleRelationDelete(ResultRelInfo *resultRelInfo,
548548
{
549549
skip_tuple = !ExecBRDeleteTriggers(estate, epqstate, resultRelInfo,
550550
tid, NULL, NULL);
551-
552551
}
553552

554553
if (!skip_tuple)

‎src/backend/executor/nodeAgg.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4119,7 +4119,6 @@ build_pertrans_for_aggref(AggStatePerTrans pertrans,
41194119
2,
41204120
InvalidOid,
41214121
(void *) aggstate, NULL);
4122-
41234122
}
41244123

41254124
/*

‎src/backend/executor/nodeMergejoin.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1674,5 +1674,4 @@ ExecReScanMergeJoin(MergeJoinState *node)
16741674
ExecReScan(node->js.ps.lefttree);
16751675
if (node->js.ps.righttree->chgParam == NULL)
16761676
ExecReScan(node->js.ps.righttree);
1677-
16781677
}

‎src/backend/jit/llvm/llvmjit_deform.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,6 @@ slot_compile_deform(LLVMJitContext *context, TupleDesc desc,
192192
v_tupleheaderp =
193193
l_load_struct_gep(b, v_heapslot, FIELDNO_HEAPTUPLETABLESLOT_TUPLE,
194194
"tupleheader");
195-
196195
}
197196
else if (ops == &TTSOpsMinimalTuple)
198197
{
@@ -357,7 +356,6 @@ slot_compile_deform(LLVMJitContext *context, TupleDesc desc,
357356

358357
LLVMAddCase(v_switch, v_attno, attcheckattnoblocks[attnum]);
359358
}
360-
361359
}
362360
else
363361
{

‎src/backend/jit/llvm/llvmjit_expr.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2173,7 +2173,6 @@ llvm_compile_expr(ExprState *state)
21732173
"");
21742174

21752175
LLVMBuildBr(b, opblocks[opno + 1]);
2176-
21772176
}
21782177

21792178
LLVMPositionBuilderAtEnd(b, b_no_init);

‎src/backend/libpq/hba.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1775,7 +1775,6 @@ parse_hba_auth_opt(char *name, char *val, HbaLine *hbaline,
17751775
hbaline->pam_use_hostname = true;
17761776
else
17771777
hbaline->pam_use_hostname = false;
1778-
17791778
}
17801779
else if (strcmp(name, "ldapurl") == 0)
17811780
{

‎src/backend/optimizer/geqo/geqo_cx.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ cx(PlannerInfo *root, Gene *tour1, Gene *tour2, Gene *offspring,
115115
for (i = 0; i < num_gene; i++)
116116
if (tour1[i] != offspring[i])
117117
num_diffs++;
118-
119118
}
120119

121120
return num_diffs;

‎src/backend/optimizer/geqo/geqo_erx.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,11 +222,9 @@ gimme_tour(PlannerInfo *root, Edge *edge_table, Gene *new_gene, int num_gene)
222222

223223
/* mark this node as incorporated */
224224
edge_table[(int) new_gene[i - 1]].unused_edges = -1;
225-
226225
} /* for (i=1; i<num_gene; i++) */
227226

228227
return edge_failures;
229-
230228
}
231229

232230
/* remove_gene
@@ -337,7 +335,6 @@ gimme_gene(PlannerInfo *root, Edge edge, Edge *edge_table)
337335
elog(ERROR, "minimum_count not set");
338336
else if (edge_table[(int) friend].unused_edges == minimum_edges)
339337
minimum_count++;
340-
341338
} /* for (i=0; i<edge.unused_edges; i++) */
342339

343340

‎src/backend/optimizer/geqo/geqo_ox1.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ ox1(PlannerInfo *root, Gene *tour1, Gene *tour2, Gene *offspring, int num_gene,
8989
}
9090
p = (p + 1) % num_gene; /* increment tour2-index */
9191
}
92-
9392
}
9493

9594
#endif /* defined(OX1) */

0 commit comments

Comments
 (0)