Fix MinGW %d vs %lu warnings in back branches.

macdice · macdice · commit fa92c18efe24 · 2024-11-29T11:09:18.000+13:00
Commit 352f6f2 used %d instead of %lu to format DWORD (unsigned long) with psprintf(). The _WIN32_WINNT value recently changed for MinGW in REL_15_STABLE (commit d700e8d), so the code was suddenly being compiled, with warnings from gcc. The warnings were already fixed in 16+ by commits 495ed0e and a9bc04b after the _WIN32_WINNT value was increase there. 14 and 13 didn't warn because they still use a lower value for MinGW, and supported versions of Visual Studio should compile the code in all live branches but don't check our format string. The change doesn't affect the result: sizeof(int) == sizeof(long) on this platform, and the values are computed with expressions that cannot exceed INT_MAX so were never interpreted as negative. Back-patch the formatting change from those commits into 13-15. This should turn CI's 15 branch green again and stop fairywren from warning about that on 15. Reported-by: Andres Freund <andres@anarazel.de> Reported-by: Peter Eisentraut <peter@eisentraut.org> Discussion: https://postgr.es/m/t2vjrcb3bloxf5qqvxjst6r7lvrefqyecxgt2koy5ho5b5glr2%40yuupmm6whgob
diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c
@@ -1718,7 +1718,7 @@ get_collation_actual_version(char collprovider, const char *collcollate)
 							collcollate,
 							GetLastError())));
 		}
-		collversion = psprintf("%d.%d,%d.%d",
+		collversion = psprintf("%lu.%lu,%lu.%lu",
 							   (version.dwNLSVersion >> 8) & 0xFFFF,
 							   version.dwNLSVersion & 0xFF,
 							   (version.dwDefinedVersion >> 8) & 0xFFFF,

Original file line number	Diff line number	Diff line change
`@@ -1718,7 +1718,7 @@ get_collation_actual_version(char collprovider, const char *collcollate)`
`1718`	`1718`	`collcollate,`
`1719`	`1719`	`GetLastError())));`
`1720`	`1720`	`}`
`1721`		`- collversion = psprintf("%d.%d,%d.%d",`
	`1721`	`+ collversion = psprintf("%lu.%lu,%lu.%lu",`
`1722`	`1722`	`(version.dwNLSVersion >> 8) & 0xFFFF,`
`1723`	`1723`	`version.dwNLSVersion & 0xFF,`
`1724`	`1724`	`(version.dwDefinedVersion >> 8) & 0xFFFF,`