Use correct format placeholder for WSAGetLastError()
authorPeter Eisentraut
Fri, 23 Apr 2021 11:27:01 +0000 (13:27 +0200)
committerPeter Eisentraut
Fri, 23 Apr 2021 12:21:37 +0000 (14:21 +0200)
Some code thought this was unsigned, but it's signed int.

src/backend/libpq/pqcomm.c
src/backend/port/win32/socket.c
src/backend/storage/ipc/latch.c
src/interfaces/libpq/fe-connect.c

index 4cd6d6dfbb98530442e31bd790b34a9372db84b9..b215b77fee26fce7043ed266c23cbeda2eba1350 100644 (file)
@@ -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;
    }
index a8012c2798df983bdb5e308fcfbc94bd010b9bc7..af151e847093c02add27559d04fa135be5765313 100644 (file)
@@ -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))
index 5f3318fa8f1c79e932adfed7a953f4a8859abf3e..e91755c7042a199b3c9e17e0f6a67a372130121b 100644 (file)
@@ -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))
index aa654dd6a8e48dbe6fc0a20db278888a99320303..96b9edf1256537a394f9192957401efb8050a573 100644 (file)
@@ -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;
    }