Update copyright headers

[strace] / ipc_shmctl.c

diff --git a/ipc_shmctl.c b/ipc_shmctl.c
index 12bb806b1d57be48beb405c32fddf3616e4e5687..25f44716f6b6a8883acc9439130376e3679e1973 100644 (file)
--- a/ipc_shmctl.c
+++ b/ipc_shmctl.c
@@ -5,29 +5,10 @@
  * Copyright (c) 1996-1999 Wichert Akkerman <wichert@cistron.nl>
  * Copyright (c) 2003-2006 Roland McGrath <roland@redhat.com>
  * Copyright (c) 2006-2015 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2015-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: LGPL-2.1-or-later
  */
 
 #include "defs.h"
@@ -51,7 +32,7 @@ typedef struct shmid64_ds shmid_ds_t;
 #include "xlat/shmctl_flags.h"
 
 static void
-print_shmid_ds(struct tcb *tcp, const long addr, int cmd)
+print_shmid_ds(struct tcb *const tcp, const kernel_ulong_t addr, int cmd)
 {
        /* TODO: We don't properly decode old compat ipc calls. */
        if (cmd & IPC_64)
@@ -101,7 +82,7 @@ SYS_FUNC(shmctl)
                PRINTCTL(shmctl_flags, tcp->u_arg[1], "SHM_???");
                tprints(", ");
        } else {
-               const long addr = tcp->u_arg[indirect_ipccall(tcp) ? 3 : 2];
+               const kernel_ulong_t addr = tcp->u_arg[indirect_ipccall(tcp) ? 3 : 2];
                print_shmid_ds(tcp, addr, tcp->u_arg[1]);
        }
        return 0;