Small cleanups in SQL/JSON code

adunstan · adunstan · commit f7a605f636d6 · 2022-04-15T07:49:20.000-04:00
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.
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);

Original file line number	Diff line number	Diff line change
`@@ -2264,7 +2264,7 @@ JsonbUnquote(Jsonb *jb)`
`2264`	`2264`	`{`
`2265`	`2265`	`JsonbValue v;`
`2266`	`2266`
`2267`		`- JsonbExtractScalar(&jb->root, &v);`
	`2267`	`+ (void) JsonbExtractScalar(&jb->root, &v);`
`2268`	`2268`
`2269`	`2269`	`if (v.type == jbvString)`
`2270`	`2270`	`return pnstrdup(v.val.string.val, v.val.string.len);`