mirrors/binutils-gdb
0
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-11-28 04:25:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

libctf: eschew %zi format specifier

Browse Source 
Too many platforms don't support it, and we can always safely use %lu or
%li anyway, because the only uses are in debugging output.

libctf/
	* ctf-archive.c (ctf_arc_write): Eschew %zi format specifier.
	(ctf_arc_open_by_offset): Likewise.
	* ctf-create.c (ctf_add_type): Likewise.
This commit is contained in:
Nick Alcock 2019-06-05 13:34:36 +01:00
parent 0088ba596b
commit 62d8e3b731
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libctf/ChangeLog
View File

@ -1,3 +1,9 @@
2019-06-05 Nick Alcock <nick.alcock@oracle.com>
* ctf-archive.c (ctf_arc_write): Eschew %zi format specifier.
(ctf_arc_open_by_offset): Likewise.
* ctf-create.c (ctf_add_type): Likewise.
2019-06-04 Tom Tromey <tromey@adacore.com>
* ctf-create.c (ctf_add_encoded, ctf_add_slice)

7
libctf/ctf-archive.c
View File

@ -68,7 +68,8 @@ ctf_arc_write (const char *file, ctf_file_t ** ctf_files, size_t ctf_file_cnt,
off_t nameoffs;
struct ctf_archive_modent *modent;
ctf_dprintf ("Writing archive %s with %zi files\n", file, ctf_file_cnt);
ctf_dprintf ("Writing archive %s with %lu files\n", file,
(unsigned long) ctf_file_cnt);
if ((fd = open (file, O_RDWR | O_CREAT | O_TRUNC | O_CLOEXEC, 0666)) < 0)
{
@ -82,7 +83,7 @@ ctf_arc_write (const char *file, ctf_file_t ** ctf_files, size_t ctf_file_cnt,
uint64_t's. */
headersz = sizeof (struct ctf_archive)
+ (ctf_file_cnt * sizeof (uint64_t) * 2);
ctf_dprintf ("headersz is %zi\n", headersz);
ctf_dprintf ("headersz is %lu\n", (unsigned long) headersz);
/* From now on we work in two pieces: an mmap()ed region from zero up to the
headersz, and a region updated via write() starting after that, containing
@ -510,7 +511,7 @@ ctf_arc_open_by_offset (const struct ctf_archive *arc,
ctf_sect_t ctfsect;
ctf_file_t *fp;
ctf_dprintf ("ctf_arc_open_by_offset(%zi): opening\n", offset);
ctf_dprintf ("ctf_arc_open_by_offset(%lu): opening\n", (unsigned long) offset);
memset (&ctfsect, 0, sizeof (ctf_sect_t));

7
libctf/ctf-create.c
View File

@ -1822,9 +1822,10 @@ ctf_add_type (ctf_file_t *dst_fp, ctf_file_t *src_fp, ctf_id_t src_type)
ctf_type_size (dst_fp, dst_type))
{
ctf_dprintf ("Conflict for type %s against ID %lx: "
"union size differs, old %zi, new %zi\n",
name, dst_type, ctf_type_size (src_fp, src_type),
ctf_type_size (dst_fp, dst_type));
"union size differs, old %li, new %li\n",
name, dst_type,
(long) ctf_type_size (src_fp, src_type),
(long) ctf_type_size (dst_fp, dst_type));
return (ctf_set_errno (dst_fp, ECTF_CONFLICT));
}