|
From: <sv...@va...> - 2009-02-22 22:30:00
|
Author: njn
Date: 2009-02-22 22:23:09 +0000 (Sun, 22 Feb 2009)
New Revision: 9217
Log:
Make fcntl and fcntl64 wrappers more consistent.
Modified:
trunk/coregrind/m_syswrap/syswrap-generic.c
Modified: trunk/coregrind/m_syswrap/syswrap-generic.c
===================================================================
--- trunk/coregrind/m_syswrap/syswrap-generic.c 2009-02-22 09:29:07 UTC (rev 9216)
+++ trunk/coregrind/m_syswrap/syswrap-generic.c 2009-02-22 22:23:09 UTC (rev 9217)
@@ -2781,7 +2781,6 @@
case VKI_F_GETLK64:
case VKI_F_SETLK64:
case VKI_F_SETLKW64:
-# else
# endif
PRINT("sys_fcntl[ARG3=='lock'] ( %ld, %ld, %#lx )", ARG1,ARG2,ARG3);
PRE_REG_READ3(long, "fcntl",
@@ -2790,7 +2789,11 @@
break;
}
+# if defined(VGP_x86_linux)
+ if (ARG2 == VKI_F_SETLKW || ARG2 == VKI_F_SETLKW64)
+# else
if (ARG2 == VKI_F_SETLKW)
+# endif
*flags |= SfMayBlock;
}
@@ -2853,11 +2856,10 @@
# if defined(VGP_x86_linux)
if (ARG2 == VKI_F_SETLKW || ARG2 == VKI_F_SETLKW64)
- *flags |= SfMayBlock;
# else
if (ARG2 == VKI_F_SETLKW)
+# endif
*flags |= SfMayBlock;
-# endif
}
POST(sys_fcntl64)
|