netlink_sock_diag: print inet_diag_sockid.idiag_if as an interface index

[strace] / print_mq_attr.c

diff --git a/print_mq_attr.c b/print_mq_attr.c
index f4b2d138ec2fe79a31c28a02a5dd9b027424bd8d..dfc326fdafa16af55ab84a8fe0479410dc4f4c65 100644 (file)
--- a/print_mq_attr.c
+++ b/print_mq_attr.c
@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2004 Ulrich Drepper <drepper@redhat.com>
  * Copyright (c) 2005-2015 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2015-2017 The strace developers.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -44,7 +45,7 @@ typedef struct mq_attr mq_attr_t;
 #include MPERS_DEFS
 
 MPERS_PRINTER_DECL(void, printmqattr, struct tcb *const tcp,
-                  const kernel_ureg_t addr, const bool decode_flags)
+                  const kernel_ulong_t addr, const bool decode_flags)
 {
 #if defined HAVE_MQUEUE_H || defined HAVE_LINUX_MQUEUE_H
        mq_attr_t attr;
@@ -54,7 +55,7 @@ MPERS_PRINTER_DECL(void, printmqattr, struct tcb *const tcp,
        if (decode_flags)
                printflags64(mq_attr_flags,
                             zero_extend_signed_to_ull(attr.mq_flags),
-                            "/* O_??? */");
+                            "O_???");
        else
                tprintf("%#llx", zero_extend_signed_to_ull(attr.mq_flags));
        tprintf(", mq_maxmsg=%lld, mq_msgsize=%lld, mq_curmsgs=%lld}",