Do not use widen_to_ulong in kexec.c and process_vm.c

[strace] / get_robust_list.c

diff --git a/get_robust_list.c b/get_robust_list.c
index 1b667cab81193c9a154703e16612398b4644430b..1977023a4fe23943e3bd579655de367796696f21 100644 (file)
--- a/get_robust_list.c
+++ b/get_robust_list.c
@@ -1,29 +1,40 @@
+/*
+ * Copyright (c) 2012-2015 Dmitry V. Levin <ldv@altlinux.org>
+ * 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"
 
-int
-sys_get_robust_list(struct tcb *tcp)
+SYS_FUNC(get_robust_list)
 {
        if (entering(tcp)) {
-               tprintf("%ld, ", (long) (pid_t) tcp->u_arg[0]);
+               tprintf("%d, ", (int) tcp->u_arg[0]);
        } else {
-               void *addr;
-               size_t len;
-
-               if (syserror(tcp) ||
-                   !tcp->u_arg[1] ||
-                   umove(tcp, tcp->u_arg[1], &addr) < 0) {
-                       tprintf("%#lx, ", tcp->u_arg[1]);
-               } else {
-                       tprintf("[%p], ", addr);
-               }
-
-               if (syserror(tcp) ||
-                   !tcp->u_arg[2] ||
-                   umove(tcp, tcp->u_arg[2], &len) < 0) {
-                       tprintf("%#lx", tcp->u_arg[2]);
-               } else {
-                       tprintf("[%lu]", (unsigned long) len);
-               }
+               printnum_ptr(tcp, tcp->u_arg[1]);
+               tprints(", ");
+               printnum_ulong(tcp, tcp->u_arg[2]);
        }
        return 0;
 }