Fix compiler warning.

jeff-davis · jeff-davis · commit 56b1e88c804b · 2024-10-23T10:24:17.000-07:00
Some buildfarm members complained about an always-true test in the SOFT_ERROR_OCCURRED macro. Fix by reading the field directly rather than using the macro. Reported-by: Tom Lane Discussion: https://postgr.es/m/2144895.1729653514@sss.pgh.pa.us
diff --git a/src/backend/statistics/attribute_stats.c b/src/backend/statistics/attribute_stats.c
@@ -633,7 +633,7 @@ text_to_stavalues(const char *staname, FmgrInfo *array_in, Datum d, Oid typid,
 
 	pfree(s);
 
-	if (SOFT_ERROR_OCCURRED(&escontext))
+	if (escontext.error_occurred)
 	{
 		if (elevel != ERROR)
 			escontext.error_data->elevel = elevel;

Original file line number	Diff line number	Diff line change
`@@ -633,7 +633,7 @@ text_to_stavalues(const char staname, FmgrInfo array_in, Datum d, Oid typid,`
`633`	`633`
`634`	`634`	`pfree(s);`
`635`	`635`
`636`		`- if (SOFT_ERROR_OCCURRED(&escontext))`
	`636`	`+ if (escontext.error_occurred)`
`637`	`637`	`{`
`638`	`638`	`if (elevel != ERROR)`
`639`	`639`	`escontext.error_data->elevel = elevel;`