diff options
| author | Eugene Syromyatnikov <evgsyr@gmail.com> | 2016-12-26 15:25:35 +0300 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@altlinux.org> | 2016-12-29 00:11:24 +0000 |
| commit | 32e813144c3ebb078d8da9d5325255b6aa933a9b (patch) | |
| tree | 32e01a11f32b6ff57dc21d6bc35819c07d904cf1 /print_struct_stat.c | |
| parent | 54f2397c84f18a666d9e300f342141caf79c2a61 (diff) | |
| download | strace-32e813144c3ebb078d8da9d5325255b6aa933a9b.tar.gz | |
Move device number printing code into a separate routine
* print_dev_t.c: New file.
* Makefile.am (strace_SOURCES): Add it.
* defs.h (print_dev_t): New prototype.
* dm.c: Do not include <sys/sysmacros.h>.
(dm_decode_device, dm_print_dev, dm_decode_dm_name_list): Use
print_dev_t function for printing device numbers.
* mknod.c: Do not include <sys/sysmacros.h>.
(decode_mknod): Use print_dev_t function for printing device number.
* print_struct_stat.c: Do not include <sys/sysmacros.h>.
(print_struct_stat): Use print_dev_t function for printing device
numbers.
Co-authored-by: Dmitry V. Levin <ldv@altlinux.org>
Diffstat (limited to 'print_struct_stat.c')
| -rw-r--r-- | print_struct_stat.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/print_struct_stat.c b/print_struct_stat.c index 7b23ec8a8..7e9e23380 100644 --- a/print_struct_stat.c +++ b/print_struct_stat.c @@ -34,7 +34,6 @@ #include "defs.h" #include <sys/stat.h> -#include <sys/sysmacros.h> #include "stat.h" void @@ -42,10 +41,9 @@ print_struct_stat(struct tcb *tcp, const struct strace_stat *const st) { tprints("{"); if (!abbrev(tcp)) { - tprintf("st_dev=makedev(%u, %u), st_ino=%llu, st_mode=", - (unsigned int) major(st->dev), - (unsigned int) minor(st->dev), - st->ino); + tprints("st_dev="); + print_dev_t(st->dev); + tprintf(", st_ino=%llu, st_mode=", st->ino); print_symbolic_mode_t(st->mode); tprintf(", st_nlink=%llu, st_uid=%llu, st_gid=%llu", st->nlink, st->uid, st->gid); @@ -58,9 +56,8 @@ print_struct_stat(struct tcb *tcp, const struct strace_stat *const st) switch (st->mode & S_IFMT) { case S_IFCHR: case S_IFBLK: - tprintf(", st_rdev=makedev(%u, %u)", - (unsigned int) major(st->rdev), - (unsigned int) minor(st->rdev)); + tprints(", st_rdev="); + print_dev_t(st->rdev); break; default: tprintf(", st_size=%llu", st->size); |