Remove a couple of unnecessary scopes

diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c
index c45230877b3fb4ec28d34923ae820553a10f7321..c87ddc5d0518a4cae9502f26d2cc0968705a513e 100644 (file)
--- a/src/backend/utils/adt/jsonfuncs.c
+++ b/src/backend/utils/adt/jsonfuncs.c
@@ -2228,13 +2228,10 @@ populate_record_worker(FunctionCallInfo fcinfo, bool have_record_arg)
        }
        else
        {
-           {
-               char       *key = NameStr(tupdesc->attrs[i]->attname);
+           char       *key = NameStr(tupdesc->attrs[i]->attname);
 
-               v = findJsonbValueFromSuperHeaderLen(VARDATA(jb),
-                                                    JB_FOBJECT, NULL, key,
-                                                    strlen(key));
-           }
+           v = findJsonbValueFromSuperHeaderLen(VARDATA(jb), JB_FOBJECT, NULL,
+                                                key, strlen(key));
        }
 
        /*
@@ -2514,6 +2511,7 @@ make_row_from_rec_and_jsonb(Jsonb * element, PopulateRecordsetState *state)
        ColumnIOData *column_info = &my_extra->columns[i];
        Oid         column_type = tupdesc->attrs[i]->atttypid;
        JsonbValue *v = NULL;
+       char       *key;
 
        /* Ignore dropped columns in datatype */
        if (tupdesc->attrs[i]->attisdropped)
@@ -2522,13 +2520,10 @@ make_row_from_rec_and_jsonb(Jsonb * element, PopulateRecordsetState *state)
            continue;
        }
 
-       {
-           char       *key = NameStr(tupdesc->attrs[i]->attname);
+       key = NameStr(tupdesc->attrs[i]->attname);
 
-           v = findJsonbValueFromSuperHeaderLen(VARDATA(element),
-                                                JB_FOBJECT, NULL, key,
-                                                strlen(key));
-       }
+       v = findJsonbValueFromSuperHeaderLen(VARDATA(element), JB_FOBJECT,
+                                            NULL, key, strlen(key));
 
        /*
         * We can't just skip here if the key wasn't found since we might have