Update copyright headers

[strace] / tests / wait4.c

diff --git a/tests/wait4.c b/tests/wait4.c
index 981818c77ca84324b812b2e7341a9c0bd7d6c844..29b0caddd40ff6a3acfad2073d1e3fd5caf25816 100644 (file)
--- a/tests/wait4.c
+++ b/tests/wait4.c
@@ -2,29 +2,10 @@
  * Check decoding of wait4 syscall.
  *
  * Copyright (c) 2015-2016 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2016-2018 The strace developers.
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "tests.h"
@@ -40,9 +21,9 @@ sprint_rusage(const struct rusage *const ru)
 {
        static char buf[1024];
        snprintf(buf, sizeof(buf),
-                "{ru_utime={%lu, %lu}"
-                ", ru_stime={%lu, %lu}"
-#ifdef VERBOSE_RUSAGE
+                "{ru_utime={tv_sec=%lld, tv_usec=%llu}"
+                ", ru_stime={tv_sec=%lld, tv_usec=%llu}"
+#if VERBOSE
                 ", ru_maxrss=%lu"
                 ", ru_ixrss=%lu"
                 ", ru_idrss=%lu"
@@ -60,11 +41,11 @@ sprint_rusage(const struct rusage *const ru)
 #else
                 ", ...}"
 #endif
-                , (long) ru->ru_utime.tv_sec
-                , (long) ru->ru_utime.tv_usec
-                , (long) ru->ru_stime.tv_sec
-                , (long) ru->ru_stime.tv_usec
-#ifdef VERBOSE_RUSAGE
+                , (long long) ru->ru_utime.tv_sec
+                , zero_extend_signed_to_ull(ru->ru_utime.tv_usec)
+                , (long long) ru->ru_stime.tv_sec
+                , zero_extend_signed_to_ull(ru->ru_stime.tv_usec)
+#if VERBOSE
                 , (long) ru->ru_maxrss
                 , (long) ru->ru_ixrss
                 , (long) ru->ru_idrss
@@ -119,12 +100,12 @@ main(void)
 
        (void) close(0);
 
-       int *const s = tail_alloc(sizeof(*s));
+       TAIL_ALLOC_OBJECT_CONST_PTR(int, s);
        if (wait4(pid, s, WNOHANG|__WALL, NULL))
                perror_msg_and_fail("wait4 #1");
        tprintf("wait4(%d, %p, WNOHANG|__WALL, NULL) = 0\n", pid, s);
 
-       struct rusage *const rusage = tail_alloc(sizeof(*rusage));
+       TAIL_ALLOC_OBJECT_CONST_PTR(struct rusage, rusage);
        if (wait4(pid, s, WNOHANG|__WALL, rusage))
                perror_msg_and_fail("wait4 #2");
        tprintf("wait4(%d, %p, WNOHANG|__WALL, %p) = 0\n", pid, s, rusage);