From 5dc456b7dda4f7d0d7735b066607c190c74d174a Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Fri, 11 Aug 2023 20:43:34 +0900 Subject: [PATCH] Fix code indentation violations introduced by recent commit The two culprit commits are 5765cfe and 5e0c761. Per buildfarm member koel for the first commit, while I have noticed the second one in passing. --- src/backend/utils/fmgr/fmgr.c | 15 ++++++++------- src/backend/utils/misc/guc.c | 12 ++++++------ src/bin/pgbench/pgbench.c | 2 +- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/backend/utils/fmgr/fmgr.c b/src/backend/utils/fmgr/fmgr.c index 6b2d7d7be3..9dfdf890c5 100644 --- a/src/backend/utils/fmgr/fmgr.c +++ b/src/backend/utils/fmgr/fmgr.c @@ -669,7 +669,8 @@ fmgr_security_definer(PG_FUNCTION_ARGS) &isnull); if (!isnull) { - ArrayType *array; + ArrayType *array; + oldcxt = MemoryContextSwitchTo(fcinfo->flinfo->fn_mcxt); array = DatumGetArrayTypeP(datum); TransformGUCArray(array, &fcache->configNames, @@ -686,7 +687,7 @@ fmgr_security_definer(PG_FUNCTION_ARGS) /* GetUserIdAndSecContext is cheap enough that no harm in a wasted call */ GetUserIdAndSecContext(&save_userid, &save_sec_context); - if (fcache->configNames != NIL) /* Need a new GUC nesting level */ + if (fcache->configNames != NIL) /* Need a new GUC nesting level */ save_nestlevel = NewGUCNestLevel(); else save_nestlevel = 0; /* keep compiler quiet */ @@ -697,11 +698,11 @@ fmgr_security_definer(PG_FUNCTION_ARGS) forboth(lc1, fcache->configNames, lc2, fcache->configValues) { - GucContext context = superuser() ? PGC_SUSET : PGC_USERSET; - GucSource source = PGC_S_SESSION; - GucAction action = GUC_ACTION_SAVE; - char *name = lfirst(lc1); - char *value = lfirst(lc2); + GucContext context = superuser() ? PGC_SUSET : PGC_USERSET; + GucSource source = PGC_S_SESSION; + GucAction action = GUC_ACTION_SAVE; + char *name = lfirst(lc1); + char *value = lfirst(lc2); (void) set_config_option(name, value, context, source, diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 3449470953..99bb2fdd19 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -6280,16 +6280,16 @@ void ProcessGUCArray(ArrayType *array, GucContext context, GucSource source, GucAction action) { - List *gucNames; - List *gucValues; - ListCell *lc1; - ListCell *lc2; + List *gucNames; + List *gucValues; + ListCell *lc1; + ListCell *lc2; TransformGUCArray(array, &gucNames, &gucValues); forboth(lc1, gucNames, lc2, gucValues) { - char *name = lfirst(lc1); - char *value = lfirst(lc2); + char *name = lfirst(lc1); + char *value = lfirst(lc2); (void) set_config_option(name, value, context, source, diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c index d2b7fc87e4..763c4b946a 100644 --- a/src/bin/pgbench/pgbench.c +++ b/src/bin/pgbench/pgbench.c @@ -2246,7 +2246,7 @@ evalStandardFunc(CState *st, * This value is double braced to workaround GCC bug 53119, which seems to * exist at least on gcc (Debian 4.7.2-5) 4.7.2, 32-bit. */ - PgBenchValue vargs[MAX_FARGS] = { { 0 } }; + PgBenchValue vargs[MAX_FARGS] = {{0}}; for (nargs = 0; nargs < MAX_FARGS && l != NULL; nargs++, l = l->next) {