From 26e1435f91fcf7919e1f6db3bd2a1c51e0b3263e Mon Sep 17 00:00:00 2001 From: Shankara Pailoor Date: Sun, 2 Dec 2018 11:57:10 -0800 Subject: [PATCH] print_dev_t: print major and minor numbers in hex like stat(1) * print_dev_t.c (print_dev_t): Print major and minor numbers in hex. * strace.1.in: Update makedev example. * tests/bpf-obj_get_info_by_fd.c (main): Update expected output. * tests/btrfs.c (btrfs_print_balance_args, btrfs_test_scrub_ioctls, btrfs_test_dev_info_ioctl, btrfs_test_get_dev_stats_ioctl, btrfs_test_dev_replace_ioctl): Update expected output. * tests/ioctl_dm.c (main): Likewise. * tests/ioctl_loop.c (print_loop_info, print_loop_info64): Likewise. * tests/mknod.c (main): Likewise. * tests/mknodat.c (main): Likewise. * tests/nlattr_unix_diag_msg.c (main): Likewise. * tests/ustat.c (main): Likewise. * tests/xstatx.c (print_stat): Likewise. Co-Authored-by: Dmitry V. Levin --- print_dev_t.c | 2 +- strace.1.in | 2 +- tests/bpf-obj_get_info_by_fd.c | 4 +-- tests/btrfs.c | 14 ++++----- tests/ioctl_dm.c | 52 +++++++++++++++++----------------- tests/ioctl_loop.c | 8 +++--- tests/mknod.c | 4 +-- tests/mknodat.c | 4 +-- tests/nlattr_unix_diag_msg.c | 2 +- tests/ustat.c | 8 +++--- tests/xstatx.c | 4 +-- 11 files changed, 52 insertions(+), 52 deletions(-) diff --git a/print_dev_t.c b/print_dev_t.c index 9b62f842..56476bc3 100644 --- a/print_dev_t.c +++ b/print_dev_t.c @@ -33,5 +33,5 @@ void print_dev_t(const unsigned long long dev) { - tprintf("makedev(%u, %u)", major(dev), minor(dev)); + tprintf("makedev(%#x, %#x)", major(dev), minor(dev)); } diff --git a/strace.1.in b/strace.1.in index 951431ab..1285bcde 100644 --- a/strace.1.in +++ b/strace.1.in @@ -191,7 +191,7 @@ as appropriate. In most cases, arguments are formatted in the most C-like fashion possible. For example, the essence of the command "ls \-l /dev/null" is captured as: .CW -lstat("/dev/null", {st_mode=S_IFCHR|0666, st_rdev=makedev(1, 3), ...}) = 0 +lstat("/dev/null", {st_mode=S_IFCHR|0666, st_rdev=makedev(0x1, 0x3), ...}) = 0 .CE Notice how the 'struct stat' argument is dereferenced and how each member is displayed symbolically. In particular, observe how the diff --git a/tests/bpf-obj_get_info_by_fd.c b/tests/bpf-obj_get_info_by_fd.c index 67b5122a..833f7031 100644 --- a/tests/bpf-obj_get_info_by_fd.c +++ b/tests/bpf-obj_get_info_by_fd.c @@ -333,7 +333,7 @@ main(void) printf(", ifindex=%u", map_info->ifindex); if (bpf_map_get_info_attr.info_len > offsetof(struct bpf_map_info_struct, netns_dev)) - printf(", netns_dev=makedev(%u, %u)", + printf(", netns_dev=makedev(%#x, %#x)", major(map_info->netns_dev), minor(map_info->netns_dev)); if (bpf_map_get_info_attr.info_len > offsetof(struct bpf_map_info_struct, netns_ino)) @@ -478,7 +478,7 @@ main(void) printf(", ifindex=%u", prog_info->ifindex); if (bpf_prog_get_info_attr.info_len > offsetof(struct bpf_prog_info_struct, netns_dev)) - printf(", netns_dev=makedev(%u, %u)", + printf(", netns_dev=makedev(%#x, %#x)", major(prog_info->netns_dev), minor(prog_info->netns_dev)); if (bpf_prog_get_info_attr.info_len > diff --git a/tests/btrfs.c b/tests/btrfs.c index f23d7c0a..5a60304a 100644 --- a/tests/btrfs.c +++ b/tests/btrfs.c @@ -556,7 +556,7 @@ btrfs_print_balance_args(struct btrfs_balance_args *args) prfl_btrfs(btrfs_space_info_flags, args->profiles, "BTRFS_BLOCK_GROUP_???"); print_uint64(", usage=", args->usage); - printf(", devid=makedev(%u, %u)", + printf(", devid=makedev(%#x, %#x)", major(args->devid), minor(args->devid)); print_uint64(", pstart=", args->pstart); print_uint64(", pend=", args->pend); @@ -1212,7 +1212,7 @@ btrfs_test_scrub_ioctls(void) ioctl(-1, BTRFS_IOC_SCRUB_CANCEL, NULL); printf("ioctl(-1, %s) = -1 EBADF (%m)\n", ioc(BTRFS_IOC_SCRUB_CANCEL)); - printf("ioctl(-1, %s, {devid=makedev(%u, %u)", + printf("ioctl(-1, %s, {devid=makedev(%#x, %#x)", ioc(BTRFS_IOC_SCRUB), major(args.devid), minor(args.devid)); print_uint64(", start=", args.start); print_uint64(", end=", args.end); @@ -1226,7 +1226,7 @@ btrfs_test_scrub_ioctls(void) ioc(BTRFS_IOC_SCRUB_PROGRESS)); ioctl(-1, BTRFS_IOC_SCRUB_PROGRESS, &args); - printf("ioctl(-1, %s, {devid=makedev(%u, %u)}) = -1 EBADF (%m)\n", + printf("ioctl(-1, %s, {devid=makedev(%#x, %#x)}) = -1 EBADF (%m)\n", ioc(BTRFS_IOC_SCRUB_PROGRESS), major(args.devid), minor(args.devid)); } @@ -1249,7 +1249,7 @@ btrfs_test_dev_info_ioctl(void) ioctl(-1, BTRFS_IOC_DEV_INFO, &args); printf("ioctl(-1, %s, " - "{devid=makedev(%u, %u), uuid=%s}) = -1 EBADF (%m)\n", + "{devid=makedev(%#x, %#x), uuid=%s}) = -1 EBADF (%m)\n", ioc(BTRFS_IOC_DEV_INFO), major(args.devid), minor(args.devid), uuid_reference_string); } @@ -1703,7 +1703,7 @@ btrfs_test_get_dev_stats_ioctl(void) ioctl(-1, BTRFS_IOC_GET_DEV_STATS, NULL); printf("ioctl(-1, %s, NULL) = -1 EBADF (%m)\n", ioc(BTRFS_IOC_GET_DEV_STATS)); - printf("ioctl(-1, %s, {devid=makedev(%u, %u)" + printf("ioctl(-1, %s, {devid=makedev(%#x, %#x)" ", nr_items=%" PRI__u64 ", flags=", ioc(BTRFS_IOC_GET_DEV_STATS), major(args.devid), minor(args.devid), args.nr_items); @@ -1715,7 +1715,7 @@ btrfs_test_get_dev_stats_ioctl(void) if (write_ok) { unsigned int i; args.flags = BTRFS_DEV_STATS_RESET; - printf("ioctl(%d, %s, {devid=makedev(%u, %u)" + printf("ioctl(%d, %s, {devid=makedev(%#x, %#x)" ", nr_items=%" PRI__u64 ", flags=", btrfs_test_dir_fd, ioc(BTRFS_IOC_GET_DEV_STATS), major(args.devid), minor(args.devid), args.nr_items); @@ -1775,7 +1775,7 @@ btrfs_test_dev_replace_ioctl(void) saved_errno = errno; printf("ioctl(-1, %s, " "{cmd=%sBTRFS_IOCTL_DEV_REPLACE_CMD_START%s" - ", start={srcdevid=makedev(%u, %u)" + ", start={srcdevid=makedev(%#x, %#x)" ", cont_reading_from_srcdev_mode=", ioc(BTRFS_IOC_DEV_REPLACE), verbose_xlat ? "0 /* " : "", verbose_xlat ? " */" : "", diff --git a/tests/ioctl_dm.c b/tests/ioctl_dm.c index 3792291e..e65579aa 100644 --- a/tests/ioctl_dm.c +++ b/tests/ioctl_dm.c @@ -255,7 +255,7 @@ main(void) memcpy(dm_arg->uuid, str129, sizeof(dm_arg->uuid)); ioctl(-1, DM_VERSION, dm_arg); printf("ioctl(-1, DM_VERSION, {version=4.1.2, data_size=%zu, " - "dev=makedev(18, 52), name=\"%.127s\"..., uuid=\"%.128s\"..., " + "dev=makedev(0x12, 0x34), name=\"%.127s\"..., uuid=\"%.128s\"..., " "flags=0}) = -1 EBADF (%m)\n", min_sizeof_dm_ioctl, str129, str129); @@ -264,7 +264,7 @@ main(void) ioctl(-1, DM_VERSION, dm_arg); printf("ioctl(-1, DM_VERSION, " "{version=4.1.2, data_size=%zu, " - "dev=makedev(18, 52), name=\"nnn\", uuid=\"uuu\", flags=0}) = " + "dev=makedev(0x12, 0x34), name=\"nnn\", uuid=\"uuu\", flags=0}) = " "-1 EBADF (%m)\n", min_sizeof_dm_ioctl); /* Zero dev, name, uuid */ @@ -284,7 +284,7 @@ main(void) ioctl(-1, DM_VERSION, dm_arg); printf("ioctl(-1, DM_VERSION, " "{version=4.1.2, data_size=%zu, " - "dev=makedev(18, 52), name=\"nnn\", uuid=\"uuu\", flags=" + "dev=makedev(0x12, 0x34), name=\"nnn\", uuid=\"uuu\", flags=" "DM_READONLY_FLAG|DM_SUSPEND_FLAG|DM_EXISTS_FLAG|" "DM_PERSISTENT_DEV_FLAG|DM_STATUS_TABLE_FLAG|" "DM_ACTIVE_PRESENT_FLAG|DM_INACTIVE_PRESENT_FLAG|" @@ -300,7 +300,7 @@ main(void) ioctl(-1, DM_VERSION, &s); printf("ioctl(-1, DM_VERSION, " "{version=4.1.2, data_size=%zu, " - "dev=makedev(18, 52), name=\"nnn\", uuid=\"uuu\", flags=0}) = " + "dev=makedev(0x12, 0x34), name=\"nnn\", uuid=\"uuu\", flags=0}) = " "-1 EBADF (%m)\n", sizeof(s.ioc)); @@ -330,7 +330,7 @@ main(void) init_s(dm_arg, min_sizeof_dm_ioctl, 0); ioctl(-1, dummy_check_cmds[i].arg, dm_arg); printf("ioctl(-1, %s, {version=4.1.2, data_size=%zu%s, " - "dev=makedev(18, 52), name=\"nnn\", uuid=\"uuu\"%s, " + "dev=makedev(0x12, 0x34), name=\"nnn\", uuid=\"uuu\"%s, " "flags=0}) = -1 EBADF (%m)\n", dummy_check_cmds[i].str, min_sizeof_dm_ioctl, dummy_check_cmds[i].has_params ? ", data_start=0" : "", @@ -345,14 +345,14 @@ main(void) ioctl(-1, DM_DEV_SUSPEND, &s); printf("ioctl(-1, DM_DEV_SUSPEND, " "{version=4.1.2, data_size=%zu, " - "dev=makedev(18, 52), name=\"nnn\", uuid=\"uuu\", " + "dev=makedev(0x12, 0x34), name=\"nnn\", uuid=\"uuu\", " "flags=DM_SUSPEND_FLAG}) = -1 EBADF (%m)\n", sizeof(s.ioc)); init_s(&s.ioc, sizeof(s.ioc), 0); s.ioc.event_nr = 0xbadc0ded; ioctl(-1, DM_DEV_SUSPEND, &s); printf("ioctl(-1, DM_DEV_SUSPEND, " - "{version=4.1.2, data_size=%zu, dev=makedev(18, 52), " + "{version=4.1.2, data_size=%zu, dev=makedev(0x12, 0x34), " "name=\"nnn\", uuid=\"uuu\", event_nr=3134983661, " "flags=0}) = -1 EBADF (%m)\n", sizeof(s.ioc)); @@ -369,7 +369,7 @@ main(void) ioctl(-1, DM_TABLE_LOAD, &s); printf("ioctl(-1, DM_TABLE_LOAD, " "{version=4.1.2, data_size=%u, data_start=%u, " - "dev=makedev(18, 52), name=\"nnn\", uuid=\"uuu\", " + "dev=makedev(0x12, 0x34), name=\"nnn\", uuid=\"uuu\", " "target_count=1, flags=0, " # if VERBOSE "{sector_start=16, length=32, target_type=\"tgt\", " @@ -386,7 +386,7 @@ main(void) ioctl(-1, DM_TABLE_LOAD, dm_arg); printf("ioctl(-1, DM_TABLE_LOAD, " "{version=4.1.2, data_size=%zu, data_start=%zu, " - "dev=makedev(18, 52), name=\"nnn\", uuid=\"uuu\", " + "dev=makedev(0x12, 0x34), name=\"nnn\", uuid=\"uuu\", " "target_count=0, flags=0}) = -1 EBADF (%m)\n", sizeof(*dm_arg), min_sizeof_dm_ioctl); @@ -397,7 +397,7 @@ main(void) ioctl(-1, DM_TABLE_LOAD, dm_arg); printf("ioctl(-1, DM_TABLE_LOAD, " "{version=4.1.2, data_size=%zu, data_start=%u, " - "dev=makedev(18, 52), name=\"nnn\", uuid=\"uuu\", " + "dev=makedev(0x12, 0x34), name=\"nnn\", uuid=\"uuu\", " "target_count=1234, flags=0, " # if VERBOSE "??? /* misplaced struct dm_target_spec */" @@ -414,7 +414,7 @@ main(void) ioctl(-1, DM_TABLE_LOAD, dm_arg_open1); printf("ioctl(-1, DM_TABLE_LOAD, " "{version=4.1.2, data_size=%zu, data_start=%zu, " - "dev=makedev(18, 52), name=\"nnn\", uuid=\"uuu\", " + "dev=makedev(0x12, 0x34), name=\"nnn\", uuid=\"uuu\", " "target_count=3735936673, flags=0, " # if VERBOSE "%p" @@ -442,7 +442,7 @@ main(void) errstr = sprintrc(rc); printf("ioctl(-1, DM_TABLE_LOAD, " "{version=4.1.2, data_size=%zu, data_start=%zu, " - "dev=makedev(18, 52), name=\"nnn\", uuid=\"uuu\", " + "dev=makedev(0x12, 0x34), name=\"nnn\", uuid=\"uuu\", " "target_count=2, flags=0, ", sizeof(*dm_arg_open2), offsetof(struct dm_table_open_test, target1)); @@ -486,7 +486,7 @@ main(void) errstr = sprintrc(rc); printf("ioctl(-1, DM_TABLE_LOAD, " "{version=4.1.2, data_size=%zu, data_start=%zu, " - "dev=makedev(18, 52), name=\"nnn\", uuid=\"uuu\", " + "dev=makedev(0x12, 0x34), name=\"nnn\", uuid=\"uuu\", " "target_count=4, flags=0, ", offsetof(struct dm_table_open_test, target5), offsetof(struct dm_table_open_test, target0)); @@ -537,7 +537,7 @@ main(void) errstr = sprintrc(rc); printf("ioctl(-1, DM_TABLE_LOAD, " "{version=4.1.2, data_size=%zu, data_start=%zu, " - "dev=makedev(18, 52), name=\"nnn\", uuid=\"uuu\", " + "dev=makedev(0x12, 0x34), name=\"nnn\", uuid=\"uuu\", " "target_count=3134983661, flags=0, ", sizeof(*dm_arg_open3), offsetof(struct dm_table_open_test, target0)); @@ -563,7 +563,7 @@ main(void) ioctl(-1, DM_TARGET_MSG, &s); printf("ioctl(-1, DM_TARGET_MSG, " "{version=4.1.2, data_size=%u, data_start=%u, " - "dev=makedev(18, 52), name=\"nnn\", uuid=\"uuu\", flags=0, " + "dev=makedev(0x12, 0x34), name=\"nnn\", uuid=\"uuu\", flags=0, " # if VERBOSE "{sector=4660, message=\"long targ\"...}" # else /* !VERBOSE */ @@ -578,7 +578,7 @@ main(void) ioctl(-1, DM_TARGET_MSG, dm_arg); printf("ioctl(-1, DM_TARGET_MSG, " "{version=4.1.2, data_size=%zu, data_start=%zu, " - "dev=makedev(18, 52), name=\"nnn\", uuid=\"uuu\", flags=0, " + "dev=makedev(0x12, 0x34), name=\"nnn\", uuid=\"uuu\", flags=0, " # if VERBOSE "??? /* misplaced struct dm_target_msg */" # else /* !VERBOSE */ @@ -593,7 +593,7 @@ main(void) ioctl(-1, DM_TARGET_MSG, dm_arg); printf("ioctl(-1, DM_TARGET_MSG, " "{version=4.1.2, data_size=%zu, data_start=%u, " - "dev=makedev(18, 52), name=\"nnn\", uuid=\"uuu\", flags=0, " + "dev=makedev(0x12, 0x34), name=\"nnn\", uuid=\"uuu\", flags=0, " # if VERBOSE "??? /* misplaced struct dm_target_msg */" # else /* !VERBOSE */ @@ -609,7 +609,7 @@ main(void) ioctl(-1, DM_TARGET_MSG, dm_arg); printf("ioctl(-1, DM_TARGET_MSG, " "{version=4.1.2, data_size=%zu, data_start=%zu, " - "dev=makedev(18, 52), name=\"nnn\", uuid=\"uuu\", flags=0, " + "dev=makedev(0x12, 0x34), name=\"nnn\", uuid=\"uuu\", flags=0, " # if VERBOSE "%p" # else /* !VERBOSE */ @@ -632,7 +632,7 @@ main(void) errstr = sprintrc(rc); printf("ioctl(-1, DM_TARGET_MSG, " "{version=4.1.2, data_size=%zu, data_start=%zu, " - "dev=makedev(18, 52), name=\"nnn\", uuid=\"uuu\", flags=0, ", + "dev=makedev(0x12, 0x34), name=\"nnn\", uuid=\"uuu\", flags=0, ", sizeof(*dm_arg_msg) + 1, offsetof(struct dm_target_msg_test, msg)); # if VERBOSE @@ -653,7 +653,7 @@ main(void) errstr = sprintrc(rc); printf("ioctl(-1, DM_TARGET_MSG, " "{version=4.1.2, data_size=%zu, data_start=%zu, " - "dev=makedev(18, 52), name=\"nnn\", uuid=\"uuu\", flags=0, ", + "dev=makedev(0x12, 0x34), name=\"nnn\", uuid=\"uuu\", flags=0, ", sizeof(*dm_arg_msg), offsetof(struct dm_target_msg_test, msg)); # if VERBOSE printf("{sector=%" PRI__u64 ", message=\"\"}", @@ -670,7 +670,7 @@ main(void) ioctl(-1, DM_DEV_SET_GEOMETRY, &s); printf("ioctl(-1, DM_DEV_SET_GEOMETRY, " "{version=4.1.2, data_size=%u, data_start=%u, " - "dev=makedev(18, 52), name=\"nnn\", uuid=\"uuu\", flags=0, " + "dev=makedev(0x12, 0x34), name=\"nnn\", uuid=\"uuu\", flags=0, " # if VERBOSE "string=\"10 20 30 \"..." # else /* !VERBOSE */ @@ -688,7 +688,7 @@ main(void) ioctl(-1, DM_DEV_RENAME, unaligned_dm_arg); printf("ioctl(-1, DM_DEV_RENAME, " "{version=4.1.2, data_size=%zu, data_start=%zu, " - "dev=makedev(18, 52), name=\"nnn\", uuid=\"uuu\", event_nr=0, " + "dev=makedev(0x12, 0x34), name=\"nnn\", uuid=\"uuu\", event_nr=0, " "flags=0, " # if VERBOSE "string=%p" @@ -708,7 +708,7 @@ main(void) ioctl(-1, DM_DEV_RENAME, &s); printf("ioctl(-1, DM_DEV_RENAME, " "{version=4.1.2, data_size=%u, data_start=3735928559, " - "dev=makedev(18, 52), name=\"nnn\", uuid=\"uuu\", event_nr=0, " + "dev=makedev(0x12, 0x34), name=\"nnn\", uuid=\"uuu\", event_nr=0, " "flags=0, " # if VERBOSE "??? /* misplaced string */" @@ -725,7 +725,7 @@ main(void) ioctl(-1, DM_DEV_RENAME, &s); printf("ioctl(-1, DM_DEV_RENAME, " "{version=4.1.2, data_size=%u, data_start=%zu, " - "dev=makedev(18, 52), name=\"nnn\", uuid=\"uuu\", event_nr=0, " + "dev=makedev(0x12, 0x34), name=\"nnn\", uuid=\"uuu\", event_nr=0, " "flags=0, " # if VERBOSE "string=\"nn\"" @@ -742,7 +742,7 @@ main(void) ioctl(-1, DM_DEV_RENAME, &s); printf("ioctl(-1, DM_DEV_RENAME, " "{version=4.1.2, data_size=%u, data_start=%u, " - "dev=makedev(18, 52), name=\"nnn\", uuid=\"uuu\", event_nr=0, " + "dev=makedev(0x12, 0x34), name=\"nnn\", uuid=\"uuu\", event_nr=0, " "flags=0, " # if VERBOSE "string=\"new long \"..." @@ -759,7 +759,7 @@ main(void) ioctl(-1, DM_TABLE_LOAD, &s); printf("ioctl(-1, DM_TABLE_LOAD, " "{version=4.1.2, data_size=%u, data_start=%u, " - "dev=makedev(18, 52), name=\"nnn\", uuid=\"uuu\", " + "dev=makedev(0x12, 0x34), name=\"nnn\", uuid=\"uuu\", " "target_count=4294967295, flags=0, " # if VERBOSE "{sector_start=0, length=0, target_type=\"\", string=\"\"}" diff --git a/tests/ioctl_loop.c b/tests/ioctl_loop.c index 06c99ae4..dbd74f66 100644 --- a/tests/ioctl_loop.c +++ b/tests/ioctl_loop.c @@ -63,8 +63,8 @@ print_loop_info(struct loop_info * const info, bool print_encrypt, #else printf("{lo_number=%d", info->lo_number); # if VERBOSE - printf(", lo_device=makedev(%u, %u), lo_inode=%lu, " - "lo_rdevice=makedev(%u, %u)", + printf(", lo_device=makedev(%#x, %#x), lo_inode=%lu, " + "lo_rdevice=makedev(%#x, %#x)", major(info->lo_device), minor(info->lo_device), info->lo_inode, major(info->lo_rdevice), minor(info->lo_rdevice)); @@ -119,8 +119,8 @@ print_loop_info64(struct loop_info64 * const info64, bool print_encrypt, printf("%p", info64); #else # if VERBOSE - printf("{lo_device=makedev(%u, %u), lo_inode=%" PRIu64 - ", lo_rdevice=makedev(%u, %u), lo_offset=%#" PRIx64 + printf("{lo_device=makedev(%#x, %#x), lo_inode=%" PRIu64 + ", lo_rdevice=makedev(%#x, %#x), lo_offset=%#" PRIx64 ", lo_sizelimit=%" PRIu64 ", lo_number=%" PRIu32, major(info64->lo_device), minor(info64->lo_device), (uint64_t) info64->lo_inode, diff --git a/tests/mknod.c b/tests/mknod.c index 4bcc2744..1d8591a0 100644 --- a/tests/mknod.c +++ b/tests/mknod.c @@ -50,7 +50,7 @@ main(int ac, char **av) dev = (unsigned long) 0xdeadbeef00000000ULL | makedev(1, 7); rc = call_mknod(S_IFCHR | 024, dev); - printf("mknod(\"%s\", S_IFCHR|024, makedev(1, 7)) = %ld %s (%m)\n", + printf("mknod(\"%s\", S_IFCHR|024, makedev(0x1, 0x7)) = %ld %s (%m)\n", sample, rc, errno2name()); const unsigned short mode = (0xffff & ~S_IFMT) | S_IFBLK; @@ -58,7 +58,7 @@ main(int ac, char **av) rc = call_mknod(mode, dev); printf("mknod(\"%s\", S_IFBLK|S_ISUID|S_ISGID|S_ISVTX|%#03ho" - ", makedev(%u, %u)) = %ld %s (%m)\n", + ", makedev(%#x, %#x)) = %ld %s (%m)\n", sample, (short) (mode & ~(S_IFMT|S_ISUID|S_ISGID|S_ISVTX)), major((unsigned) dev), minor((unsigned) dev), rc, errno2name()); diff --git a/tests/mknodat.c b/tests/mknodat.c index 318dc5a6..7ef57655 100644 --- a/tests/mknodat.c +++ b/tests/mknodat.c @@ -50,7 +50,7 @@ main(void) dev = (unsigned long) 0xdeadbeef00000000ULL | makedev(1, 7); rc = call_mknodat(S_IFCHR | 024, dev); - printf("mknodat(-1, \"%s\", S_IFCHR|024, makedev(1, 7)) = %ld %s (%m)\n", + printf("mknodat(-1, \"%s\", S_IFCHR|024, makedev(0x1, 0x7)) = %ld %s (%m)\n", sample, rc, errno2name()); const unsigned short mode = (0xffff & ~S_IFMT) | S_IFBLK; @@ -58,7 +58,7 @@ main(void) rc = call_mknodat(mode, dev); printf("mknodat(-1, \"%s\", S_IFBLK|S_ISUID|S_ISGID|S_ISVTX|%#03ho" - ", makedev(%u, %u)) = %ld %s (%m)\n", + ", makedev(%#x, %#x)) = %ld %s (%m)\n", sample, (short) (mode & ~(S_IFMT|S_ISUID|S_ISGID|S_ISVTX)), major((unsigned) dev), minor((unsigned) dev), rc, errno2name()); diff --git a/tests/nlattr_unix_diag_msg.c b/tests/nlattr_unix_diag_msg.c index 180b8cd6..ec1363e3 100644 --- a/tests/nlattr_unix_diag_msg.c +++ b/tests/nlattr_unix_diag_msg.c @@ -96,7 +96,7 @@ main(void) TEST_NLATTR_OBJECT(fd, nlh0, hdrlen, init_unix_diag_msg, print_unix_diag_msg, UNIX_DIAG_VFS, pattern, uv, - printf("{udiag_vfs_dev=makedev(%u, %u)", + printf("{udiag_vfs_dev=makedev(%#x, %#x)", major(uv.udiag_vfs_dev), minor(uv.udiag_vfs_dev)); PRINT_FIELD_U(", ", uv, udiag_vfs_ino); diff --git a/tests/ustat.c b/tests/ustat.c index 3341c70e..a8d7de79 100644 --- a/tests/ustat.c +++ b/tests/ustat.c @@ -55,10 +55,10 @@ main(void) dev = (unsigned int) st.st_dev; rc = syscall(__NR_ustat, dev, ust); if (rc) - printf("ustat(makedev(%u, %u), %p) = %s\n", + printf("ustat(makedev(%#x, %#x), %p) = %s\n", major(dev), minor(dev), ust, sprintrc(rc)); else - printf("ustat(makedev(%u, %u)" + printf("ustat(makedev(%#x, %#x)" ", {f_tfree=%llu, f_tinode=%llu}) = 0\n", major(dev), minor(dev), zero_extend_signed_to_ull(ust->f_tfree), @@ -67,11 +67,11 @@ main(void) dev = (unsigned int) magic; rc = syscall(__NR_ustat, magic, 0); - printf("ustat(makedev(%u, %u), NULL) = %s\n", + printf("ustat(makedev(%#x, %#x), NULL) = %s\n", major(dev), minor(dev), sprintrc(rc)); rc = syscall(__NR_ustat, magic, buf); - printf("ustat(makedev(%u, %u), %p) = %s\n", + printf("ustat(makedev(%#x, %#x), %p) = %s\n", major(dev), minor(dev), buf, sprintrc(rc)); puts("+++ exited with 0 +++"); diff --git a/tests/xstatx.c b/tests/xstatx.c index 65fbad40..546b8024 100644 --- a/tests/xstatx.c +++ b/tests/xstatx.c @@ -147,7 +147,7 @@ print_perms(const unsigned int mode) static void print_stat(const STRUCT_STAT *st) { - printf("{st_dev=makedev(%u, %u)", + printf("{st_dev=makedev(%#x, %#x)", (unsigned int) major(zero_extend_signed_to_ull(st->st_dev)), (unsigned int) minor(zero_extend_signed_to_ull(st->st_dev))); printf(", st_ino=%llu", zero_extend_signed_to_ull(st->st_ino)); @@ -167,7 +167,7 @@ print_stat(const STRUCT_STAT *st) switch (st->st_mode & S_IFMT) { case S_IFCHR: case S_IFBLK: - printf(", st_rdev=makedev(%u, %u)", + printf(", st_rdev=makedev(%#x, %#x)", (unsigned int) major(zero_extend_signed_to_ull(st->st_rdev)), (unsigned int) minor(zero_extend_signed_to_ull(st->st_rdev))); break; -- 2.40.0