From: Philippe Waroquiers <philippe.waroquiers@skynet.be>
Date: Sun, 21 Oct 2012 21:13:39 +0000 (+0000)
Subject: Follow-up to sys_ipc restructuration
X-Git-Tag: svn/VALGRIND_3_9_0~590
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78966742aa65e09c76b95a9c49a03cbdfc59c2ca;p=thirdparty%2Fvalgrind.git

Follow-up to sys_ipc restructuration
Now that the PRE/POS(sys_ipc) code is not duplicated anymore,
fix two strange things in this code:

* PRE(sys_ipc) : add missing ; after the call PRE_REG_READ6
  (strange that this was compiling without it ???)

* POST(sys_ipc) : it seems there was a copy/paste of
  the  PRE(sys_ipc) code for VKI_SEMCTL.
  Cannot understand why we would need to call again
  deref_Addr and ML_(generic_PRE_sys_semctl) in the POST(sys_ipc).




git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13078
---

diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c
index 5ab17db632..28a12b4377 100644
--- a/coregrind/m_syswrap/syswrap-linux.c
+++ b/coregrind/m_syswrap/syswrap-linux.c
@@ -3307,7 +3307,7 @@ PRE(sys_ipc)
    // XXX: this is simplistic -- some args are not used in all circumstances.
    PRE_REG_READ6(int, "ipc",
                  vki_uint, call, int, first, int, second, int, third,
-                 void *, ptr, long, fifth)
+                 void *, ptr, long, fifth);
 
    switch (ARG1 /* call */) {
    case VKI_SEMOP:
@@ -3387,13 +3387,8 @@ POST(sys_ipc)
    switch (ARG1 /* call */) {
    case VKI_SEMOP:
    case VKI_SEMGET:
-      break;
    case VKI_SEMCTL:
-   {
-      UWord arg = deref_Addr( tid, ARG5, "semctl(arg)" );
-      ML_(generic_PRE_sys_semctl)( tid, ARG2, ARG3, ARG4, arg );
       break;
-   }
    case VKI_SEMTIMEDOP:
    case VKI_MSGSND:
       break;