tests: extend TEST_NETLINK_OBJECT macro

[strace] / ioprio.c

diff --git a/ioprio.c b/ioprio.c
index 6826e56d62030c3d6feaa840c92c23f768e5ed4b..682a7b3b13602ef8f2631e466379776850a918c8 100644 (file)
--- a/ioprio.c
+++ b/ioprio.c
@@ -1,3 +1,31 @@
+/*
+ * Copyright (c) 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
+ * 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.
+ */
+
 #include "defs.h"
 
 enum {
@@ -24,26 +52,25 @@ enum {
 #define IOPRIO_PRIO_DATA(mask) ((mask) & IOPRIO_PRIO_MASK)
 
 static const char *
-sprint_ioprio(int ioprio)
+sprint_ioprio(unsigned int ioprio)
 {
        static char outstr[256];
        const char *str;
-       int class, data;
+       unsigned int class, data;
 
        class = IOPRIO_PRIO_CLASS(ioprio);
        data = IOPRIO_PRIO_DATA(ioprio);
        str = xlookup(ioprio_class, class);
        if (str)
-               sprintf(outstr, "IOPRIO_PRIO_VALUE(%s,%d)", str, data);
+               sprintf(outstr, "IOPRIO_PRIO_VALUE(%s, %d)", str, data);
        else
-               sprintf(outstr, "IOPRIO_PRIO_VALUE(%#x /* %s */,%d)",
+               sprintf(outstr, "IOPRIO_PRIO_VALUE(%#x /* %s */, %d)",
                        class, "IOPRIO_CLASS_???", data);
 
        return outstr;
 }
 
-int
-sys_ioprio_get(struct tcb *tcp)
+SYS_FUNC(ioprio_get)
 {
        if (entering(tcp)) {
                /* int which */
@@ -60,16 +87,14 @@ sys_ioprio_get(struct tcb *tcp)
        }
 }
 
-int
-sys_ioprio_set(struct tcb *tcp)
+SYS_FUNC(ioprio_set)
 {
-       if (entering(tcp)) {
-               /* int which */
-               printxval(ioprio_who, tcp->u_arg[0], "IOPRIO_WHO_???");
-               /* int who */
-               tprintf(", %d, ", (int) tcp->u_arg[1]);
-               /* int ioprio */
-               tprints(sprint_ioprio(tcp->u_arg[2]));
-       }
-       return 0;
+       /* int which */
+       printxval(ioprio_who, tcp->u_arg[0], "IOPRIO_WHO_???");
+       /* int who */
+       tprintf(", %d, ", (int) tcp->u_arg[1]);
+       /* int ioprio */
+       tprints(sprint_ioprio(tcp->u_arg[2]));
+
+       return RVAL_DECODED;
 }