Remove client requests that were deprecated in 3.2.0.

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

diff --git a/NEWS b/NEWS
index b2ec57fcce9cce6c6278ec09d1fc78fdfffbedb2..aeffdde26da719bf8cb67416a3333888a525c819 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -128,6 +128,16 @@ Omega and DRD.  There are many other smaller improvements.  In detail:
   they just return 3 (as before).  Also, SET_VBITS doesn't report
   definedness errors if any of the V bits are undefined.
 
+- The following Memcheck client requests have been removed:
+    VALGRIND_MAKE_NOACCESS
+    VALGRIND_MAKE_WRITABLE
+    VALGRIND_MAKE_READABLE
+    VALGRIND_CHECK_WRITABLE
+    VALGRIND_CHECK_READABLE
+    VALGRIND_CHECK_DEFINED
+  They were deprecated in 3.2.0, when equivalent but better-named client
+  requests were added.  See the 3.2.0 release notes for more details.
+
 - The behaviour of the tool Lackey has changed slightly.  First, the output
   from --trace-mem has been made more compact, to reduce the size of the
   traces.  Second, a new option --trace-superblocks has been added, which

diff --git a/memcheck/memcheck.h b/memcheck/memcheck.h
index 7ed98a6cf4d7176f6ee099ac970da453f8e87dc2..eeadd592efc0747e739672b9347633e1a5318512 100644 (file)
--- a/memcheck/memcheck.h
+++ b/memcheck/memcheck.h
@@ -131,18 +131,6 @@ typedef
     _qzz_res;                                                    \
    }))
 
-/* This is the old name for VALGRIND_MAKE_MEM_NOACCESS.  Deprecated. */
-#define VALGRIND_MAKE_NOACCESS(_qzz_addr,_qzz_len)               \
-   VALGRIND_MAKE_MEM_NOACCESS(_qzz_addr,_qzz_len)
-
-/* This is the old name for VALGRIND_MAKE_MEM_UNDEFINED.  Deprecated. */
-#define VALGRIND_MAKE_WRITABLE(_qzz_addr,_qzz_len)               \
-   VALGRIND_MAKE_MEM_UNDEFINED(_qzz_addr,_qzz_len)
-
-/* This is the old name for VALGRIND_MAKE_MEM_DEFINED.  Deprecated. */
-#define VALGRIND_MAKE_READABLE(_qzz_addr,_qzz_len)               \
-   VALGRIND_MAKE_MEM_DEFINED(_qzz_addr,_qzz_len)
-
 /* Similar to VALGRIND_MAKE_MEM_DEFINED except that addressability is
    not altered: bytes which are addressable are marked as defined,
    but those which are not addressable are left unchanged. */
@@ -214,18 +202,6 @@ typedef
       (volatile unsigned char *)&(__lvalue),                     \
                       (unsigned int)(sizeof (__lvalue)))
 
-/* This is the old name for VALGRIND_CHECK_MEM_IS_ADDRESSABLE.  Deprecated. */
-#define VALGRIND_CHECK_WRITABLE(_qzz_addr,_qzz_len)              \
-   VALGRIND_CHECK_MEM_IS_ADDRESSABLE(_qzz_addr,_qzz_len)
-
-/* This is the old name for VALGRIND_CHECK_MEM_IS_DEFINED.  Deprecated. */
-#define VALGRIND_CHECK_READABLE(_qzz_addr,_qzz_len)              \
-   VALGRIND_CHECK_MEM_IS_DEFINED(_qzz_addr,_qzz_len)
-
-/* This is the old name for VALGRIND_CHECK_VALUE_IS_DEFINED.  Deprecated. */
-#define VALGRIND_CHECK_DEFINED(__lvalue)                         \
-   VALGRIND_CHECK_VALUE_IS_DEFINED(__lvalue)
-
 
 /* Do a memory leak check mid-execution.  */
 #define VALGRIND_DO_LEAK_CHECK                                   \

diff --git a/memcheck/tests/leak-pool.c b/memcheck/tests/leak-pool.c
index b4c08574b1d15e230d0dc1ea7be75d6819680f7f..daa5381af15bf18fc8f9cc815b07a267b2ad507c 100644 (file)
--- a/memcheck/tests/leak-pool.c
+++ b/memcheck/tests/leak-pool.c
@@ -40,7 +40,7 @@ allocate_pool()
   assert(p->buf);
   memset(p->buf, 0, p->allocated);
   VALGRIND_CREATE_MEMPOOL(p, 0, 0);
-  VALGRIND_MAKE_NOACCESS(p->buf, p->allocated);
+  VALGRIND_MAKE_MEM_NOACCESS(p->buf, p->allocated);
   return p;
 }
 

diff --git a/memcheck/tests/sh-mem-random.c b/memcheck/tests/sh-mem-random.c
index 1ec715b2a64730a77663c803efd9d9c52d0f74b0..504830661786ba35c8c8df3d625a11fa43958c38 100644 (file)
--- a/memcheck/tests/sh-mem-random.c
+++ b/memcheck/tests/sh-mem-random.c
@@ -40,7 +40,7 @@ U8 build(int size, U1 byte)
    U8 mask = 0;
    U8 shres;
    U8 res = 0xffffffffffffffffULL, res2;
-   VALGRIND_MAKE_WRITABLE(&res, 8);
+   VALGRIND_MAKE_MEM_UNDEFINED(&res, 8);
    assert(1 == size || 2 == size || 4 == size || 8 == size);
 
    for (i = 0; i < size; i++) {
@@ -55,7 +55,7 @@ U8 build(int size, U1 byte)
    
    VALGRIND_GET_VBITS(&res, &shres, 8);
    res2 = res;
-   VALGRIND_MAKE_READABLE(&res2, 8);      // avoid the 'undefined' warning
+   VALGRIND_MAKE_MEM_DEFINED(&res2, 8);      // avoid the 'undefined' warning
    assert(res2 == shres);
    return res;
 }
@@ -63,7 +63,7 @@ U8 build(int size, U1 byte)
 U1 make_defined ( U1 x )
 {
    volatile U1 xx = x;
-   VALGRIND_MAKE_READABLE(&xx, 1);
+   VALGRIND_MAKE_MEM_DEFINED(&xx, 1);
    return xx;
 }