git: f363b08c6d5f - stable/13 - rtld dump_auxv: consistently use long modifier for non-pointer auxv vals
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 19 Nov 2021 04:36:38 UTC
The branch stable/13 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=f363b08c6d5f3f3df0f6f301b08348cf003beac1
commit f363b08c6d5f3f3df0f6f301b08348cf003beac1
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2021-11-13 19:03:48 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2021-11-19 04:25:27 +0000
rtld dump_auxv: consistently use long modifier for non-pointer auxv vals
(cherry picked from commit 3a902ef253853e367bd755222ed8fe4f101fbf2c)
---
libexec/rtld-elf/rtld.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c
index 0475134b0d96..4c3762ee1ab9 100644
--- a/libexec/rtld-elf/rtld.c
+++ b/libexec/rtld-elf/rtld.c
@@ -6071,33 +6071,33 @@ static const struct auxfmt {
} auxfmts[] = {
AUXFMT(AT_NULL, NULL),
AUXFMT(AT_IGNORE, NULL),
- AUXFMT(AT_EXECFD, "%d"),
+ AUXFMT(AT_EXECFD, "%ld"),
AUXFMT(AT_PHDR, "%p"),
- AUXFMT(AT_PHENT, "%u"),
- AUXFMT(AT_PHNUM, "%u"),
- AUXFMT(AT_PAGESZ, "%u"),
+ AUXFMT(AT_PHENT, "%lu"),
+ AUXFMT(AT_PHNUM, "%lu"),
+ AUXFMT(AT_PAGESZ, "%lu"),
AUXFMT(AT_BASE, "%#lx"),
AUXFMT(AT_FLAGS, "%#lx"),
AUXFMT(AT_ENTRY, "%p"),
AUXFMT(AT_NOTELF, NULL),
- AUXFMT(AT_UID, "%d"),
- AUXFMT(AT_EUID, "%d"),
- AUXFMT(AT_GID, "%d"),
- AUXFMT(AT_EGID, "%d"),
+ AUXFMT(AT_UID, "%ld"),
+ AUXFMT(AT_EUID, "%ld"),
+ AUXFMT(AT_GID, "%ld"),
+ AUXFMT(AT_EGID, "%ld"),
AUXFMT(AT_EXECPATH, "%s"),
AUXFMT(AT_CANARY, "%p"),
- AUXFMT(AT_CANARYLEN, "%u"),
- AUXFMT(AT_OSRELDATE, "%u"),
- AUXFMT(AT_NCPUS, "%u"),
+ AUXFMT(AT_CANARYLEN, "%lu"),
+ AUXFMT(AT_OSRELDATE, "%lu"),
+ AUXFMT(AT_NCPUS, "%lu"),
AUXFMT(AT_PAGESIZES, "%p"),
- AUXFMT(AT_PAGESIZESLEN, "%u"),
+ AUXFMT(AT_PAGESIZESLEN, "%lu"),
AUXFMT(AT_TIMEKEEP, "%p"),
- AUXFMT(AT_STACKPROT, "%#x"),
+ AUXFMT(AT_STACKPROT, "%#lx"),
AUXFMT(AT_EHDRFLAGS, "%#lx"),
AUXFMT(AT_HWCAP, "%#lx"),
AUXFMT(AT_HWCAP2, "%#lx"),
AUXFMT(AT_BSDFLAGS, "%#lx"),
- AUXFMT(AT_ARGC, "%u"),
+ AUXFMT(AT_ARGC, "%lu"),
AUXFMT(AT_ARGV, "%p"),
AUXFMT(AT_ENVC, "%p"),
AUXFMT(AT_ENVV, "%p"),