Fix build with !USE_WIDE_UPPER_LOWER

petere · petere · commit e6023ee7fa73 · 2017-09-22T09:26:38.000-04:00
The placement of the ifdef blocks in formatting.c was pretty bogus, so
the code failed to compile if USE_WIDE_UPPER_LOWER was not defined.

Reported-by: Peter Geoghegan &lt;pg@bowt.ie&gt;
Reported-by: Noah Misch &lt;noah@leadboat.com&gt;
diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c
@@ -1528,7 +1528,6 @@ str_tolower(const char *buff, size_t nbytes, Oid collid)
 	{
 		result = asc_tolower(buff, nbytes);
 	}
-#ifdef USE_WIDE_UPPER_LOWER
 	else
 	{
 		pg_locale_t mylocale = 0;
@@ -1566,6 +1565,7 @@ str_tolower(const char *buff, size_t nbytes, Oid collid)
 		else
 #endif
 		{
+#ifdef USE_WIDE_UPPER_LOWER
 			if (pg_database_encoding_max_length() > 1)
 			{
 				wchar_t    *workspace;
@@ -1603,8 +1603,8 @@ str_tolower(const char *buff, size_t nbytes, Oid collid)
 				wchar2char(result, workspace, result_size, mylocale);
 				pfree(workspace);
 			}
-#endif							/* USE_WIDE_UPPER_LOWER */
 			else
+#endif							/* USE_WIDE_UPPER_LOWER */
 			{
 				char	   *p;
 
@@ -1652,7 +1652,6 @@ str_toupper(const char *buff, size_t nbytes, Oid collid)
 	{
 		result = asc_toupper(buff, nbytes);
 	}
-#ifdef USE_WIDE_UPPER_LOWER
 	else
 	{
 		pg_locale_t mylocale = 0;
@@ -1690,6 +1689,7 @@ str_toupper(const char *buff, size_t nbytes, Oid collid)
 		else
 #endif
 		{
+#ifdef USE_WIDE_UPPER_LOWER
 			if (pg_database_encoding_max_length() > 1)
 			{
 				wchar_t    *workspace;
@@ -1727,8 +1727,8 @@ str_toupper(const char *buff, size_t nbytes, Oid collid)
 				wchar2char(result, workspace, result_size, mylocale);
 				pfree(workspace);
 			}
-#endif							/* USE_WIDE_UPPER_LOWER */
 			else
+#endif							/* USE_WIDE_UPPER_LOWER */
 			{
 				char	   *p;
 
@@ -1777,7 +1777,6 @@ str_initcap(const char *buff, size_t nbytes, Oid collid)
 	{
 		result = asc_initcap(buff, nbytes);
 	}
-#ifdef USE_WIDE_UPPER_LOWER
 	else
 	{
 		pg_locale_t mylocale = 0;
@@ -1815,6 +1814,7 @@ str_initcap(const char *buff, size_t nbytes, Oid collid)
 		else
 #endif
 		{
+#ifdef USE_WIDE_UPPER_LOWER
 			if (pg_database_encoding_max_length() > 1)
 			{
 				wchar_t    *workspace;
@@ -1864,8 +1864,8 @@ str_initcap(const char *buff, size_t nbytes, Oid collid)
 				wchar2char(result, workspace, result_size, mylocale);
 				pfree(workspace);
 			}
-#endif							/* USE_WIDE_UPPER_LOWER */
 			else
+#endif							/* USE_WIDE_UPPER_LOWER */
 			{
 				char	   *p;
 

Original file line number	Diff line number	Diff line change
`@@ -1528,7 +1528,6 @@ str_tolower(const char *buff, size_t nbytes, Oid collid)`
`1528`	`1528`	`{`
`1529`	`1529`	`result = asc_tolower(buff, nbytes);`
`1530`	`1530`	`}`
`1531`		`-#ifdef USE_WIDE_UPPER_LOWER`
`1532`	`1531`	`else`
`1533`	`1532`	`{`
`1534`	`1533`	`pg_locale_t mylocale = 0;`
`@@ -1566,6 +1565,7 @@ str_tolower(const char *buff, size_t nbytes, Oid collid)`
`1566`	`1565`	`else`
`1567`	`1566`	`#endif`
`1568`	`1567`	`{`
	`1568`	`+#ifdef USE_WIDE_UPPER_LOWER`
`1569`	`1569`	`if (pg_database_encoding_max_length() > 1)`
`1570`	`1570`	`{`
`1571`	`1571`	`wchar_t *workspace;`
`@@ -1603,8 +1603,8 @@ str_tolower(const char *buff, size_t nbytes, Oid collid)`
`1603`	`1603`	`wchar2char(result, workspace, result_size, mylocale);`
`1604`	`1604`	`pfree(workspace);`
`1605`	`1605`	`}`
`1606`		`-#endif /* USE_WIDE_UPPER_LOWER */`
`1607`	`1606`	`else`
	`1607`	`+#endif /* USE_WIDE_UPPER_LOWER */`
`1608`	`1608`	`{`
`1609`	`1609`	`char *p;`
`1610`	`1610`
`@@ -1652,7 +1652,6 @@ str_toupper(const char *buff, size_t nbytes, Oid collid)`
`1652`	`1652`	`{`
`1653`	`1653`	`result = asc_toupper(buff, nbytes);`
`1654`	`1654`	`}`
`1655`		`-#ifdef USE_WIDE_UPPER_LOWER`
`1656`	`1655`	`else`
`1657`	`1656`	`{`
`1658`	`1657`	`pg_locale_t mylocale = 0;`
`@@ -1690,6 +1689,7 @@ str_toupper(const char *buff, size_t nbytes, Oid collid)`
`1690`	`1689`	`else`
`1691`	`1690`	`#endif`
`1692`	`1691`	`{`
	`1692`	`+#ifdef USE_WIDE_UPPER_LOWER`
`1693`	`1693`	`if (pg_database_encoding_max_length() > 1)`
`1694`	`1694`	`{`
`1695`	`1695`	`wchar_t *workspace;`
`@@ -1727,8 +1727,8 @@ str_toupper(const char *buff, size_t nbytes, Oid collid)`
`1727`	`1727`	`wchar2char(result, workspace, result_size, mylocale);`
`1728`	`1728`	`pfree(workspace);`
`1729`	`1729`	`}`
`1730`		`-#endif /* USE_WIDE_UPPER_LOWER */`
`1731`	`1730`	`else`
	`1731`	`+#endif /* USE_WIDE_UPPER_LOWER */`
`1732`	`1732`	`{`
`1733`	`1733`	`char *p;`
`1734`	`1734`
`@@ -1777,7 +1777,6 @@ str_initcap(const char *buff, size_t nbytes, Oid collid)`
`1777`	`1777`	`{`
`1778`	`1778`	`result = asc_initcap(buff, nbytes);`
`1779`	`1779`	`}`
`1780`		`-#ifdef USE_WIDE_UPPER_LOWER`
`1781`	`1780`	`else`
`1782`	`1781`	`{`
`1783`	`1782`	`pg_locale_t mylocale = 0;`
`@@ -1815,6 +1814,7 @@ str_initcap(const char *buff, size_t nbytes, Oid collid)`
`1815`	`1814`	`else`
`1816`	`1815`	`#endif`
`1817`	`1816`	`{`
	`1817`	`+#ifdef USE_WIDE_UPPER_LOWER`
`1818`	`1818`	`if (pg_database_encoding_max_length() > 1)`
`1819`	`1819`	`{`
`1820`	`1820`	`wchar_t *workspace;`
`@@ -1864,8 +1864,8 @@ str_initcap(const char *buff, size_t nbytes, Oid collid)`
`1864`	`1864`	`wchar2char(result, workspace, result_size, mylocale);`
`1865`	`1865`	`pfree(workspace);`
`1866`	`1866`	`}`
`1867`		`-#endif /* USE_WIDE_UPPER_LOWER */`
`1868`	`1867`	`else`
	`1868`	`+#endif /* USE_WIDE_UPPER_LOWER */`
`1869`	`1869`	`{`
`1870`	`1870`	`char *p;`
`1871`	`1871`