From: Peter Geoghegan <pg@heroku.com>
Date: Mon, 17 Mar 2014 23:25:58 +0000 (-0700)
Subject: findJsonbValueFromSuperHeader just accepts cstrings
X-Git-Url: http://git.postgresql.org/gitweb/review?a=commitdiff_plain;h=a924794c910c9b713bcf95684ed9d8c251c4fa1e;p=users%2Fandresfreund%2Fpostgres.git

findJsonbValueFromSuperHeader just accepts cstrings
---

diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c
index 64b66c427b..479912791a 100644
--- a/src/backend/utils/adt/jsonfuncs.c
+++ b/src/backend/utils/adt/jsonfuncs.c
@@ -3048,8 +3048,7 @@ populate_recordset_object_field_end(void *state, char *fname, bool isnull)
 }
 
 /*
- * findJsonbValueFromSuperHeader() wrapper that sets up JsonbValue key
- * according to our frequent requirements.
+ * findJsonbValueFromSuperHeader() wrapper that sets up JsonbValue key string.
  */
 static JsonbValue *
 findJsonbValueFromSuperHeaderLen(JsonbSuperHeader sheader, uint32 flags,
@@ -3057,16 +3056,9 @@ findJsonbValueFromSuperHeaderLen(JsonbSuperHeader sheader, uint32 flags,
 {
 	JsonbValue	k;
 
-	if (key == NULL)
-	{
-		k.type = jbvNull;
-	}
-	else
-	{
-		k.type = jbvString;
-		k.string.val = key;
-		k.string.len = keylen;
-	}
+	k.type = jbvString;
+	k.string.val = key;
+	k.string.len = keylen;
 
 	return findJsonbValueFromSuperHeader(sheader, flags, lowbound, &k);
 }