postgres.git / summary / log / commit / refs

commit    50ab76d3c19c95589f4eb19683e25cb88a2506e2
Author:   Andrew Dunstan <andrew@dunslane.net>
Date:     Mon Jun 01 02:56:53 2015 +0000
First released in: 9.5.0

    Avoid naming a variable "new", and remove bogus initializer.
    
    Per gripe from Tom Lane.


 src/backend/utils/adt/jsonfuncs.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c
index 15799701ba1..f87ba77e3eb 100644
--- a/src/backend/utils/adt/jsonfuncs.c
+++ b/src/backend/utils/adt/jsonfuncs.c
@@ -3716,13 +3716,13 @@ setPathObject(JsonbIterator **it, Datum *path_elems, bool *path_nulls,
 	/* empty object is a special case for create */
 	if ((npairs == 0) && create && (level == path_len - 1))
 	{
-		JsonbValue	new = k;
+		JsonbValue	newkey;
 
-		new.type = jbvString;
-		new.val.string.len = VARSIZE_ANY_EXHDR(path_elems[level]);
-		new.val.string.val = VARDATA_ANY(path_elems[level]);
+		newkey.type = jbvString;
+		newkey.val.string.len = VARSIZE_ANY_EXHDR(path_elems[level]);
+		newkey.val.string.val = VARDATA_ANY(path_elems[level]);
 
-		(void) pushJsonbValue(st, WJB_KEY, &new);
+		(void) pushJsonbValue(st, WJB_KEY, &newkey);
 		addJsonbToParseState(st, newval);
 	}
 
@@ -3758,13 +3758,13 @@ setPathObject(JsonbIterator **it, Datum *path_elems, bool *path_nulls,
 		{
 			if (create && !done && level == path_len - 1 && i == npairs - 1)
 			{
-				JsonbValue	new = k;
+				JsonbValue	newkey;
 
-				new.type = jbvString;
-				new.val.string.len = VARSIZE_ANY_EXHDR(path_elems[level]);
-				new.val.string.val = VARDATA_ANY(path_elems[level]);
+				newkey.type = jbvString;
+				newkey.val.string.len = VARSIZE_ANY_EXHDR(path_elems[level]);
+				newkey.val.string.val = VARDATA_ANY(path_elems[level]);
 
-				(void) pushJsonbValue(st, WJB_KEY, &new);
+				(void) pushJsonbValue(st, WJB_KEY, &newkey);
 				addJsonbToParseState(st, newval);
 			}
 


[parent: 28b29f7e4453]