Remove linux/ptp_clock.h

[strace] / capability.c

diff --git a/capability.c b/capability.c
index 421649d57c682c191881322c82341a00666dc406..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,19 +53,19 @@ 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
-get_cap_header(struct tcb *tcp, unsigned long addr)
+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;
 
@@ -78,17 +79,18 @@ get_cap_header(struct tcb *tcp, unsigned long addr)
 }
 
 static void
-print_cap_header(struct tcb *tcp, unsigned long addr, cap_user_header_t h)
+print_cap_header(struct tcb *const tcp, const kernel_ulong_t addr,
+                const struct user_cap_header_struct *const h)
 {
        if (!addr || !h) {
                printaddr(addr);
                return;
        }
 
-       tprints("{");
+       tprints("{version=");
        printxval(cap_version, h->version,
                  "_LINUX_CAPABILITY_VERSION_???");
-       tprintf(", %d}", h->pid);
+       tprintf(", pid=%d}", h->pid);
 }
 
 static void
@@ -105,7 +107,8 @@ print_cap_bits(const uint32_t lo, const uint32_t hi)
 }
 
 static void
-print_cap_data(struct tcb *tcp, unsigned long addr, const cap_user_header_t h)
+print_cap_data(struct tcb *const tcp, const kernel_ulong_t addr,
+              const struct user_cap_header_struct *const h)
 {
        struct user_cap_data_struct data[2];
        unsigned int len;
@@ -124,18 +127,18 @@ print_cap_data(struct tcb *tcp, unsigned long addr, const cap_user_header_t h)
        if (umoven_or_printaddr(tcp, addr, len * sizeof(data[0]), data))
                return;
 
-       tprints("{");
+       tprints("{effective=");
        print_cap_bits(data[0].effective, len > 1 ? data[1].effective : 0);
-       tprints(", ");
+       tprints(", permitted=");
        print_cap_bits(data[0].permitted, len > 1 ? data[1].permitted : 0);
-       tprints(", ");
+       tprints(", inheritable=");
        print_cap_bits(data[0].inheritable, len > 1 ? data[1].inheritable : 0);
        tprints("}");
 }
 
 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]);
@@ -150,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);