|
From: <sv...@va...> - 2009-01-19 02:51:04
|
Author: njn
Date: 2009-01-19 02:51:00 +0000 (Mon, 19 Jan 2009)
New Revision: 8973
Log:
Merge r8957--8958 (ioctl wrapper fixes) from the trunk.
Modified:
branches/DARWIN/coregrind/m_syswrap/syswrap-linux.c
Modified: branches/DARWIN/coregrind/m_syswrap/syswrap-linux.c
===================================================================
--- branches/DARWIN/coregrind/m_syswrap/syswrap-linux.c 2009-01-19 00:43:34 UTC (rev 8972)
+++ branches/DARWIN/coregrind/m_syswrap/syswrap-linux.c 2009-01-19 02:51:00 UTC (rev 8973)
@@ -3383,10 +3383,9 @@
PRE_MEM_WRITE( "ioctl(SG_GET_RESERVED_SIZE)", ARG3, sizeof(int) );
break;
case VKI_SG_GET_TIMEOUT:
- PRE_MEM_WRITE( "ioctl(SG_GET_TIMEOUT)", ARG3, sizeof(int) );
break;
case VKI_SG_GET_VERSION_NUM:
- PRE_MEM_READ( "ioctl(SG_GET_VERSION_NUM)", ARG3, sizeof(int) );
+ PRE_MEM_WRITE( "ioctl(SG_GET_VERSION_NUM)", ARG3, sizeof(int) );
break;
case VKI_SG_EMULATED_HOST: /* 0x2203 */
PRE_MEM_WRITE( "ioctl(SG_EMULATED_HOST)", ARG3, sizeof(int) );
@@ -4423,9 +4422,9 @@
POST_MEM_WRITE(ARG3, sizeof(int));
break;
case VKI_SG_GET_TIMEOUT:
- POST_MEM_WRITE(ARG3, sizeof(int));
break;
case VKI_SG_GET_VERSION_NUM:
+ POST_MEM_WRITE(ARG3, sizeof(int));
break;
case VKI_SG_EMULATED_HOST:
POST_MEM_WRITE(ARG3, sizeof(int));
|