database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-09 18:21:05 +03:00
Code

Remove some unnecessary casts in format arguments

Browse Source 
We can use %zd or %zu directly, no need to cast to int.  Conversely,
some code was casting away from int when it could be using %d
directly.
This commit is contained in:
Peter Eisentraut 2021-08-08 22:05:42 +02:00
parent cf5ce5aa70
commit ae03a7c739
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/access/spgist/spgutils.c
View File

@ -1240,8 +1240,8 @@ SpGistPageAddNewItem(SpGistState *state, Page page, Item item, Size size,
*startOffset = offnum + 1;
}
else
elog(PANIC, "failed to add item of size %u to SPGiST index page",
(int) size);
elog(PANIC, "failed to add item of size %zu to SPGiST index page",
size);
return offnum;
}
@ -1252,8 +1252,8 @@ SpGistPageAddNewItem(SpGistState *state, Page page, Item item, Size size,
InvalidOffsetNumber, false, false);
if (offnum == InvalidOffsetNumber && !errorOK)
elog(ERROR, "failed to add item of size %u to SPGiST index page",
(int) size);
elog(ERROR, "failed to add item of size %zu to SPGiST index page",
size);
return offnum;
}

4
src/backend/access/transam/xlogutils.c
View File

@ -991,8 +991,8 @@ WALReadRaiseError(WALReadError *errinfo)
{
ereport(ERROR,
(errcode(ERRCODE_DATA_CORRUPTED),
errmsg("could not read from log segment %s, offset %u: read %d of %zu",
errmsg("could not read from log segment %s, offset %u: read %d of %d",
fname, errinfo->wre_off, errinfo->wre_read,
(Size) errinfo->wre_req)));
errinfo->wre_req)));
}
}

4
src/backend/utils/adt/xml.c
View File

@ -959,8 +959,8 @@ pg_xml_init_library(void)
if (sizeof(char) != sizeof(xmlChar))
ereport(ERROR,
(errmsg("could not initialize XML library"),
errdetail("libxml2 has incompatible char type: sizeof(char)=%u, sizeof(xmlChar)=%u.",
(int) sizeof(char), (int) sizeof(xmlChar))));
errdetail("libxml2 has incompatible char type: sizeof(char)=%zu, sizeof(xmlChar)=%zu.",
sizeof(char), sizeof(xmlChar))));
#ifdef USE_LIBXMLCONTEXT
/* Set up libxml's memory allocation our way */

6
src/bin/pg_basebackup/receivelog.c
View File

@ -150,10 +150,10 @@ open_walfile(StreamCtl *stream, XLogRecPtr startpoint)
/* if write didn't set errno, assume problem is no disk space */
if (errno == 0)
errno = ENOSPC;
pg_log_error(ngettext("write-ahead log file \"%s\" has %d byte, should be 0 or %d",
"write-ahead log file \"%s\" has %d bytes, should be 0 or %d",
pg_log_error(ngettext("write-ahead log file \"%s\" has %zd byte, should be 0 or %d",
"write-ahead log file \"%s\" has %zd bytes, should be 0 or %d",
size),
fn, (int) size, WalSegSz);
fn, size, WalSegSz);
pg_free(fn);
return false;
}

8
src/bin/pg_waldump/pg_waldump.c
View File

@ -211,8 +211,8 @@ search_directory(const char *directory, const char *fname)
fatal_error("could not read file \"%s\": %m",
fname);
else
fatal_error("could not read file \"%s\": read %d of %zu",
fname, r, (Size) XLOG_BLCKSZ);
fatal_error("could not read file \"%s\": read %d of %d",
fname, r, XLOG_BLCKSZ);
}
close(fd);
return true;
@ -369,9 +369,9 @@ WALDumpReadPage(XLogReaderState *state, XLogRecPtr targetPagePtr, int reqLen,
fname, errinfo.wre_off);
}
else
fatal_error("could not read from file %s, offset %u: read %d of %zu",
fatal_error("could not read from file %s, offset %u: read %d of %d",
fname, errinfo.wre_off, errinfo.wre_read,
(Size) errinfo.wre_req);
errinfo.wre_req);
}
return count;