From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sun, 3 Nov 2019 21:10:23 +0000 (-0500)
Subject: Suppress warning from older compilers.
X-Git-Tag: REL9_6_16~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d43bd9dce854ff8c2a088999dd860b05d19ebc5a;p=thirdparty%2Fpostgresql.git

Suppress warning from older compilers.

Commit 8af1624e3 introduced a warning about possibly returning
without a value, on compilers that don't realize that ereport(ERROR)
doesn't return.  Tweak the code to avoid that.

Per buildfarm.  Back-patch to 9.6, like the aforesaid commit.
---

diff --git a/src/backend/tsearch/spell.c b/src/backend/tsearch/spell.c
index 07feb68449c..27a852a06af 100644
--- a/src/backend/tsearch/spell.c
+++ b/src/backend/tsearch/spell.c
@@ -1173,8 +1173,7 @@ getAffixFlagSet(IspellDict *Conf, char *s)
 			ereport(ERROR,
 					(errcode(ERRCODE_CONFIG_FILE_ERROR),
 					 errmsg("invalid affix alias \"%s\"", s)));
-		else
-			return VoidString;
+		return VoidString;
 	}
 	else
 		return s;