Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 9a0bdc8

Browse files
peterepetere
committed
Message style improvements of errmsg_internal() calls
1 parent 3b31528 commit 9a0bdc8

File tree

7 files changed

+22
-22
lines changed

7 files changed

+22
-22
lines changed

‎src/backend/libpq/auth.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1432,7 +1432,7 @@ pg_SSPI_recvauth(Port *port)
14321432
if (!LookupAccountSid(NULL, tokenuser->User.Sid, accountname, &accountnamesize,
14331433
domainname, &domainnamesize, &accountnameuse))
14341434
ereport(ERROR,
1435-
(errmsg_internal("could not lookup acconut sid: error code %d",
1435+
(errmsg_internal("could not look up account SID: error code %d",
14361436
(int) GetLastError())));
14371437

14381438
free(tokenuser);

‎src/backend/libpq/be-secure.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@ tmp_dh_cb(SSL *s, int is_export, int keylength)
644644
if (r == NULL || 8 * DH_size(r) < keylength)
645645
{
646646
ereport(DEBUG2,
647-
(errmsg_internal("DH: generating parameters (%d bits)....",
647+
(errmsg_internal("DH: generating parameters (%d bits)",
648648
keylength)));
649649
r = DH_generate_parameters(keylength, DH_GENERATOR_2, NULL, NULL);
650650
}

‎src/backend/port/pipe.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ pgpipe(int handles[2])
2929

3030
if ((s = socket(AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
3131
{
32-
ereport(LOG, (errmsg_internal("pgpipe failed to create socket: %ui", WSAGetLastError())));
32+
ereport(LOG, (errmsg_internal("pgpipe could not create socket: %ui", WSAGetLastError())));
3333
return -1;
3434
}
3535

@@ -39,38 +39,38 @@ pgpipe(int handles[2])
3939
serv_addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
4040
if (bind(s, (SOCKADDR *) &serv_addr, len) == SOCKET_ERROR)
4141
{
42-
ereport(LOG, (errmsg_internal("pgpipe failed to bind: %ui", WSAGetLastError())));
42+
ereport(LOG, (errmsg_internal("pgpipe could not bind: %ui", WSAGetLastError())));
4343
closesocket(s);
4444
return -1;
4545
}
4646
if (listen(s, 1) == SOCKET_ERROR)
4747
{
48-
ereport(LOG, (errmsg_internal("pgpipe failed to listen: %ui", WSAGetLastError())));
48+
ereport(LOG, (errmsg_internal("pgpipe could not listen: %ui", WSAGetLastError())));
4949
closesocket(s);
5050
return -1;
5151
}
5252
if (getsockname(s, (SOCKADDR *) &serv_addr, &len) == SOCKET_ERROR)
5353
{
54-
ereport(LOG, (errmsg_internal("pgpipe failed to getsockname: %ui", WSAGetLastError())));
54+
ereport(LOG, (errmsg_internal("pgpipe could not getsockname: %ui", WSAGetLastError())));
5555
closesocket(s);
5656
return -1;
5757
}
5858
if ((handles[1] = socket(PF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
5959
{
60-
ereport(LOG, (errmsg_internal("pgpipe failed to create socket 2: %ui", WSAGetLastError())));
60+
ereport(LOG, (errmsg_internal("pgpipe could not create socket 2: %ui", WSAGetLastError())));
6161
closesocket(s);
6262
return -1;
6363
}
6464

6565
if (connect(handles[1], (SOCKADDR *) &serv_addr, len) == SOCKET_ERROR)
6666
{
67-
ereport(LOG, (errmsg_internal("pgpipe failed to connect socket: %ui", WSAGetLastError())));
67+
ereport(LOG, (errmsg_internal("pgpipe could not connect socket: %ui", WSAGetLastError())));
6868
closesocket(s);
6969
return -1;
7070
}
7171
if ((handles[0] = accept(s, (SOCKADDR *) &serv_addr, &len)) == INVALID_SOCKET)
7272
{
73-
ereport(LOG, (errmsg_internal("pgpipe failed to accept socket: %ui", WSAGetLastError())));
73+
ereport(LOG, (errmsg_internal("pgpipe could not accept socket: %ui", WSAGetLastError())));
7474
closesocket(handles[1]);
7575
handles[1] = INVALID_SOCKET;
7676
closesocket(s);

‎src/backend/port/win32/signal.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,18 +83,18 @@ pgwin32_signal_initialize(void)
8383
pgwin32_signal_event = CreateEvent(NULL, TRUE, FALSE, NULL);
8484
if (pgwin32_signal_event == NULL)
8585
ereport(FATAL,
86-
(errmsg_internal("failed to create signal event: %d", (int) GetLastError())));
86+
(errmsg_internal("could not create signal event: %d", (int) GetLastError())));
8787

8888
/* Create thread for handling signals */
8989
signal_thread_handle = CreateThread(NULL, 0, pg_signal_thread, NULL, 0, NULL);
9090
if (signal_thread_handle == NULL)
9191
ereport(FATAL,
92-
(errmsg_internal("failed to create signal handler thread")));
92+
(errmsg_internal("could not create signal handler thread")));
9393

9494
/* Create console control handle to pick up Ctrl-C etc */
9595
if (!SetConsoleCtrlHandler(pg_console_handler, TRUE))
9696
ereport(FATAL,
97-
(errmsg_internal("failed to set console control handler")));
97+
(errmsg_internal("could not set console control handler")));
9898
}
9999

100100
/*

‎src/backend/port/win32/socket.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ TranslateSocketError(void)
9999
break;
100100
default:
101101
ereport(NOTICE,
102-
(errmsg_internal("Unknown win32 socket error code: %i", WSAGetLastError())));
102+
(errmsg_internal("unrecognized win32 socket error code: %i", WSAGetLastError())));
103103
errno = EINVAL;
104104
}
105105
}
@@ -143,11 +143,11 @@ pgwin32_waitforsinglesocket(SOCKET s, int what, int timeout)
143143

144144
if (waitevent == INVALID_HANDLE_VALUE)
145145
ereport(ERROR,
146-
(errmsg_internal("Failed to create socket waiting event: %i", (int) GetLastError())));
146+
(errmsg_internal("could not create socket waiting event: %i", (int) GetLastError())));
147147
}
148148
else if (!ResetEvent(waitevent))
149149
ereport(ERROR,
150-
(errmsg_internal("Failed to reset socket waiting event: %i", (int) GetLastError())));
150+
(errmsg_internal("could not reset socket waiting event: %i", (int) GetLastError())));
151151

152152
/*
153153
* 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)
221221
if (r == WAIT_TIMEOUT)
222222
return 0;
223223
ereport(ERROR,
224-
(errmsg_internal("Bad return from WaitForMultipleObjects: %i (%i)", r, (int) GetLastError())));
224+
(errmsg_internal("unrecognized return value from WaitForMultipleObjects: %i (%i)", r, (int) GetLastError())));
225225
return 0;
226226
}
227227

@@ -364,7 +364,7 @@ pgwin32_recv(SOCKET s, char *buf, int len, int f)
364364
return b;
365365
}
366366
ereport(NOTICE,
367-
(errmsg_internal("Failed to read from ready socket (after retries)")));
367+
(errmsg_internal("could not read from ready socket (after retries)")));
368368
errno = EWOULDBLOCK;
369369
return -1;
370370
}
@@ -645,7 +645,7 @@ pgwin32_socket_strerror(int err)
645645
handleDLL = LoadLibraryEx("netmsg.dll", NULL, DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE);
646646
if (handleDLL == NULL)
647647
ereport(FATAL,
648-
(errmsg_internal("Failed to load netmsg.dll: %i", (int) GetLastError())));
648+
(errmsg_internal("could not load netmsg.dll: %i", (int) GetLastError())));
649649
}
650650

651651
ZeroMemory(&wserrbuf, sizeof(wserrbuf));
@@ -658,7 +658,7 @@ pgwin32_socket_strerror(int err)
658658
NULL) == 0)
659659
{
660660
/* Failed to get id */
661-
sprintf(wserrbuf, "Unknown winsock error %i", err);
661+
sprintf(wserrbuf, "unrecognized winsock error %i", err);
662662
}
663663
return wserrbuf;
664664
}

‎src/backend/port/win32/timer.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ setitimer(int which, const struct itimerval * value, struct itimerval * ovalue)
9797
timerCommArea.event = CreateEvent(NULL, TRUE, FALSE, NULL);
9898
if (timerCommArea.event == NULL)
9999
ereport(FATAL,
100-
(errmsg_internal("failed to create timer event: %d",
100+
(errmsg_internal("could not create timer event: %d",
101101
(int) GetLastError())));
102102

103103
MemSet(&timerCommArea.value, 0, sizeof(struct itimerval));
@@ -107,7 +107,7 @@ setitimer(int which, const struct itimerval * value, struct itimerval * ovalue)
107107
timerThreadHandle = CreateThread(NULL, 0, pg_timer_thread, NULL, 0, NULL);
108108
if (timerThreadHandle == INVALID_HANDLE_VALUE)
109109
ereport(FATAL,
110-
(errmsg_internal("failed to create timer thread: %d",
110+
(errmsg_internal("could not create timer thread: %d",
111111
(int) GetLastError())));
112112
}
113113

‎src/backend/postmaster/postmaster.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -763,7 +763,7 @@ PostmasterMain(int argc, char *argv[])
763763
char **p;
764764

765765
ereport(DEBUG3,
766-
(errmsg_internal("%s: PostmasterMain: initial environ dump:",
766+
(errmsg_internal("%s: PostmasterMain: initial environment dump:",
767767
progname)));
768768
ereport(DEBUG3,
769769
(errmsg_internal("-----------------------------------------")));

0 commit comments

Comments
 (0)