Update copyright headers

[strace] / statx.c

diff --git a/statx.c b/statx.c
index 6e9138782a5c80078b6542eb4314766fb7eacbc0..9cc30c4f701c7f4709b5e64b4d26674d2078780f 100644 (file)
--- a/statx.c
+++ b/statx.c
@@ -1,31 +1,12 @@
 /*
- * Copyright (c) 2017 The strace developers.
+ * Copyright (c) 2017-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"
+#include "print_fields.h"
 #include "statx.h"
 
 #include <sys/stat.h>
@@ -54,9 +35,6 @@ SYS_FUNC(statx)
                printflags(statx_masks, tcp->u_arg[3], "STATX_???");
                tprints(", ");
        } else {
-#define PRINT_FIELD_U(field) \
-       tprintf(", %s=%llu", #field, (unsigned long long) stx.field)
-
 #define PRINT_FIELD_TIME(field)                                                \
        do {                                                            \
                tprintf(", " #field "={tv_sec=%" PRId64                 \
@@ -74,13 +52,13 @@ SYS_FUNC(statx)
                printflags(statx_masks, stx.stx_mask, "STATX_???");
 
                if (!abbrev(tcp))
-                       PRINT_FIELD_U(stx_blksize);
+                       PRINT_FIELD_U(", ", stx, stx_blksize);
 
                tprints(", stx_attributes=");
                printflags(statx_attrs, stx.stx_attributes, "STATX_ATTR_???");
 
                if (!abbrev(tcp)) {
-                       PRINT_FIELD_U(stx_nlink);
+                       PRINT_FIELD_U(", ", stx, stx_nlink);
                        printuid(", stx_uid=", stx.stx_uid);
                        printuid(", stx_gid=", stx.stx_gid);
                }
@@ -89,12 +67,12 @@ SYS_FUNC(statx)
                print_symbolic_mode_t(stx.stx_mode);
 
                if (!abbrev(tcp))
-                       PRINT_FIELD_U(stx_ino);
+                       PRINT_FIELD_U(", ", stx, stx_ino);
 
-               PRINT_FIELD_U(stx_size);
+               PRINT_FIELD_U(", ", stx, stx_size);
 
                if (!abbrev(tcp)) {
-                       PRINT_FIELD_U(stx_blocks);
+                       PRINT_FIELD_U(", ", stx, stx_blocks);
 
                        tprints(", stx_attributes_mask=");
                        printflags(statx_attrs, stx.stx_attributes_mask,
@@ -104,10 +82,10 @@ SYS_FUNC(statx)
                        PRINT_FIELD_TIME(stx_btime);
                        PRINT_FIELD_TIME(stx_ctime);
                        PRINT_FIELD_TIME(stx_mtime);
-                       PRINT_FIELD_U(stx_rdev_major);
-                       PRINT_FIELD_U(stx_rdev_minor);
-                       PRINT_FIELD_U(stx_dev_major);
-                       PRINT_FIELD_U(stx_dev_minor);
+                       PRINT_FIELD_U(", ", stx, stx_rdev_major);
+                       PRINT_FIELD_U(", ", stx, stx_rdev_minor);
+                       PRINT_FIELD_U(", ", stx, stx_dev_major);
+                       PRINT_FIELD_U(", ", stx, stx_dev_minor);
                } else {
                        tprints(", ...");
                }