Small cleanups in SQL/JSON code

These are to keep Coverity happy. In one case remove a redundant NULL check, and in another explicitly ignore a function result that is already known.
amazon-aurora · Apr 15, 2022 · f7a605f · f7a605f
1 parent 5cd1c40
commit f7a605f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
@@ -3569,7 +3569,7 @@ coerceJsonFuncExpr(ParseState *pstate, Node *expr,
 	location = exprLocation(expr);
 
 	if (location < 0)
-		location = returning ? returning->format->location : -1;
+		location = returning->format->location;
 
 	/* special case for RETURNING bytea FORMAT json */
 	if (returning->format->format_type == JS_FORMAT_JSON &&

diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c
@@ -2264,7 +2264,7 @@ JsonbUnquote(Jsonb *jb)
 	{
 		JsonbValue	v;
 
-		JsonbExtractScalar(&jb->root, &v);
+		(void) JsonbExtractScalar(&jb->root, &v);
 
 		if (v.type == jbvString)
 			return pnstrdup(v.val.string.val, v.val.string.len);