mirror of
https://github.com/postgres/postgres.git
synced 2025-11-19 13:42:17 +03:00
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
This commit is contained in:
@@ -328,7 +328,6 @@ pgstat_prep_database_pending(Oid dboid)
|
||||
NULL);
|
||||
|
||||
return entry_ref->pending;
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@@ -3094,7 +3094,6 @@ convert_database_priv_string(text *priv_type_text)
|
||||
};
|
||||
|
||||
return convert_any_priv_string(priv_type_text, database_priv_map);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -1489,7 +1489,6 @@ json_object(PG_FUNCTION_ARGS)
|
||||
pfree(result.data);
|
||||
|
||||
PG_RETURN_TEXT_P(rval);
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@@ -851,7 +851,6 @@ datum_to_jsonb(Datum val, bool is_null, JsonbInState *result,
|
||||
sem.object_field_start = jsonb_in_object_field_start;
|
||||
|
||||
pg_parse_json_or_ereport(lex, &sem);
|
||||
|
||||
}
|
||||
break;
|
||||
case JSONBTYPE_JSONB:
|
||||
|
||||
@@ -4168,7 +4168,6 @@ json_strip_nulls(PG_FUNCTION_ARGS)
|
||||
|
||||
PG_RETURN_TEXT_P(cstring_to_text_with_len(state->strval->data,
|
||||
state->strval->len));
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@@ -1181,7 +1181,6 @@ multirange_minus_internal(Oid mltrngtypoid, TypeCacheEntry *rangetyp,
|
||||
*/
|
||||
range_count3++;
|
||||
r2 = ++i2 >= range_count2 ? NULL : ranges2[i2];
|
||||
|
||||
}
|
||||
else if (range_overlaps_internal(rangetyp, r1, r2))
|
||||
{
|
||||
@@ -1200,7 +1199,6 @@ multirange_minus_internal(Oid mltrngtypoid, TypeCacheEntry *rangetyp,
|
||||
break;
|
||||
else
|
||||
r2 = ++i2 >= range_count2 ? NULL : ranges2[i2];
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -868,7 +868,6 @@ translate(PG_FUNCTION_ARGS)
|
||||
target += len;
|
||||
retlen += len;
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -9440,7 +9440,6 @@ get_rule_expr(Node *node, deparse_context *context,
|
||||
get_rule_expr_paren((Node *) xexpr->args, context, false, node);
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
if (xexpr->op == IS_XMLSERIALIZE)
|
||||
appendStringInfo(buf, " AS %s",
|
||||
|
||||
@@ -3628,7 +3628,6 @@ estimate_num_groups_incremental(PlannerInfo *root, List *groupExprs,
|
||||
*/
|
||||
if (estinfo != NULL && varinfo2->isdefault)
|
||||
estinfo->flags |= SELFLAG_USED_DEFAULT;
|
||||
|
||||
}
|
||||
|
||||
/* we're done with this relation */
|
||||
|
||||
@@ -4898,7 +4898,6 @@ timestamp_part_common(PG_FUNCTION_ARGS, bool retnumeric)
|
||||
lowunits, format_type_be(TIMESTAMPOID))));
|
||||
intresult = 0;
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -5123,7 +5122,6 @@ timestamptz_part_common(PG_FUNCTION_ARGS, bool retnumeric)
|
||||
lowunits, format_type_be(TIMESTAMPTZOID))));
|
||||
intresult = 0;
|
||||
}
|
||||
|
||||
}
|
||||
else if (type == RESERV)
|
||||
{
|
||||
|
||||
@@ -2196,7 +2196,6 @@ insertStatEntry(MemoryContext persistentContext, TSVectorStat *stat, TSVector tx
|
||||
else
|
||||
pnode->right = node;
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
2
src/backend/utils/cache/catcache.c
vendored
2
src/backend/utils/cache/catcache.c
vendored
@@ -1710,7 +1710,6 @@ SearchCatCacheList(CatCache *cache,
|
||||
* we'd better do so before we start marking the members as belonging
|
||||
* to the list.
|
||||
*/
|
||||
|
||||
}
|
||||
PG_CATCH();
|
||||
{
|
||||
@@ -1962,7 +1961,6 @@ CatCacheCopyKeys(TupleDesc tupdesc, int nkeys, int *attnos,
|
||||
att->attbyval,
|
||||
att->attlen);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@@ -2683,7 +2683,6 @@ log_line_prefix(StringInfo buf, ErrorData *edata)
|
||||
appendStringInfo(buf, "%*s", padding, psdisp);
|
||||
else
|
||||
appendBinaryStringInfo(buf, psdisp, displen);
|
||||
|
||||
}
|
||||
else if (padding != 0)
|
||||
appendStringInfoSpaces(buf,
|
||||
@@ -2722,7 +2721,6 @@ log_line_prefix(StringInfo buf, ErrorData *edata)
|
||||
appendStringInfo(buf, "(%s)",
|
||||
MyProcPort->remote_port);
|
||||
}
|
||||
|
||||
}
|
||||
else if (padding != 0)
|
||||
appendStringInfoSpaces(buf,
|
||||
|
||||
@@ -5906,7 +5906,6 @@ InitializeWalConsistencyChecking(void)
|
||||
/* checking should not be deferred again */
|
||||
Assert(!check_wal_consistency_checking_deferred);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@@ -620,7 +620,6 @@ GenerationBlockMarkEmpty(GenerationBlock *block)
|
||||
block->nchunks = 0;
|
||||
block->nfree = 0;
|
||||
block->freeptr = ((char *) block) + Generation_BLOCKHDRSZ;
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@@ -896,7 +896,6 @@ CreateAuxProcessResourceOwner(void)
|
||||
* owner. (This needs to run after, e.g., ShutdownXLOG.)
|
||||
*/
|
||||
on_shmem_exit(ReleaseAuxProcessResourcesCallback, 0);
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@@ -3186,7 +3186,6 @@ mergeonerun(Tuplesortstate *state)
|
||||
{
|
||||
stup.srctape = srcTapeIndex;
|
||||
tuplesort_heap_replace_top(state, &stup);
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user