|
From: Paul F. <pa...@so...> - 2022-06-12 13:49:30
|
https://sourceware.org/git/gitweb.cgi?p=valgrind.git;h=145fb72dbf627e69d9738b42390f3eb632afd901 commit 145fb72dbf627e69d9738b42390f3eb632afd901 Author: Paul Floyd <pj...@wa...> Date: Sun Jun 12 15:48:32 2022 +0200 Fix some compiler warnings on FreeBSD Includes one serious issue of a switch case fallthrough Diff: --- coregrind/m_syswrap/syswrap-freebsd.c | 1 + coregrind/m_syswrap/syswrap-x86-freebsd.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/coregrind/m_syswrap/syswrap-freebsd.c b/coregrind/m_syswrap/syswrap-freebsd.c index 20718badd6..0481b1c512 100644 --- a/coregrind/m_syswrap/syswrap-freebsd.c +++ b/coregrind/m_syswrap/syswrap-freebsd.c @@ -1335,6 +1335,7 @@ PRE(sys_fcntl) struct vki_kinfo_file* p_kinfo_file = (struct vki_kinfo_file*)ARG3; PRE_MEM_WRITE("fcntl(ARG3=='kinfo_file)", ARG3, p_kinfo_file->vki_kf_structsize); } + break; default: PRINT("sys_fcntl[UNKNOWN] ( %lu, %lu, %lu )", ARG1,ARG2,ARG3); diff --git a/coregrind/m_syswrap/syswrap-x86-freebsd.c b/coregrind/m_syswrap/syswrap-x86-freebsd.c index fe46e1eabd..4a2c35d58c 100644 --- a/coregrind/m_syswrap/syswrap-x86-freebsd.c +++ b/coregrind/m_syswrap/syswrap-x86-freebsd.c @@ -704,7 +704,7 @@ PRE(sys_freebsd6_ftruncate) PRE(sys_clock_getcpuclockid2) { PRINT("sys_clock_getcpuclockid2( %lld, %" FMT_REGWORD "d, %#" FMT_REGWORD "x )", - MERGE64(ARG1,ARG2),SARG3,ARG4); + (vki_id_t)MERGE64(ARG1,ARG2),SARG3,ARG4); PRE_REG_READ4(int, "clock_getcpuclockid2", vki_uint32_t, MERGE64_FIRST(offset), vki_uint32_t, MERGE64_SECOND(offset), @@ -1290,7 +1290,7 @@ POST(sys_cpuset_getid) PRE(sys_cpuset_getaffinity) { PRINT("sys_cpuset_getaffinity ( %" FMT_REGWORD "u, %" FMT_REGWORD "u, %lld, %" FMT_REGWORD "u, %#" FMT_REGWORD "x )", - ARG1, ARG2, MERGE64(ARG3, ARG4), ARG5, ARG6); + ARG1, ARG2, (vki_id_t)MERGE64(ARG3, ARG4), ARG5, ARG6); PRE_REG_READ6(int, "cpuset_getaffinity", vki_cpulevel_t, level, vki_cpuwhich_t, which, vki_uint32_t, MERGE64_FIRST(id), |