diff options
author | Dmitry V. Levin <ldv@altlinux.org> | 2020-07-13 08:00:00 +0000 |
---|---|---|
committer | Dmitry V. Levin <ldv@altlinux.org> | 2020-07-13 08:00:00 +0000 |
commit | 2623f105630b50c027cf3eaab03fd202fc6a8d31 (patch) | |
tree | c62c875a0ef5f103162ae6609801f7955412ba86 | |
parent | 2d1a6b698d755f52d58ad15c9d444af6b097b005 (diff) | |
download | strace-2623f105630b50c027cf3eaab03fd202fc6a8d31.tar.gz |
fcntl: use print_fields.h macros
* fcntl.c: Include "print_fields.h".
(print_struct_flock64, print_f_owner_ex): Use PRINT_FIELD_* macros
from print_fields.h.
-rw-r--r-- | fcntl.c | 19 |
1 files changed, 9 insertions, 10 deletions
@@ -11,6 +11,7 @@ #include "defs.h" #include "flock.h" +#include "print_fields.h" #include "xlat/f_owner_types.h" #include "xlat/f_seals.h" @@ -22,14 +23,12 @@ static void print_struct_flock64(const struct_kernel_flock64 *fl, const int getlk) { - tprints("{l_type="); - printxval(lockfcmds, (unsigned short) fl->l_type, "F_???"); - tprints(", l_whence="); - printxval(whence_codes, (unsigned short) fl->l_whence, "SEEK_???"); - tprintf(", l_start=%" PRId64 ", l_len=%" PRId64, - (int64_t) fl->l_start, (int64_t) fl->l_len); + PRINT_FIELD_XVAL("{", *fl, l_type, lockfcmds, "F_???"); + PRINT_FIELD_XVAL(", ", *fl, l_whence, whence_codes, "SEEK_???"); + PRINT_FIELD_D(", ", *fl, l_start); + PRINT_FIELD_D(", ", *fl, l_len); if (getlk) - tprintf(", l_pid=%lu", (unsigned long) fl->l_pid); + PRINT_FIELD_D(", ", *fl, l_pid); tprints("}"); } @@ -59,9 +58,9 @@ print_f_owner_ex(struct tcb *const tcp, const kernel_ulong_t addr) if (umove_or_printaddr(tcp, addr, &owner)) return; - tprints("{type="); - printxval(f_owner_types, owner.type, "F_OWNER_???"); - tprintf(", pid=%d}", owner.pid); + PRINT_FIELD_XVAL("{", owner, type, f_owner_types, "F_OWNER_???"); + PRINT_FIELD_D(", ", owner, pid); + tprints("}"); } static int |