Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1af55e2

Browse files
committed
Use consistent format for reporting GetLastError()
Use something like "error code %lu" for reporting GetLastError()values on Windows. Previously, a mix of different wordings andformats were in use.
1 parent6c6a415 commit1af55e2

File tree

18 files changed

+132
-132
lines changed

18 files changed

+132
-132
lines changed

‎src/backend/libpq/auth.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1405,17 +1405,17 @@ pg_SSPI_recvauth(Port *port)
14051405
secur32=LoadLibrary("SECUR32.DLL");
14061406
if (secur32==NULL)
14071407
ereport(ERROR,
1408-
(errmsg_internal("could not load secur32.dll:%d",
1409-
(int)GetLastError())));
1408+
(errmsg_internal("could not load secur32.dll:error code %lu",
1409+
GetLastError())));
14101410

14111411
_QuerySecurityContextToken= (QUERY_SECURITY_CONTEXT_TOKEN_FN)
14121412
GetProcAddress(secur32,"QuerySecurityContextToken");
14131413
if (_QuerySecurityContextToken==NULL)
14141414
{
14151415
FreeLibrary(secur32);
14161416
ereport(ERROR,
1417-
(errmsg_internal("could not locate QuerySecurityContextToken in secur32.dll:%d",
1418-
(int)GetLastError())));
1417+
(errmsg_internal("could not locate QuerySecurityContextToken in secur32.dll:error code %lu",
1418+
GetLastError())));
14191419
}
14201420

14211421
r= (_QuerySecurityContextToken) (sspictx,&token);
@@ -1437,8 +1437,8 @@ pg_SSPI_recvauth(Port *port)
14371437

14381438
if (!GetTokenInformation(token,TokenUser,NULL,0,&retlen)&&GetLastError()!=122)
14391439
ereport(ERROR,
1440-
(errmsg_internal("could not get token user size: error code %d",
1441-
(int)GetLastError())));
1440+
(errmsg_internal("could not get token user size: error code %lu",
1441+
GetLastError())));
14421442

14431443
tokenuser=malloc(retlen);
14441444
if (tokenuser==NULL)
@@ -1447,14 +1447,14 @@ pg_SSPI_recvauth(Port *port)
14471447

14481448
if (!GetTokenInformation(token,TokenUser,tokenuser,retlen,&retlen))
14491449
ereport(ERROR,
1450-
(errmsg_internal("could not get user token: error code %d",
1451-
(int)GetLastError())));
1450+
(errmsg_internal("could not get user token: error code %lu",
1451+
GetLastError())));
14521452

14531453
if (!LookupAccountSid(NULL,tokenuser->User.Sid,accountname,&accountnamesize,
14541454
domainname,&domainnamesize,&accountnameuse))
14551455
ereport(ERROR,
1456-
(errmsg_internal("could not look up account SID: error code %d",
1457-
(int)GetLastError())));
1456+
(errmsg_internal("could not look up account SID: error code %lu",
1457+
GetLastError())));
14581458

14591459
free(tokenuser);
14601460

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,17 +144,17 @@ crashDumpHandler(struct _EXCEPTION_POINTERS * pExceptionInfo)
144144
NULL);
145145
if (dumpFile==INVALID_HANDLE_VALUE)
146146
{
147-
write_stderr("could not open crash dump file \"%s\" for writing: error code %u\n",
148-
dumpPath,(unsignedint)GetLastError());
147+
write_stderr("could not open crash dump file \"%s\" for writing: error code %lu\n",
148+
dumpPath,GetLastError());
149149
returnEXCEPTION_CONTINUE_SEARCH;
150150
}
151151

152152
if ((*pDump) (selfProcHandle,selfPid,dumpFile,dumpType,&ExInfo,
153153
NULL,NULL))
154154
write_stderr("wrote crash dump to file \"%s\"\n",dumpPath);
155155
else
156-
write_stderr("could not write crash dump to file \"%s\": error code %08x\n",
157-
dumpPath,(unsignedint)GetLastError());
156+
write_stderr("could not write crash dump to file \"%s\": error code %lu\n",
157+
dumpPath,GetLastError());
158158

159159
CloseHandle(dumpFile);
160160
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ LoadKernel32()
4242
kernel32=LoadLibraryEx("kernel32.dll",NULL,0);
4343
if (kernel32==NULL)
4444
ereport(FATAL,
45-
(errmsg_internal("could not load kernel32.dll:%d",
46-
(int)GetLastError())));
45+
(errmsg_internal("could not load kernel32.dll:error code %lu",
46+
GetLastError())));
4747
}
4848

4949

@@ -73,8 +73,8 @@ RegisterWaitForSingleObject(PHANDLE phNewWaitObject,
7373

7474
if (_RegisterWaitForSingleObject==NULL)
7575
ereport(FATAL,
76-
(errmsg_internal("could not locate RegisterWaitForSingleObject in kernel32.dll:%d",
77-
(int)GetLastError())));
76+
(errmsg_internal("could not locate RegisterWaitForSingleObject in kernel32.dll:error code %lu",
77+
GetLastError())));
7878
}
7979

8080
return (_RegisterWaitForSingleObject)

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ pgwin32_is_admin(void)
4040

4141
if (!OpenProcessToken(GetCurrentProcess(),TOKEN_READ,&AccessToken))
4242
{
43-
write_stderr("could not open process token: error code %d\n",
44-
(int)GetLastError());
43+
write_stderr("could not open process token: error code %lu\n",
44+
GetLastError());
4545
exit(1);
4646
}
4747

@@ -60,17 +60,17 @@ pgwin32_is_admin(void)
6060
SECURITY_BUILTIN_DOMAIN_RID,DOMAIN_ALIAS_RID_ADMINS,0,0,0,0,0,
6161
0,&AdministratorsSid))
6262
{
63-
write_stderr("could not get SID for Administrators group: error code %d\n",
64-
(int)GetLastError());
63+
write_stderr("could not get SID for Administrators group: error code %lu\n",
64+
GetLastError());
6565
exit(1);
6666
}
6767

6868
if (!AllocateAndInitializeSid(&NtAuthority,2,
6969
SECURITY_BUILTIN_DOMAIN_RID,DOMAIN_ALIAS_RID_POWER_USERS,0,0,0,0,0,
7070
0,&PowerUsersSid))
7171
{
72-
write_stderr("could not get SID for PowerUsers group: error code %d\n",
73-
(int)GetLastError());
72+
write_stderr("could not get SID for PowerUsers group: error code %lu\n",
73+
GetLastError());
7474
exit(1);
7575
}
7676

@@ -129,8 +129,8 @@ pgwin32_is_service(void)
129129

130130
if (!OpenProcessToken(GetCurrentProcess(),TOKEN_READ,&AccessToken))
131131
{
132-
fprintf(stderr,"could not open process token: error code %d\n",
133-
(int)GetLastError());
132+
fprintf(stderr,"could not open process token: error code %lu\n",
133+
GetLastError());
134134
return-1;
135135
}
136136

@@ -223,8 +223,8 @@ pgwin32_get_dynamic_tokeninfo(HANDLE token, TOKEN_INFORMATION_CLASS class,
223223

224224
if (GetLastError()!=ERROR_INSUFFICIENT_BUFFER)
225225
{
226-
snprintf(errbuf,errsize,"could not get token information: error code %d\n",
227-
(int)GetLastError());
226+
snprintf(errbuf,errsize,"could not get token information: error code %lu\n",
227+
GetLastError());
228228
return FALSE;
229229
}
230230

@@ -239,8 +239,8 @@ pgwin32_get_dynamic_tokeninfo(HANDLE token, TOKEN_INFORMATION_CLASS class,
239239
if (!GetTokenInformation(token,class,*InfoBuffer,
240240
InfoBufferSize,&InfoBufferSize))
241241
{
242-
snprintf(errbuf,errsize,"could not get token information: error code %d\n",
243-
(int)GetLastError());
242+
snprintf(errbuf,errsize,"could not get token information: error code %lu\n",
243+
GetLastError());
244244
return FALSE;
245245
}
246246

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ 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("could not create signal event:%d", (int)GetLastError())));
86+
(errmsg_internal("could not create signal event:error code %lu",GetLastError())));
8787

8888
/* Create thread for handling signals */
8989
signal_thread_handle=CreateThread(NULL,0,pg_signal_thread,NULL,0,NULL);
@@ -186,8 +186,8 @@ pgwin32_create_signal_listener(pid_t pid)
186186

187187
if (pipe==INVALID_HANDLE_VALUE)
188188
ereport(ERROR,
189-
(errmsg("could not create signal listener pipe for PID %d: error code %d",
190-
(int)pid,(int)GetLastError())));
189+
(errmsg("could not create signal listener pipe for PID %d: error code %lu",
190+
(int)pid,GetLastError())));
191191

192192
returnpipe;
193193
}
@@ -266,7 +266,7 @@ pg_signal_thread(LPVOID param)
266266

267267
if (pipe==INVALID_HANDLE_VALUE)
268268
{
269-
write_stderr("could not create signal listener pipe: error code %d; retrying\n", (int)GetLastError());
269+
write_stderr("could not create signal listener pipe: error code %lu; retrying\n",GetLastError());
270270
SleepEx(500, FALSE);
271271
continue;
272272
}
@@ -298,7 +298,7 @@ pg_signal_thread(LPVOID param)
298298
* is nothing else we can do other than abort the whole
299299
* process which will be even worse.
300300
*/
301-
write_stderr("could not create signal listener pipe: error code %d; retrying\n", (int)GetLastError());
301+
write_stderr("could not create signal listener pipe: error code %lu; retrying\n",GetLastError());
302302

303303
/*
304304
* Keep going so we at least dispatch this signal. Hopefully,
@@ -309,8 +309,8 @@ pg_signal_thread(LPVOID param)
309309
(LPTHREAD_START_ROUTINE)pg_signal_dispatch_thread,
310310
(LPVOID)pipe,0,NULL);
311311
if (hThread==INVALID_HANDLE_VALUE)
312-
write_stderr("could not create signal dispatch thread: error code %d\n",
313-
(int)GetLastError());
312+
write_stderr("could not create signal dispatch thread: error code %lu\n",
313+
GetLastError());
314314
else
315315
CloseHandle(hThread);
316316

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -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("could not create socket waiting event:%d", (int)GetLastError())));
146+
(errmsg_internal("could not create socket waiting event:error code %lu",GetLastError())));
147147
}
148148
elseif (!ResetEvent(waitevent))
149149
ereport(ERROR,
150-
(errmsg_internal("could not reset socket waiting event:%d", (int)GetLastError())));
150+
(errmsg_internal("could not reset socket waiting event:error code %lu",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
return0;
223223
ereport(ERROR,
224-
(errmsg_internal("unrecognized return value from WaitForMultipleObjects: %d (%d)",r, (int)GetLastError())));
224+
(errmsg_internal("unrecognized return value from WaitForMultipleObjects: %d (%lu)",r,GetLastError())));
225225
return0;
226226
}
227227

@@ -567,7 +567,7 @@ pgwin32_select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, c
567567
ZeroMemory(&resEvents,sizeof(resEvents));
568568
if (WSAEnumNetworkEvents(sockets[i],events[i],&resEvents)==SOCKET_ERROR)
569569
ereport(FATAL,
570-
(errmsg_internal("failed to enumerate network events:%d", (int)GetLastError())));
570+
(errmsg_internal("failed to enumerate network events:error code %lu",GetLastError())));
571571
/* Read activity? */
572572
if (readfds&&FD_ISSET(sockets[i],readfds))
573573
{
@@ -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("could not load netmsg.dll:%d", (int)GetLastError())));
648+
(errmsg_internal("could not load netmsg.dll:error code %lu",GetLastError())));
649649
}
650650

651651
ZeroMemory(&wserrbuf,sizeof(wserrbuf));

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ 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("could not create timer event:%d",
101-
(int)GetLastError())));
100+
(errmsg_internal("could not create timer event:error code %lu",
101+
GetLastError())));
102102

103103
MemSet(&timerCommArea.value,0,sizeof(structitimerval));
104104

@@ -107,8 +107,8 @@ 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("could not create timer thread:%d",
111-
(int)GetLastError())));
110+
(errmsg_internal("could not create timer thread:error code %lu",
111+
GetLastError())));
112112
}
113113

114114
/* Request the timer thread to change settings */

‎src/backend/port/win32_latch.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ InitLatch(volatile Latch *latch)
3838

3939
latch->event=CreateEvent(NULL, TRUE, FALSE,NULL);
4040
if (latch->event==NULL)
41-
elog(ERROR,"CreateEvent failed: error code %d", (int)GetLastError());
41+
elog(ERROR,"CreateEvent failed: error code %lu",GetLastError());
4242
}
4343

4444
void
@@ -59,7 +59,7 @@ InitSharedLatch(volatile Latch *latch)
5959

6060
latch->event=CreateEvent(&sa, TRUE, FALSE,NULL);
6161
if (latch->event==NULL)
62-
elog(ERROR,"CreateEvent failed: error code %d", (int)GetLastError());
62+
elog(ERROR,"CreateEvent failed: error code %lu",GetLastError());
6363
}
6464

6565
void
@@ -150,7 +150,7 @@ WaitLatchOrSocket(volatile Latch *latch, int wakeEvents, pgsocket sock,
150150
* will return immediately.
151151
*/
152152
if (!ResetEvent(latchevent))
153-
elog(ERROR,"ResetEvent failed: error code %d", (int)GetLastError());
153+
elog(ERROR,"ResetEvent failed: error code %lu",GetLastError());
154154
if ((wakeEvents&WL_LATCH_SET)&&latch->is_set)
155155
{
156156
result |=WL_LATCH_SET;
@@ -164,7 +164,7 @@ WaitLatchOrSocket(volatile Latch *latch, int wakeEvents, pgsocket sock,
164164
rc=WaitForMultipleObjects(numevents,events, FALSE,timeout);
165165

166166
if (rc==WAIT_FAILED)
167-
elog(ERROR,"WaitForMultipleObjects() failed: error code %d", (int)GetLastError());
167+
elog(ERROR,"WaitForMultipleObjects() failed: error code %lu",GetLastError());
168168

169169
/* Participate in Windows signal emulation */
170170
elseif (rc==WAIT_OBJECT_0+1)
@@ -188,7 +188,7 @@ WaitLatchOrSocket(volatile Latch *latch, int wakeEvents, pgsocket sock,
188188
ZeroMemory(&resEvents,sizeof(resEvents));
189189
if (WSAEnumNetworkEvents(sock,sockevent,&resEvents)==SOCKET_ERROR)
190190
ereport(FATAL,
191-
(errmsg_internal("failed to enumerate network events:%d", (int)GetLastError())));
191+
(errmsg_internal("failed to enumerate network events:error code %lu",GetLastError())));
192192

193193
if ((wakeEvents&WL_SOCKET_READABLE)&&
194194
(resEvents.lNetworkEvents&FD_READ))
@@ -203,7 +203,7 @@ WaitLatchOrSocket(volatile Latch *latch, int wakeEvents, pgsocket sock,
203203
}
204204
/* Otherwise it must be the latch event */
205205
elseif (rc!=WAIT_OBJECT_0)
206-
elog(ERROR,"unexpected return code from WaitForMultipleObjects(): %d", (int)rc);
206+
elog(ERROR,"unexpected return code from WaitForMultipleObjects(): %lu",rc);
207207
}
208208
while (result==0);
209209

‎src/backend/port/win32_sema.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ PGSemaphoreCreate(PGSemaphore sema)
9191
}
9292
else
9393
ereport(PANIC,
94-
(errmsg("could not create semaphore: error code %d", (int)GetLastError())));
94+
(errmsg("could not create semaphore: error code %lu",GetLastError())));
9595
}
9696

9797
/*
@@ -158,7 +158,7 @@ PGSemaphoreLock(PGSemaphore sema, bool interruptOK)
158158

159159
if (errno!=0)
160160
ereport(FATAL,
161-
(errmsg("could not lock semaphore: error code %d", (int)GetLastError())));
161+
(errmsg("could not lock semaphore: error code %lu",GetLastError())));
162162
}
163163

164164
/*
@@ -171,7 +171,7 @@ PGSemaphoreUnlock(PGSemaphore sema)
171171
{
172172
if (!ReleaseSemaphore(*sema,1,NULL))
173173
ereport(FATAL,
174-
(errmsg("could not unlock semaphore: error code %d", (int)GetLastError())));
174+
(errmsg("could not unlock semaphore: error code %lu",GetLastError())));
175175
}
176176

177177
/*
@@ -200,7 +200,7 @@ PGSemaphoreTryLock(PGSemaphore sema)
200200

201201
/* Otherwise we are in trouble */
202202
ereport(FATAL,
203-
(errmsg("could not try-lock semaphore: error code %d", (int)GetLastError())));
203+
(errmsg("could not try-lock semaphore: error code %lu",GetLastError())));
204204

205205
/* keep compiler quiet */
206206
return false;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp