Commitf7a605f

committed

Small cleanups in SQL/JSON code

These are to keep Coverity happy. In one case remove a redundant NULLcheck, and in another explicitly ignore a function result that is alreadyknown.

1 parent5cd1c40 commitf7a605fCopy full SHA for f7a605f

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3569,7 +3569,7 @@ coerceJsonFuncExpr(ParseState pstate, Node expr,`
`3569`	`3569`	`location=exprLocation(expr);`
`3570`	`3570`
`3571`	`3571`	`if (location<0)`
`3572`		`-location=returning ?returning->format->location :-1;`
	`3572`	`+location=returning->format->location;`
`3573`	`3573`
`3574`	`3574`	`/* special case for RETURNING bytea FORMAT json */`
`3575`	`3575`	`if (returning->format->format_type==JS_FORMAT_JSON&&`

Lines changed: 1 addition & 1 deletion

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

Comments

(0)