Fix "variable not used" warnings when USE_WIDE_UPPER_LOWER is not

bmomjian · bmomjian · commit 135724ec357f · 2011-02-10T16:58:02.000-05:00
defined.
diff --git a/src/backend/tsearch/ts_locale.c b/src/backend/tsearch/ts_locale.c
@@ -243,7 +243,9 @@ char *
 lowerstr_with_len(const char *str, int len)
 {
 	char	   *out;
+#ifdef USE_WIDE_UPPER_LOWER
 	Oid			collation = DEFAULT_COLLATION_OID; /*TODO*/
+#endif
 
 	if (len == 0)
 		return pstrdup("");
diff --git a/src/backend/tsearch/wparser_def.c b/src/backend/tsearch/wparser_def.c
@@ -287,7 +287,6 @@ static TParser *
 TParserInit(char *str, int len)
 {
 	TParser    *prs = (TParser *) palloc0(sizeof(TParser));
-	Oid			collation = DEFAULT_COLLATION_OID; /*TODO*/
 
 	prs->charmaxlen = pg_database_encoding_max_length();
 	prs->str = str;
@@ -300,6 +299,8 @@ TParserInit(char *str, int len)
 	 */
 	if (prs->charmaxlen > 1)
 	{
+		Oid			collation = DEFAULT_COLLATION_OID; /*TODO*/
+		
 		prs->usewide = true;
 		if ( lc_ctype_is_c(collation) )
 		{

Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,9 @@ char *`
`243`	`243`	`lowerstr_with_len(const char *str, int len)`
`244`	`244`	`{`
`245`	`245`	`char *out;`
	`246`	`+#ifdef USE_WIDE_UPPER_LOWER`
`246`	`247`	`Oid collation = DEFAULT_COLLATION_OID; /TODO/`
	`248`	`+#endif`
`247`	`249`
`248`	`250`	`if (len == 0)`
`249`	`251`	`return pstrdup("");`
Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,6 @@ static TParser *`
`287`	`287`	`TParserInit(char *str, int len)`
`288`	`288`	`{`
`289`	`289`	`TParser prs = (TParser ) palloc0(sizeof(TParser));`
`290`		`- Oid collation = DEFAULT_COLLATION_OID; /TODO/`
`291`	`290`
`292`	`291`	`prs->charmaxlen = pg_database_encoding_max_length();`
`293`	`292`	`prs->str = str;`
`@@ -300,6 +299,8 @@ TParserInit(char *str, int len)`
`300`	`299`	`*/`
`301`	`300`	`if (prs->charmaxlen > 1)`
`302`	`301`	`{`
	`302`	`+ Oid collation = DEFAULT_COLLATION_OID; /TODO/`
	`303`	`+`
`303`	`304`	`prs->usewide = true;`
`304`	`305`	`if ( lc_ctype_is_c(collation) )`
`305`	`306`	`{`