Use correct format placeholder for WSAGetLastError()

petere · petere · commit 9486844f301e · 2021-04-23T14:21:37.000+02:00
Some code thought this was unsigned, but it's signed int.
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
@@ -1594,7 +1594,7 @@ pq_setkeepaliveswin32(Port *port, int idle, int interval)
 		!= 0)
 	{
 		ereport(LOG,
-				(errmsg("WSAIoctl(%s) failed: %ui",
+				(errmsg("WSAIoctl(%s) failed: %d",
 						"SIO_KEEPALIVE_VALS", WSAGetLastError())));
 		return STATUS_ERROR;
 	}
diff --git a/src/backend/port/win32/socket.c b/src/backend/port/win32/socket.c
@@ -635,7 +635,7 @@ pgwin32_select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, c
 		{
 			ZeroMemory(&resEvents, sizeof(resEvents));
 			if (WSAEnumNetworkEvents(sockets[i], events[i], &resEvents) != 0)
-				elog(ERROR, "failed to enumerate network events: error code %u",
+				elog(ERROR, "failed to enumerate network events: error code %d",
 					 WSAGetLastError());
 			/* Read activity? */
 			if (readfds && FD_ISSET(sockets[i], readfds))
diff --git a/src/backend/storage/ipc/latch.c b/src/backend/storage/ipc/latch.c
@@ -1280,11 +1280,11 @@ WaitEventAdjustWin32(WaitEventSet *set, WaitEvent *event)
 		{
 			*handle = WSACreateEvent();
 			if (*handle == WSA_INVALID_EVENT)
-				elog(ERROR, "failed to create event for socket: error code %u",
+				elog(ERROR, "failed to create event for socket: error code %d",
 					 WSAGetLastError());
 		}
 		if (WSAEventSelect(event->fd, *handle, flags) != 0)
-			elog(ERROR, "failed to set up event for socket: error code %u",
+			elog(ERROR, "failed to set up event for socket: error code %d",
 				 WSAGetLastError());
 
 		Assert(event->fd != PGINVALID_SOCKET);
@@ -1971,7 +1971,7 @@ WaitEventSetWaitBlock(WaitEventSet *set, int cur_timeout,
 
 		ZeroMemory(&resEvents, sizeof(resEvents));
 		if (WSAEnumNetworkEvents(cur_event->fd, handle, &resEvents) != 0)
-			elog(ERROR, "failed to enumerate network events: error code %u",
+			elog(ERROR, "failed to enumerate network events: error code %d",
 				 WSAGetLastError());
 		if ((cur_event->events & WL_SOCKET_READABLE) &&
 			(resEvents.lNetworkEvents & FD_READ))
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
@@ -1985,7 +1985,7 @@ setKeepalivesWin32(PGconn *conn)
 		!= 0)
 	{
 		appendPQExpBuffer(&conn->errorMessage,
-						  libpq_gettext("WSAIoctl(SIO_KEEPALIVE_VALS) failed: %ui\n"),
+						  libpq_gettext("WSAIoctl(SIO_KEEPALIVE_VALS) failed: %d\n"),
 						  WSAGetLastError());
 		return 0;
 	}

Original file line number	Diff line number	Diff line change
`@@ -1594,7 +1594,7 @@ pq_setkeepaliveswin32(Port *port, int idle, int interval)`
`1594`	`1594`	`!= 0)`
`1595`	`1595`	`{`
`1596`	`1596`	`ereport(LOG,`
`1597`		`- (errmsg("WSAIoctl(%s) failed: %ui",`
	`1597`	`+ (errmsg("WSAIoctl(%s) failed: %d",`
`1598`	`1598`	`"SIO_KEEPALIVE_VALS", WSAGetLastError())));`
`1599`	`1599`	`return STATUS_ERROR;`
`1600`	`1600`	`}`
Original file line number	Diff line number	Diff line change
`@@ -635,7 +635,7 @@ pgwin32_select(int nfds, fd_set readfds, fd_set writefds, fd_set *exceptfds, c`
`635`	`635`	`{`
`636`	`636`	`ZeroMemory(&resEvents, sizeof(resEvents));`
`637`	`637`	`if (WSAEnumNetworkEvents(sockets[i], events[i], &resEvents) != 0)`
`638`		`- elog(ERROR, "failed to enumerate network events: error code %u",`
	`638`	`+ elog(ERROR, "failed to enumerate network events: error code %d",`
`639`	`639`	`WSAGetLastError());`
`640`	`640`	`/* Read activity? */`
`641`	`641`	`if (readfds && FD_ISSET(sockets[i], readfds))`
Original file line number	Diff line number	Diff line change
`@@ -1985,7 +1985,7 @@ setKeepalivesWin32(PGconn *conn)`
`1985`	`1985`	`!= 0)`
`1986`	`1986`	`{`
`1987`	`1987`	`appendPQExpBuffer(&conn->errorMessage,`
`1988`		`- libpq_gettext("WSAIoctl(SIO_KEEPALIVE_VALS) failed: %ui\n"),`
	`1988`	`+ libpq_gettext("WSAIoctl(SIO_KEEPALIVE_VALS) failed: %d\n"),`
`1989`	`1989`	`WSAGetLastError());`
`1990`	`1990`	`return 0;`
`1991`	`1991`	`}`