From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Sat, 16 Sep 2023 13:00:39 +0000 (+0200)
Subject: Linux: change timerfd wrapper names used for arguments
X-Git-Tag: VALGRIND_3_22_0~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=323b9beea12d54d6900b7a7f5cfbb13c2a11e637;p=thirdparty%2Fvalgrind.git

Linux: change timerfd wrapper names used for arguments

The  now match the manpage names:

SYNOPSIS
       #include <sys/timerfd.h>

       int timerfd_create(int clockid, int flags);

       int timerfd_settime(int fd, int flags,
                           const struct itimerspec *new_value,
                           struct itimerspec *old_value);
       int timerfd_gettime(int fd, struct itimerspec *curr_value);
---

diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c
index 20c68c877c..d571fc327f 100644
--- a/coregrind/m_syswrap/syswrap-linux.c
+++ b/coregrind/m_syswrap/syswrap-linux.c
@@ -3308,12 +3308,12 @@ PRE(sys_timerfd_gettime)
 {
    PRINT("sys_timerfd_gettime ( %ld, %#" FMT_REGWORD "x )", SARG1, ARG2);
    PRE_REG_READ2(long, "timerfd_gettime",
-                 int, ufd,
-                 struct vki_itimerspec*, otmr);
+                 int, fd,
+                 struct vki_itimerspec*, curr_value);
    if (!ML_(fd_allowed)(ARG1, "timerfd_gettime", tid, False))
       SET_STATUS_Failure(VKI_EBADF);
    else
-      PRE_MEM_WRITE("timerfd_gettime(result)",
+      PRE_MEM_WRITE("timerfd_gettime(curr_value)",
                     ARG2, sizeof(struct vki_itimerspec));
 }
 POST(sys_timerfd_gettime)
@@ -3345,19 +3345,19 @@ PRE(sys_timerfd_settime)
    PRINT("sys_timerfd_settime ( %ld, %ld, %#" FMT_REGWORD "x, %#"
          FMT_REGWORD "x )", SARG1, SARG2, ARG3, ARG4);
    PRE_REG_READ4(long, "timerfd_settime",
-                 int, ufd,
+                 int, fd,
                  int, flags,
-                 const struct vki_itimerspec*, utmr,
-                 struct vki_itimerspec*, otmr);
+                 const struct vki_itimerspec*, new_value,
+                 struct vki_itimerspec*, old_value);
    if (!ML_(fd_allowed)(ARG1, "timerfd_settime", tid, False))
       SET_STATUS_Failure(VKI_EBADF);
    else
    {
-      PRE_MEM_READ("timerfd_settime(result)",
+      PRE_MEM_READ("timerfd_settime(new_value)",
                    ARG3, sizeof(struct vki_itimerspec));
       if (ARG4)
       {
-         PRE_MEM_WRITE("timerfd_settime(result)",
+         PRE_MEM_WRITE("timerfd_settime(old_value)",
                        ARG4, sizeof(struct vki_itimerspec));
       }
    }