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

Commitce8d7bb

Browse files
committed
Replace printf format %i by %d
They are identical, but the overwhelming majority of the code uses %d,so standardize on that.
1 parent8c18f3f commitce8d7bb

File tree

8 files changed

+32
-32
lines changed

8 files changed

+32
-32
lines changed

‎src/backend/libpq/auth.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2396,7 +2396,7 @@ radius_add_attribute(radius_packet *packet, uint8 type, const unsigned char *dat
23962396
* fail.
23972397
*/
23982398
elog(WARNING,
2399-
"Adding attribute code %i with length %i to radius packet would create oversize packet, ignoring",
2399+
"Adding attribute code %d with length %d to radius packet would create oversize packet, ignoring",
24002400
type,len);
24012401
return;
24022402

@@ -2673,11 +2673,11 @@ CheckRADIUSAuth(Port *port)
26732673
{
26742674
#ifdefHAVE_IPV6
26752675
ereport(LOG,
2676-
(errmsg("RADIUS response was sent from incorrect port: %i",
2676+
(errmsg("RADIUS response was sent from incorrect port: %d",
26772677
ntohs(remoteaddr.sin6_port))));
26782678
#else
26792679
ereport(LOG,
2680-
(errmsg("RADIUS response was sent from incorrect port: %i",
2680+
(errmsg("RADIUS response was sent from incorrect port: %d",
26812681
ntohs(remoteaddr.sin_port))));
26822682
#endif
26832683
continue;
@@ -2686,22 +2686,22 @@ CheckRADIUSAuth(Port *port)
26862686
if (packetlength<RADIUS_HEADER_LENGTH)
26872687
{
26882688
ereport(LOG,
2689-
(errmsg("RADIUS response too short: %i",packetlength)));
2689+
(errmsg("RADIUS response too short: %d",packetlength)));
26902690
continue;
26912691
}
26922692

26932693
if (packetlength!=ntohs(receivepacket->length))
26942694
{
26952695
ereport(LOG,
2696-
(errmsg("RADIUS response has corrupt length: %i (actual length %i)",
2696+
(errmsg("RADIUS response has corrupt length: %d (actual length %d)",
26972697
ntohs(receivepacket->length),packetlength)));
26982698
continue;
26992699
}
27002700

27012701
if (packet->id!=receivepacket->id)
27022702
{
27032703
ereport(LOG,
2704-
(errmsg("RADIUS response is to a different request: %i (should be %i)",
2704+
(errmsg("RADIUS response is to a different request: %d (should be %d)",
27052705
receivepacket->id,packet->id)));
27062706
continue;
27072707
}
@@ -2752,7 +2752,7 @@ CheckRADIUSAuth(Port *port)
27522752
else
27532753
{
27542754
ereport(LOG,
2755-
(errmsg("RADIUS response has invalid code (%i) for user \"%s\"",
2755+
(errmsg("RADIUS response has invalid code (%d) for user \"%s\"",
27562756
receivepacket->code,port->user_name)));
27572757
continue;
27582758
}

‎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("unrecognized win32 socket error code: %i",WSAGetLastError())));
102+
(errmsg_internal("unrecognized win32 socket error code: %d",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("could not create socket waiting event: %i", (int)GetLastError())));
146+
(errmsg_internal("could not create socket waiting event: %d", (int)GetLastError())));
147147
}
148148
elseif (!ResetEvent(waitevent))
149149
ereport(ERROR,
150-
(errmsg_internal("could not reset socket waiting event: %i", (int)GetLastError())));
150+
(errmsg_internal("could not reset socket waiting event: %d", (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
return0;
223223
ereport(ERROR,
224-
(errmsg_internal("unrecognized return value from WaitForMultipleObjects: %i (%i)",r, (int)GetLastError())));
224+
(errmsg_internal("unrecognized return value from WaitForMultipleObjects: %d (%d)",r, (int)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: %i", (int)GetLastError())));
570+
(errmsg_internal("failed to enumerate network events: %d", (int)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: %i", (int)GetLastError())));
648+
(errmsg_internal("could not load netmsg.dll: %d", (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,"unrecognized winsock error %i",err);
661+
sprintf(wserrbuf,"unrecognized winsock error %d",err);
662662
}
663663
returnwserrbuf;
664664
}

‎src/backend/port/win32_latch.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ WaitLatchOrSocket(volatile Latch *latch, int wakeEvents, SOCKET sock,
189189
ZeroMemory(&resEvents,sizeof(resEvents));
190190
if (WSAEnumNetworkEvents(sock,sockevent,&resEvents)==SOCKET_ERROR)
191191
ereport(FATAL,
192-
(errmsg_internal("failed to enumerate network events: %i", (int)GetLastError())));
192+
(errmsg_internal("failed to enumerate network events: %d", (int)GetLastError())));
193193

194194
if ((wakeEvents&WL_SOCKET_READABLE)&&
195195
(resEvents.lNetworkEvents&FD_READ))

‎src/bin/pg_basebackup/pg_basebackup.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -217,18 +217,18 @@ progress_report(int tablespacenum, char *fn)
217217
* call)
218218
*/
219219
fprintf(stderr,
220-
INT64_FORMAT"/"INT64_FORMAT" kB (100%%) %i/%i tablespaces %35s\r",
220+
INT64_FORMAT"/"INT64_FORMAT" kB (100%%) %d/%d tablespaces %35s\r",
221221
totaldone /1024,totalsize,
222222
tablespacenum,tablespacecount,"");
223223
else
224224
fprintf(stderr,
225-
INT64_FORMAT"/"INT64_FORMAT" kB (%i%%) %i/%i tablespaces (%-30.30s)\r",
225+
INT64_FORMAT"/"INT64_FORMAT" kB (%d%%) %d/%d tablespaces (%-30.30s)\r",
226226
totaldone /1024,totalsize,
227227
percent,
228228
tablespacenum,tablespacecount,fn);
229229
}
230230
else
231-
fprintf(stderr,INT64_FORMAT"/"INT64_FORMAT" kB (%i%%) %i/%i tablespaces\r",
231+
fprintf(stderr,INT64_FORMAT"/"INT64_FORMAT" kB (%d%%) %d/%d tablespaces\r",
232232
totaldone /1024,totalsize,
233233
percent,
234234
tablespacenum,tablespacecount);
@@ -269,7 +269,7 @@ ReceiveTarFile(PGconn *conn, PGresult *res, int rownum)
269269
ztarfile=gzdopen(dup(fileno(stdout)),"wb");
270270
if (gzsetparams(ztarfile,compresslevel,Z_DEFAULT_STRATEGY)!=Z_OK)
271271
{
272-
fprintf(stderr,_("%s: could not set compression level %i: %s\n"),
272+
fprintf(stderr,_("%s: could not set compression level %d: %s\n"),
273273
progname,compresslevel,get_gz_error(ztarfile));
274274
disconnect_and_exit(1);
275275
}
@@ -287,7 +287,7 @@ ReceiveTarFile(PGconn *conn, PGresult *res, int rownum)
287287
ztarfile=gzopen(fn,"wb");
288288
if (gzsetparams(ztarfile,compresslevel,Z_DEFAULT_STRATEGY)!=Z_OK)
289289
{
290-
fprintf(stderr,_("%s: could not set compression level %i: %s\n"),
290+
fprintf(stderr,_("%s: could not set compression level %d: %s\n"),
291291
progname,compresslevel,get_gz_error(ztarfile));
292292
disconnect_and_exit(1);
293293
}
@@ -311,7 +311,7 @@ ReceiveTarFile(PGconn *conn, PGresult *res, int rownum)
311311
ztarfile=gzopen(fn,"wb");
312312
if (gzsetparams(ztarfile,compresslevel,Z_DEFAULT_STRATEGY)!=Z_OK)
313313
{
314-
fprintf(stderr,_("%s: could not set compression level %i: %s\n"),
314+
fprintf(stderr,_("%s: could not set compression level %d: %s\n"),
315315
progname,compresslevel,get_gz_error(ztarfile));
316316
disconnect_and_exit(1);
317317
}
@@ -533,7 +533,7 @@ ReceiveAndUnpackTarFile(PGconn *conn, PGresult *res, int rownum)
533533
*/
534534
if (r!=512)
535535
{
536-
fprintf(stderr,_("%s: invalid tar block header size: %i\n"),
536+
fprintf(stderr,_("%s: invalid tar block header size: %d\n"),
537537
progname,r);
538538
disconnect_and_exit(1);
539539
}
@@ -870,7 +870,7 @@ BaseBackup(void)
870870
*/
871871
if (format=='t'&&strcmp(basedir,"-")==0&&PQntuples(res)>1)
872872
{
873-
fprintf(stderr,_("%s: can only write single tablespace to stdout, database has %i\n"),
873+
fprintf(stderr,_("%s: can only write single tablespace to stdout, database has %d\n"),
874874
progname,PQntuples(res));
875875
disconnect_and_exit(1);
876876
}

‎src/bin/psql/command.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1663,7 +1663,7 @@ printSSLInfo(void)
16631663
return;/* no SSL */
16641664

16651665
SSL_get_cipher_bits(ssl,&sslbits);
1666-
printf(_("SSL connection (cipher: %s, bits: %i)\n"),
1666+
printf(_("SSL connection (cipher: %s, bits: %d)\n"),
16671667
SSL_get_cipher(ssl),sslbits);
16681668
#else
16691669

‎src/interfaces/libpq/fe-connect.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2355,7 +2355,7 @@ PQconnectPoll(PGconn *conn)
23552355
if (!conn->ginbuf.value)
23562356
{
23572357
printfPQExpBuffer(&conn->errorMessage,
2358-
libpq_gettext("out of memory allocating GSSAPI buffer (%i)"),
2358+
libpq_gettext("out of memory allocating GSSAPI buffer (%d)"),
23592359
llen);
23602360
gotoerror_return;
23612361
}

‎src/interfaces/libpq/win32.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -319,14 +319,14 @@ winsock_strerror(int err, char *strerrbuf, size_t buflen)
319319
}
320320

321321
if (!success)
322-
sprintf(strerrbuf,libpq_gettext("Unknown socket error (0x%08X/%i)"),err,err);
322+
sprintf(strerrbuf,libpq_gettext("Unknown socket error (0x%08X/%d)"),err,err);
323323
else
324324
{
325325
strerrbuf[buflen-1]='\0';
326326
offs=strlen(strerrbuf);
327327
if (offs> (int)buflen-64)
328328
offs=buflen-64;
329-
sprintf(strerrbuf+offs," (0x%08X/%i)",err,err);
329+
sprintf(strerrbuf+offs," (0x%08X/%d)",err,err);
330330
}
331331
returnstrerrbuf;
332332
}

‎src/timezone/pgtz.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1114,7 +1114,7 @@ identify_system_timezone(void)
11141114
&rootKey)!=ERROR_SUCCESS)
11151115
{
11161116
ereport(LOG,
1117-
(errmsg("could not open registry key to identify system time zone: %i",
1117+
(errmsg("could not open registry key to identify system time zone: %d",
11181118
(int)GetLastError()),
11191119
errdetail("The PostgreSQL time zone will be set to \"%s\".",
11201120
"GMT"),
@@ -1145,14 +1145,14 @@ identify_system_timezone(void)
11451145
if (r==ERROR_NO_MORE_ITEMS)
11461146
break;
11471147
ereport(LOG,
1148-
(errmsg_internal("could not enumerate registry subkeys to identify system time zone: %i", (int)r)));
1148+
(errmsg_internal("could not enumerate registry subkeys to identify system time zone: %d", (int)r)));
11491149
break;
11501150
}
11511151

11521152
if ((r=RegOpenKeyEx(rootKey,keyname,0,KEY_READ,&key))!=ERROR_SUCCESS)
11531153
{
11541154
ereport(LOG,
1155-
(errmsg_internal("could not open registry subkey to identify system time zone: %i", (int)r)));
1155+
(errmsg_internal("could not open registry subkey to identify system time zone: %d", (int)r)));
11561156
break;
11571157
}
11581158

@@ -1161,7 +1161,7 @@ identify_system_timezone(void)
11611161
if ((r=RegQueryValueEx(key,"Std",NULL,NULL, (unsignedchar*)zonename,&namesize))!=ERROR_SUCCESS)
11621162
{
11631163
ereport(LOG,
1164-
(errmsg_internal("could not query value for key \"std\" to identify system time zone \"%s\": %i",
1164+
(errmsg_internal("could not query value for key \"std\" to identify system time zone \"%s\": %d",
11651165
keyname, (int)r)));
11661166
RegCloseKey(key);
11671167
continue;/* Proceed to look at the next timezone */
@@ -1178,7 +1178,7 @@ identify_system_timezone(void)
11781178
if ((r=RegQueryValueEx(key,"Dlt",NULL,NULL, (unsignedchar*)zonename,&namesize))!=ERROR_SUCCESS)
11791179
{
11801180
ereport(LOG,
1181-
(errmsg_internal("could not query value for key \"dlt\" to identify system time zone \"%s\": %i",
1181+
(errmsg_internal("could not query value for key \"dlt\" to identify system time zone \"%s\": %d",
11821182
keyname, (int)r)));
11831183
RegCloseKey(key);
11841184
continue;/* Proceed to look at the next timezone */

0 commit comments

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