Commit61f352e

committed

Fix unreachable code warning from commit2d819a0.

1 parent5162f66 commit61f352eCopy full SHA for 61f352e

File tree

-14

lines changed

-14

lines changed

Lines changed: 9 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -2501,28 +2501,23 @@ pg_strnxfrm_prefix(char dest, size_t destsize, const char src,`
`2501`	`2501`	`returnresult;`
`2502`	`2502`	`}`
`2503`	`2503`
	`2504`	`+/*`
	`2505`	`+ * Validate the locale and encoding combination, and return the canonical form`
	`2506`	`+ * of the locale name.`
	`2507`	`+ *`
	`2508`	`+ * The only supported locale for the builtin provider is "C", and it's`
	`2509`	`+ * available for any encoding.`
	`2510`	`+ */`
`2504`	`2511`	`constchar*`
`2505`	`2512`	`builtin_validate_locale(intencoding,constchar*locale)`
`2506`	`2513`	`{`
`2507`		`-constchar*canonical_name=NULL;`
`2508`		`-intrequired_encoding=-1;`
`2509`		`-`
`2510`		`-if (strcmp(locale,"C")==0)`
`2511`		`-canonical_name="C";`
`2512`		`-`
`2513`		`-if (!canonical_name)`
	`2514`	`+if (strcmp(locale,"C")!=0)`
`2514`	`2515`	`ereport(ERROR,`
`2515`	`2516`	`(errcode(ERRCODE_WRONG_OBJECT_TYPE),`
`2516`	`2517`	`errmsg("invalid locale name \"%s\" for builtin provider",`
`2517`	`2518`	`locale)));`
`2518`	`2519`
`2519`		`-if (required_encoding >=0&&encoding!=required_encoding)`
`2520`		`-ereport(ERROR,`
`2521`		`-(errcode(ERRCODE_WRONG_OBJECT_TYPE),`
`2522`		`-errmsg("encoding \"%s\" does not match locale \"%s\"",`
`2523`		`-pg_encoding_to_char(encoding),locale)));`
`2524`		`-`
`2525`		`-returncanonical_name;`
	`2520`	`+return"C";`
`2526`	`2521`	`}`
`2527`	`2522`
`2528`	`2523`

Comments

(0)