From 5f32997518ce3cbc116ec7159fbd50c0ffb1eaa4 Mon Sep 17 00:00:00 2001 From: Paul Floyd Date: Sun, 16 Nov 2025 08:44:45 +0100 Subject: [PATCH] Linux syscall wrappers: remove some quotes from parameter names The PRE_REG_READX macros already textify the argument names so there are no need for quotes. For consistency I've removed them here. --- coregrind/m_syswrap/syswrap-linux.c | 18 +++++++++--------- .../tests/linux/sys-copy_file_range.stderr.exp | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c index 0105fb98f3..4db8743dd0 100644 --- a/coregrind/m_syswrap/syswrap-linux.c +++ b/coregrind/m_syswrap/syswrap-linux.c @@ -13805,12 +13805,12 @@ PRE(sys_copy_file_range) ARG4, ARG5, ARG6); PRE_REG_READ6(vki_size_t, "copy_file_range", - int, "fd_in", - vki_loff_t *, "off_in", - int, "fd_out", - vki_loff_t *, "off_out", - vki_size_t, "len", - unsigned int, "flags"); + int, fd_in, + vki_loff_t *, off_in, + int, fd_out, + vki_loff_t *, off_out, + vki_size_t, len, + unsigned int, flags); /* File descriptors are "specially" tracked by valgrind. valgrind itself uses some, so make sure someone didn't @@ -13833,8 +13833,8 @@ PRE(sys_pkey_alloc) PRINT("pkey_alloc (%lu, %lu)", ARG1, ARG2); PRE_REG_READ2(long, "pkey_alloc", - unsigned long, "flags", - unsigned long, "access_rights"); + unsigned long, flags, + unsigned long, access_rights); /* The kernel says: pkey_alloc() is always safe to call regardless of whether or not the operating system supports protection keys. It can be @@ -13857,7 +13857,7 @@ PRE(sys_pkey_free) PRINT("pkey_free (%" FMT_REGWORD "u )", ARG1); PRE_REG_READ1(long, "pkey_free", - unsigned long, "pkey"); + unsigned long, pkey); /* Since pkey_alloc () can never succeed, see above, freeing any pkey is always an error. */ diff --git a/memcheck/tests/linux/sys-copy_file_range.stderr.exp b/memcheck/tests/linux/sys-copy_file_range.stderr.exp index 1aa4dc2048..28b372028a 100644 --- a/memcheck/tests/linux/sys-copy_file_range.stderr.exp +++ b/memcheck/tests/linux/sys-copy_file_range.stderr.exp @@ -1,5 +1,5 @@ -Syscall param copy_file_range("off_in") contains uninitialised byte(s) +Syscall param copy_file_range(off_in) contains uninitialised byte(s) ... by 0x........: main (sys-copy_file_range.c:57) -- 2.47.3