nlattr: add UID/GID netlink attribute decoders

[strace] / wait.c

diff --git a/wait.c b/wait.c
index 401cae2a83214a9b019b4fb9e799f77884e196d4..c1d1dff24952b6be91feeb39232a9e3ccf0be834 100644 (file)
--- a/wait.c
+++ b/wait.c
@@ -7,6 +7,7 @@
  * Copyright (c) 2004 Ulrich Drepper <drepper@redhat.com>
  * Copyright (c) 2009-2013 Denys Vlasenko <dvlasenk@redhat.com>
  * Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2014-2018 The strace developers.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,6 +34,7 @@
  */
 
 #include "defs.h"
+#include "ptrace.h"
 
 #include <sys/wait.h>
 
@@ -57,7 +59,6 @@
 # define W_CONTINUED 0xffff
 #endif
 
-#include "ptrace.h"
 #include "xlat/ptrace_events.h"
 
 static int
@@ -76,14 +77,12 @@ printstatus(int status)
                        signame(sig & 0x7f),
                        sig & 0x80 ? " | 0x80" : "");
                status &= ~W_STOPCODE(sig);
-       }
-       else if (WIFSIGNALED(status)) {
+       } else if (WIFSIGNALED(status)) {
                tprintf("[{WIFSIGNALED(s) && WTERMSIG(s) == %s%s}",
                        signame(WTERMSIG(status)),
                        WCOREDUMP(status) ? " && WCOREDUMP(s)" : "");
                status &= ~(W_EXITCODE(0, WTERMSIG(status)) | WCOREFLAG);
-       }
-       else if (WIFEXITED(status)) {
+       } else if (WIFEXITED(status)) {
                tprintf("[{WIFEXITED(s) && WEXITSTATUS(s) == %d}",
                        WEXITSTATUS(status));
                exited = 1;
@@ -118,7 +117,7 @@ printstatus(int status)
 
 static int
 printwaitn(struct tcb *const tcp,
-          void (*const print_rusage)(struct tcb *, kernel_ureg_t))
+          void (*const print_rusage)(struct tcb *, kernel_ulong_t))
 {
        if (entering(tcp)) {
                /* On Linux, kernel-side pid_t is typedef'ed to int