netlink_sock_diag: print inet_diag_sockid.idiag_if as an interface index

[strace] / capability.c

diff --git a/capability.c b/capability.c
index b7a510bd24c25f53ec825e51cd93c9611b6153a6..760bddace49a268445d9a91592f91a01351e92d4 100644 (file)
--- a/capability.c
+++ b/capability.c
@@ -2,6 +2,7 @@
  * Copyright (c) 2000 Wichert Akkerman <wakkerma@debian.org>
  * Copyright (c) 2011 Denys Vlasenko <dvlasenk@redhat.com>
  * Copyright (c) 2005-2015 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2014-2017 The strace developers.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -52,18 +53,18 @@ enum {
 
 #include "xlat/cap_version.h"
 
-typedef struct user_cap_header_struct {
+struct user_cap_header_struct {
        uint32_t version;
        int pid;
-} *cap_user_header_t;
+};
 
-typedef struct user_cap_data_struct {
+struct user_cap_data_struct {
        uint32_t effective;
        uint32_t permitted;
        uint32_t inheritable;
-} *cap_user_data_t;
+};
 
-static cap_user_header_t
+static const struct user_cap_header_struct *
 get_cap_header(struct tcb *const tcp, const kernel_ulong_t addr)
 {
        static struct user_cap_header_struct header;
@@ -79,7 +80,7 @@ get_cap_header(struct tcb *const tcp, const kernel_ulong_t addr)
 
 static void
 print_cap_header(struct tcb *const tcp, const kernel_ulong_t addr,
-                const cap_user_header_t const h)
+                const struct user_cap_header_struct *const h)
 {
        if (!addr || !h) {
                printaddr(addr);
@@ -107,7 +108,7 @@ print_cap_bits(const uint32_t lo, const uint32_t hi)
 
 static void
 print_cap_data(struct tcb *const tcp, const kernel_ulong_t addr,
-              const cap_user_header_t const h)
+              const struct user_cap_header_struct *const h)
 {
        struct user_cap_data_struct data[2];
        unsigned int len;
@@ -137,7 +138,7 @@ print_cap_data(struct tcb *const tcp, const kernel_ulong_t addr,
 
 SYS_FUNC(capget)
 {
-       cap_user_header_t h;
+       const struct user_cap_header_struct *h;
 
        if (entering(tcp)) {
                h = get_cap_header(tcp, tcp->u_arg[0]);
@@ -152,7 +153,8 @@ SYS_FUNC(capget)
 
 SYS_FUNC(capset)
 {
-       cap_user_header_t h = get_cap_header(tcp, tcp->u_arg[0]);
+       const struct user_cap_header_struct *const h =
+               get_cap_header(tcp, tcp->u_arg[0]);
        print_cap_header(tcp, tcp->u_arg[0], h);
        tprints(", ");
        print_cap_data(tcp, tcp->u_arg[1], h);