Commit9486844

committed

Use correct format placeholder for WSAGetLastError()

Some code thought this was unsigned, but it's signed int.

1 parent6bbcff0 commit9486844Copy full SHA for 9486844

File tree

-6

lines changed

-6

lines changed

Lines changed: 1 addition & 1 deletion

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`	`returnSTATUS_ERROR;`
`1600`	`1600`	`}`

Lines changed: 1 addition & 1 deletion

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))`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1280,11 +1280,11 @@ WaitEventAdjustWin32(WaitEventSet set, WaitEvent event)`
`1280`	`1280`	`{`
`1281`	`1281`	`*handle=WSACreateEvent();`
`1282`	`1282`	`if (*handle==WSA_INVALID_EVENT)`
`1283`		`-elog(ERROR,"failed to create event for socket: error code %u",`
	`1283`	`+elog(ERROR,"failed to create event for socket: error code %d",`
`1284`	`1284`	`WSAGetLastError());`
`1285`	`1285`	`}`
`1286`	`1286`	`if (WSAEventSelect(event->fd,*handle,flags)!=0)`
`1287`		`-elog(ERROR,"failed to set up event for socket: error code %u",`
	`1287`	`+elog(ERROR,"failed to set up event for socket: error code %d",`
`1288`	`1288`	`WSAGetLastError());`
`1289`	`1289`
`1290`	`1290`	`Assert(event->fd!=PGINVALID_SOCKET);`
`@@ -1971,7 +1971,7 @@ WaitEventSetWaitBlock(WaitEventSet *set, int cur_timeout,`
`1971`	`1971`
`1972`	`1972`	`ZeroMemory(&resEvents,sizeof(resEvents));`
`1973`	`1973`	`if (WSAEnumNetworkEvents(cur_event->fd,handle,&resEvents)!=0)`
`1974`		`-elog(ERROR,"failed to enumerate network events: error code %u",`
	`1974`	`+elog(ERROR,"failed to enumerate network events: error code %d",`
`1975`	`1975`	`WSAGetLastError());`
`1976`	`1976`	`if ((cur_event->events&WL_SOCKET_READABLE)&&`
`1977`	`1977`	`(resEvents.lNetworkEvents&FD_READ))`

Lines changed: 1 addition & 1 deletion

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`	`return0;`
`1991`	`1991`	`}`

Comments

(0)