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

diff --git a/coregrind/m_syswrap/priv_syswrap-generic.h b/coregrind/m_syswrap/priv_syswrap-generic.h
index 201c4466f645aad55988c0a824e146c3b3f5da5c..3ff19b51b6e6c7462266997dbb94ebaea31e6e3d 100644 (file)
--- 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)