From 421982341274dc40147ca9265aac1119d7e2ba03 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 19 Feb 2010 16:50:45 +0000 Subject: [PATCH] Add parentheses round the "zzarg" macro argument when using it as it may expand to an expression which may mean we wind up doing the cast before evaluating the expression... Closes #227570. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11051 --- coregrind/m_syswrap/priv_syswrap-generic.h | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/coregrind/m_syswrap/priv_syswrap-generic.h b/coregrind/m_syswrap/priv_syswrap-generic.h index 201c4466f6..3ff19b51b6 100644 --- a/coregrind/m_syswrap/priv_syswrap-generic.h +++ b/coregrind/m_syswrap/priv_syswrap-generic.h @@ -252,23 +252,23 @@ extern void ML_(generic_POST_sys_shmctl) ( TId, UW, UW, UW, UW ); extern SysRes ML_(generic_PRE_sys_mmap) ( TId, UW, UW, UW, UW, UW, Off64T ); -#define PRE_timeval_READ(zzname, zzarg) \ - do { \ - struct vki_timeval *zztv = (struct vki_timeval *)zzarg; \ - PRE_FIELD_READ(zzname, zztv->tv_sec); \ - PRE_FIELD_READ(zzname, zztv->tv_usec); \ +#define PRE_timeval_READ(zzname, zzarg) \ + do { \ + struct vki_timeval *zztv = (struct vki_timeval *)(zzarg); \ + PRE_FIELD_READ(zzname, zztv->tv_sec); \ + PRE_FIELD_READ(zzname, zztv->tv_usec); \ } while (0) -#define PRE_timeval_WRITE(zzname, zzarg) \ - do { \ - struct vki_timeval *zztv = (struct vki_timeval *)zzarg; \ - PRE_FIELD_WRITE(zzname, zztv->tv_sec); \ - PRE_FIELD_WRITE(zzname, zztv->tv_usec); \ +#define PRE_timeval_WRITE(zzname, zzarg) \ + do { \ + struct vki_timeval *zztv = (struct vki_timeval *)(zzarg); \ + PRE_FIELD_WRITE(zzname, zztv->tv_sec); \ + PRE_FIELD_WRITE(zzname, zztv->tv_usec); \ } while (0) -#define POST_timeval_WRITE(zzarg) \ - do { \ - struct vki_timeval *zztv = (struct vki_timeval *)zzarg; \ - POST_FIELD_WRITE(zztv->tv_sec); \ - POST_FIELD_WRITE(zztv->tv_usec); \ +#define POST_timeval_WRITE(zzarg) \ + do { \ + struct vki_timeval *zztv = (struct vki_timeval *)(zzarg); \ + POST_FIELD_WRITE(zztv->tv_sec); \ + POST_FIELD_WRITE(zztv->tv_usec); \ } while (0) -- 2.47.2