diff options
Diffstat (limited to 'src/backend')
-rw-r--r-- | src/backend/libpq/auth.c | 14 | ||||
-rw-r--r-- | src/backend/port/win32/socket.c | 14 | ||||
-rw-r--r-- | src/backend/port/win32_latch.c | 2 |
3 files changed, 15 insertions, 15 deletions
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c index 591a00885de..d1538809f85 100644 --- a/src/backend/libpq/auth.c +++ b/src/backend/libpq/auth.c @@ -2396,7 +2396,7 @@ radius_add_attribute(radius_packet *packet, uint8 type, const unsigned char *dat * fail. */ elog(WARNING, - "Adding attribute code %i with length %i to radius packet would create oversize packet, ignoring", + "Adding attribute code %d with length %d to radius packet would create oversize packet, ignoring", type, len); return; @@ -2673,11 +2673,11 @@ CheckRADIUSAuth(Port *port) { #ifdef HAVE_IPV6 ereport(LOG, - (errmsg("RADIUS response was sent from incorrect port: %i", + (errmsg("RADIUS response was sent from incorrect port: %d", ntohs(remoteaddr.sin6_port)))); #else ereport(LOG, - (errmsg("RADIUS response was sent from incorrect port: %i", + (errmsg("RADIUS response was sent from incorrect port: %d", ntohs(remoteaddr.sin_port)))); #endif continue; @@ -2686,14 +2686,14 @@ CheckRADIUSAuth(Port *port) if (packetlength < RADIUS_HEADER_LENGTH) { ereport(LOG, - (errmsg("RADIUS response too short: %i", packetlength))); + (errmsg("RADIUS response too short: %d", packetlength))); continue; } if (packetlength != ntohs(receivepacket->length)) { ereport(LOG, - (errmsg("RADIUS response has corrupt length: %i (actual length %i)", + (errmsg("RADIUS response has corrupt length: %d (actual length %d)", ntohs(receivepacket->length), packetlength))); continue; } @@ -2701,7 +2701,7 @@ CheckRADIUSAuth(Port *port) if (packet->id != receivepacket->id) { ereport(LOG, - (errmsg("RADIUS response is to a different request: %i (should be %i)", + (errmsg("RADIUS response is to a different request: %d (should be %d)", receivepacket->id, packet->id))); continue; } @@ -2752,7 +2752,7 @@ CheckRADIUSAuth(Port *port) else { ereport(LOG, - (errmsg("RADIUS response has invalid code (%i) for user \"%s\"", + (errmsg("RADIUS response has invalid code (%d) for user \"%s\"", receivepacket->code, port->user_name))); continue; } diff --git a/src/backend/port/win32/socket.c b/src/backend/port/win32/socket.c index b730f8eeda9..2649268c18d 100644 --- a/src/backend/port/win32/socket.c +++ b/src/backend/port/win32/socket.c @@ -99,7 +99,7 @@ TranslateSocketError(void) break; default: ereport(NOTICE, - (errmsg_internal("unrecognized win32 socket error code: %i", WSAGetLastError()))); + (errmsg_internal("unrecognized win32 socket error code: %d", WSAGetLastError()))); errno = EINVAL; } } @@ -143,11 +143,11 @@ pgwin32_waitforsinglesocket(SOCKET s, int what, int timeout) if (waitevent == INVALID_HANDLE_VALUE) ereport(ERROR, - (errmsg_internal("could not create socket waiting event: %i", (int) GetLastError()))); + (errmsg_internal("could not create socket waiting event: %d", (int) GetLastError()))); } else if (!ResetEvent(waitevent)) ereport(ERROR, - (errmsg_internal("could not reset socket waiting event: %i", (int) GetLastError()))); + (errmsg_internal("could not reset socket waiting event: %d", (int) GetLastError()))); /* * make sure we don't multiplex this kernel event object with a different @@ -221,7 +221,7 @@ pgwin32_waitforsinglesocket(SOCKET s, int what, int timeout) if (r == WAIT_TIMEOUT) return 0; ereport(ERROR, - (errmsg_internal("unrecognized return value from WaitForMultipleObjects: %i (%i)", r, (int) GetLastError()))); + (errmsg_internal("unrecognized return value from WaitForMultipleObjects: %d (%d)", r, (int) GetLastError()))); return 0; } @@ -567,7 +567,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) == SOCKET_ERROR) ereport(FATAL, - (errmsg_internal("failed to enumerate network events: %i", (int) GetLastError()))); + (errmsg_internal("failed to enumerate network events: %d", (int) GetLastError()))); /* Read activity? */ if (readfds && FD_ISSET(sockets[i], readfds)) { @@ -645,7 +645,7 @@ pgwin32_socket_strerror(int err) handleDLL = LoadLibraryEx("netmsg.dll", NULL, DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE); if (handleDLL == NULL) ereport(FATAL, - (errmsg_internal("could not load netmsg.dll: %i", (int) GetLastError()))); + (errmsg_internal("could not load netmsg.dll: %d", (int) GetLastError()))); } ZeroMemory(&wserrbuf, sizeof(wserrbuf)); @@ -658,7 +658,7 @@ pgwin32_socket_strerror(int err) NULL) == 0) { /* Failed to get id */ - sprintf(wserrbuf, "unrecognized winsock error %i", err); + sprintf(wserrbuf, "unrecognized winsock error %d", err); } return wserrbuf; } diff --git a/src/backend/port/win32_latch.c b/src/backend/port/win32_latch.c index b35441b3bfb..8d59ad493f6 100644 --- a/src/backend/port/win32_latch.c +++ b/src/backend/port/win32_latch.c @@ -189,7 +189,7 @@ WaitLatchOrSocket(volatile Latch *latch, int wakeEvents, SOCKET sock, ZeroMemory(&resEvents, sizeof(resEvents)); if (WSAEnumNetworkEvents(sock, sockevent, &resEvents) == SOCKET_ERROR) ereport(FATAL, - (errmsg_internal("failed to enumerate network events: %i", (int) GetLastError()))); + (errmsg_internal("failed to enumerate network events: %d", (int) GetLastError()))); if ((wakeEvents & WL_SOCKET_READABLE) && (resEvents.lNetworkEvents & FD_READ)) |