rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-10-06 00:47:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Message style improvements of errmsg_internal() calls

Browse Source
This commit is contained in:
Peter Eisentraut 2011-07-05 22:56:55 +03:00
parent 10323f3a59
commit 457333d5c2
7 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/libpq/auth.c
View File

@ -1436,7 +1436,7 @@ pg_SSPI_recvauth(Port *port)
if (!LookupAccountSid(NULL, tokenuser->User.Sid, accountname, &accountnamesize, if (!LookupAccountSid(NULL, tokenuser->User.Sid, accountname, &accountnamesize,
domainname, &domainnamesize, &accountnameuse)) domainname, &domainnamesize, &accountnameuse))
ereport(ERROR, ereport(ERROR,
(errmsg_internal("could not lookup acconut sid: error code %d", (errmsg_internal("could not look up account SID: error code %d",
(int) GetLastError()))); (int) GetLastError())));
free(tokenuser); free(tokenuser);

2
src/backend/libpq/be-secure.c
View File

@ -644,7 +644,7 @@ tmp_dh_cb(SSL *s, int is_export, int keylength)
if (r == NULL || 8 * DH_size(r) < keylength) if (r == NULL || 8 * DH_size(r) < keylength)
{ {
ereport(DEBUG2, ereport(DEBUG2,
(errmsg_internal("DH: generating parameters (%d bits)....", (errmsg_internal("DH: generating parameters (%d bits)",
keylength))); keylength)));
r = DH_generate_parameters(keylength, DH_GENERATOR_2, NULL, NULL); r = DH_generate_parameters(keylength, DH_GENERATOR_2, NULL, NULL);
} }

14
src/backend/port/pipe.c
View File

@ -29,7 +29,7 @@ pgpipe(int handles[2])
if ((s = socket(AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET) if ((s = socket(AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
{ {
ereport(LOG, (errmsg_internal("pgpipe failed to create socket: %ui", WSAGetLastError()))); ereport(LOG, (errmsg_internal("pgpipe could not create socket: %ui", WSAGetLastError())));
return -1; return -1;
} }
@ -39,38 +39,38 @@ pgpipe(int handles[2])
serv_addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); serv_addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
if (bind(s, (SOCKADDR *) &serv_addr, len) == SOCKET_ERROR) if (bind(s, (SOCKADDR *) &serv_addr, len) == SOCKET_ERROR)
{ {
ereport(LOG, (errmsg_internal("pgpipe failed to bind: %ui", WSAGetLastError()))); ereport(LOG, (errmsg_internal("pgpipe could not bind: %ui", WSAGetLastError())));
closesocket(s); closesocket(s);
return -1; return -1;
} }
if (listen(s, 1) == SOCKET_ERROR) if (listen(s, 1) == SOCKET_ERROR)
{ {
ereport(LOG, (errmsg_internal("pgpipe failed to listen: %ui", WSAGetLastError()))); ereport(LOG, (errmsg_internal("pgpipe could not listen: %ui", WSAGetLastError())));
closesocket(s); closesocket(s);
return -1; return -1;
} }
if (getsockname(s, (SOCKADDR *) &serv_addr, &len) == SOCKET_ERROR) if (getsockname(s, (SOCKADDR *) &serv_addr, &len) == SOCKET_ERROR)
{ {
ereport(LOG, (errmsg_internal("pgpipe failed to getsockname: %ui", WSAGetLastError()))); ereport(LOG, (errmsg_internal("pgpipe could not getsockname: %ui", WSAGetLastError())));
closesocket(s); closesocket(s);
return -1; return -1;
} }
if ((handles[1] = socket(PF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET) if ((handles[1] = socket(PF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
{ {
ereport(LOG, (errmsg_internal("pgpipe failed to create socket 2: %ui", WSAGetLastError()))); ereport(LOG, (errmsg_internal("pgpipe could not create socket 2: %ui", WSAGetLastError())));
closesocket(s); closesocket(s);
return -1; return -1;
} }
if (connect(handles[1], (SOCKADDR *) &serv_addr, len) == SOCKET_ERROR) if (connect(handles[1], (SOCKADDR *) &serv_addr, len) == SOCKET_ERROR)
{ {
ereport(LOG, (errmsg_internal("pgpipe failed to connect socket: %ui", WSAGetLastError()))); ereport(LOG, (errmsg_internal("pgpipe could not connect socket: %ui", WSAGetLastError())));
closesocket(s); closesocket(s);
return -1; return -1;
} }
if ((handles[0] = accept(s, (SOCKADDR *) &serv_addr, &len)) == INVALID_SOCKET) if ((handles[0] = accept(s, (SOCKADDR *) &serv_addr, &len)) == INVALID_SOCKET)
{ {
ereport(LOG, (errmsg_internal("pgpipe failed to accept socket: %ui", WSAGetLastError()))); ereport(LOG, (errmsg_internal("pgpipe could not accept socket: %ui", WSAGetLastError())));
closesocket(handles[1]); closesocket(handles[1]);
handles[1] = INVALID_SOCKET; handles[1] = INVALID_SOCKET;
closesocket(s); closesocket(s);

6
src/backend/port/win32/signal.c
View File

@ -83,18 +83,18 @@ pgwin32_signal_initialize(void)
pgwin32_signal_event = CreateEvent(NULL, TRUE, FALSE, NULL); pgwin32_signal_event = CreateEvent(NULL, TRUE, FALSE, NULL);
if (pgwin32_signal_event == NULL) if (pgwin32_signal_event == NULL)
ereport(FATAL, ereport(FATAL,
(errmsg_internal("failed to create signal event: %d", (int) GetLastError()))); (errmsg_internal("could not create signal event: %d", (int) GetLastError())));
/* Create thread for handling signals */ /* Create thread for handling signals */
signal_thread_handle = CreateThread(NULL, 0, pg_signal_thread, NULL, 0, NULL); signal_thread_handle = CreateThread(NULL, 0, pg_signal_thread, NULL, 0, NULL);
if (signal_thread_handle == NULL) if (signal_thread_handle == NULL)
ereport(FATAL, ereport(FATAL,
(errmsg_internal("failed to create signal handler thread"))); (errmsg_internal("could not create signal handler thread")));
/* Create console control handle to pick up Ctrl-C etc */ /* Create console control handle to pick up Ctrl-C etc */
if (!SetConsoleCtrlHandler(pg_console_handler, TRUE)) if (!SetConsoleCtrlHandler(pg_console_handler, TRUE))
ereport(FATAL, ereport(FATAL,
(errmsg_internal("failed to set console control handler"))); (errmsg_internal("could not set console control handler")));
} }
/* /*

14
src/backend/port/win32/socket.c
View File

@ -99,7 +99,7 @@ TranslateSocketError(void)
break; break;
default: default:
ereport(NOTICE, ereport(NOTICE,
(errmsg_internal("Unknown win32 socket error code: %i", WSAGetLastError()))); (errmsg_internal("unrecognized win32 socket error code: %i", WSAGetLastError())));
errno = EINVAL; errno = EINVAL;
} }
} }
@ -143,11 +143,11 @@ pgwin32_waitforsinglesocket(SOCKET s, int what, int timeout)
if (waitevent == INVALID_HANDLE_VALUE) if (waitevent == INVALID_HANDLE_VALUE)
ereport(ERROR, ereport(ERROR,
(errmsg_internal("Failed to create socket waiting event: %i", (int) GetLastError()))); (errmsg_internal("could not create socket waiting event: %i", (int) GetLastError())));
} }
else if (!ResetEvent(waitevent)) else if (!ResetEvent(waitevent))
ereport(ERROR, ereport(ERROR,
(errmsg_internal("Failed to reset socket waiting event: %i", (int) GetLastError()))); (errmsg_internal("could not reset socket waiting event: %i", (int) GetLastError())));
/* /*
* make sure we don't multiplex this kernel event object with a different * 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) if (r == WAIT_TIMEOUT)
return 0; return 0;
ereport(ERROR, ereport(ERROR,
(errmsg_internal("Bad return from WaitForMultipleObjects: %i (%i)", r, (int) GetLastError()))); (errmsg_internal("unrecognized return value from WaitForMultipleObjects: %i (%i)", r, (int) GetLastError())));
return 0; return 0;
} }
@ -364,7 +364,7 @@ pgwin32_recv(SOCKET s, char *buf, int len, int f)
return b; return b;
} }
ereport(NOTICE, ereport(NOTICE,
(errmsg_internal("Failed to read from ready socket (after retries)"))); (errmsg_internal("could not read from ready socket (after retries)")));
errno = EWOULDBLOCK; errno = EWOULDBLOCK;
return -1; return -1;
} }
@ -645,7 +645,7 @@ pgwin32_socket_strerror(int err)
handleDLL = LoadLibraryEx("netmsg.dll", NULL, DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE); handleDLL = LoadLibraryEx("netmsg.dll", NULL, DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE);
if (handleDLL == NULL) if (handleDLL == NULL)
ereport(FATAL, ereport(FATAL,
(errmsg_internal("Failed to load netmsg.dll: %i", (int) GetLastError()))); (errmsg_internal("could not load netmsg.dll: %i", (int) GetLastError())));
} }
ZeroMemory(&wserrbuf, sizeof(wserrbuf)); ZeroMemory(&wserrbuf, sizeof(wserrbuf));
@ -658,7 +658,7 @@ pgwin32_socket_strerror(int err)
NULL) == 0) NULL) == 0)
{ {
/* Failed to get id */ /* Failed to get id */
sprintf(wserrbuf, "Unknown winsock error %i", err); sprintf(wserrbuf, "unrecognized winsock error %i", err);
} }
return wserrbuf; return wserrbuf;
} }

4
src/backend/port/win32/timer.c
View File

@ -97,7 +97,7 @@ setitimer(int which, const struct itimerval * value, struct itimerval * ovalue)
timerCommArea.event = CreateEvent(NULL, TRUE, FALSE, NULL); timerCommArea.event = CreateEvent(NULL, TRUE, FALSE, NULL);
if (timerCommArea.event == NULL) if (timerCommArea.event == NULL)
ereport(FATAL, ereport(FATAL,
(errmsg_internal("failed to create timer event: %d", (errmsg_internal("could not create timer event: %d",
(int) GetLastError()))); (int) GetLastError())));
MemSet(&timerCommArea.value, 0, sizeof(struct itimerval)); MemSet(&timerCommArea.value, 0, sizeof(struct itimerval));
@ -107,7 +107,7 @@ setitimer(int which, const struct itimerval * value, struct itimerval * ovalue)
timerThreadHandle = CreateThread(NULL, 0, pg_timer_thread, NULL, 0, NULL); timerThreadHandle = CreateThread(NULL, 0, pg_timer_thread, NULL, 0, NULL);
if (timerThreadHandle == INVALID_HANDLE_VALUE) if (timerThreadHandle == INVALID_HANDLE_VALUE)
ereport(FATAL, ereport(FATAL,
(errmsg_internal("failed to create timer thread: %d", (errmsg_internal("could not create timer thread: %d",
(int) GetLastError()))); (int) GetLastError())));
} }

2
src/backend/postmaster/postmaster.c
View File

@ -766,7 +766,7 @@ PostmasterMain(int argc, char *argv[])
char **p; char **p;
ereport(DEBUG3, ereport(DEBUG3,
(errmsg_internal("%s: PostmasterMain: initial environ dump:", (errmsg_internal("%s: PostmasterMain: initial environment dump:",
progname))); progname)));
ereport(DEBUG3, ereport(DEBUG3,
(errmsg_internal("-----------------------------------------"))); (errmsg_internal("-----------------------------------------")));