Adjust mbutils.c so it won't get broken by future pgindent runs.

tglsfdc · tglsfdc · commit 5b1b3ef74272 · 2010-07-07T15:13:21.000Z
To do that, replace L'\0' by (WCHAR) 0.  Perhaps someday we should teach
pgindent about wide-character literals, but so long as this is the only
use-case in the entire Postgres sources, a workaround seems easier.
diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c
@@ -4,7 +4,7 @@
  *
  * Tatsuo Ishii
  *
- * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.97 2010/07/06 21:09:00 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.98 2010/07/07 15:13:21 tgl Exp $
  */
 #include "postgres.h"
 
@@ -1016,7 +1016,7 @@ pgwin32_toUTF16(const char *str, int len, int *utf16len)
 	{
 		utf16 = (WCHAR *) palloc(sizeof(WCHAR) * (len + 1));
 		dstlen = MultiByteToWideChar(codepage, 0, str, len, utf16, len);
-		utf16[dstlen] = L'\0';
+		utf16[dstlen] = (WCHAR) 0;
 	}
 	else
 	{
@@ -1029,7 +1029,7 @@ pgwin32_toUTF16(const char *str, int len, int *utf16len)
 
 		utf16 = (WCHAR *) palloc(sizeof(WCHAR) * (len + 1));
 		dstlen = MultiByteToWideChar(CP_UTF8, 0, utf8, len, utf16, len);
-		utf16[dstlen] = L'\0';
+		utf16[dstlen] = (WCHAR) 0;
 
 		if (utf8 != str)
 			pfree(utf8);

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`*`
`5`	`5`	`* Tatsuo Ishii`
`6`	`6`	`*`
`7`		`- * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.97 2010/07/06 21:09:00 tgl Exp $`
	`7`	`+ * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.98 2010/07/07 15:13:21 tgl Exp $`
`8`	`8`	`*/`
`9`	`9`	`#include "postgres.h"`
`10`	`10`
`@@ -1016,7 +1016,7 @@ pgwin32_toUTF16(const char str, int len, int utf16len)`
`1016`	`1016`	`{`
`1017`	`1017`	`utf16 = (WCHAR ) palloc(sizeof(WCHAR) (len + 1));`
`1018`	`1018`	`dstlen = MultiByteToWideChar(codepage, 0, str, len, utf16, len);`
`1019`		`- utf16[dstlen] = L'\0';`
	`1019`	`+ utf16[dstlen] = (WCHAR) 0;`
`1020`	`1020`	`}`
`1021`	`1021`	`else`
`1022`	`1022`	`{`
`@@ -1029,7 +1029,7 @@ pgwin32_toUTF16(const char str, int len, int utf16len)`
`1029`	`1029`
`1030`	`1030`	`utf16 = (WCHAR ) palloc(sizeof(WCHAR) (len + 1));`
`1031`	`1031`	`dstlen = MultiByteToWideChar(CP_UTF8, 0, utf8, len, utf16, len);`
`1032`		`- utf16[dstlen] = L'\0';`
	`1032`	`+ utf16[dstlen] = (WCHAR) 0;`
`1033`	`1033`
`1034`	`1034`	`if (utf8 != str)`
`1035`	`1035`	`pfree(utf8);`