mem: decode hugetlb page size in mmap flags

[strace] / rtc.c

diff --git a/rtc.c b/rtc.c
index 7f123e487dd5cb101b061119c7b05c8b1dde8481..9c02cbd50812178b9fc47d5cf06504bd9f7b04b0 100644 (file)
--- a/rtc.c
+++ b/rtc.c
@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2004 Ulrich Drepper <drepper@redhat.com>
  * Copyright (c) 2004-2016 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2015-2017 The strace developers.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -52,7 +53,7 @@ print_rtc_time(struct tcb *tcp, const struct rtc_time *rt)
 }
 
 static void
-decode_rtc_time(struct tcb *tcp, const long addr)
+decode_rtc_time(struct tcb *const tcp, const kernel_ulong_t addr)
 {
        struct rtc_time rt;
 
@@ -61,7 +62,7 @@ decode_rtc_time(struct tcb *tcp, const long addr)
 }
 
 static void
-decode_rtc_wkalrm(struct tcb *tcp, const long addr)
+decode_rtc_wkalrm(struct tcb *const tcp, const kernel_ulong_t addr)
 {
        struct rtc_wkalrm wk;
 
@@ -73,7 +74,7 @@ decode_rtc_wkalrm(struct tcb *tcp, const long addr)
 }
 
 static void
-decode_rtc_pll_info(struct tcb *tcp, const long addr)
+decode_rtc_pll_info(struct tcb *const tcp, const kernel_ulong_t addr)
 {
        struct_rtc_pll_info pll;
 
@@ -84,8 +85,8 @@ decode_rtc_pll_info(struct tcb *tcp, const long addr)
                        pll.pll_posmult, pll.pll_negmult, (long) pll.pll_clock);
 }
 
-MPERS_PRINTER_DECL(int, rtc_ioctl, struct tcb *tcp,
-                  const unsigned int code, const long arg)
+MPERS_PRINTER_DECL(int, rtc_ioctl, struct tcb *const tcp,
+                  const unsigned int code, const kernel_ulong_t arg)
 {
        switch (code) {
        case RTC_ALM_READ:
@@ -100,7 +101,7 @@ MPERS_PRINTER_DECL(int, rtc_ioctl, struct tcb *tcp,
                break;
        case RTC_IRQP_SET:
        case RTC_EPOCH_SET:
-               tprintf(", %lu", arg);
+               tprintf(", %" PRI_klu, arg);
                break;
        case RTC_IRQP_READ:
        case RTC_EPOCH_READ:
@@ -150,5 +151,5 @@ MPERS_PRINTER_DECL(int, rtc_ioctl, struct tcb *tcp,
                return RVAL_DECODED;
        }
 
-       return RVAL_DECODED | 1;
+       return RVAL_IOCTL_DECODED;
 }