From 8028d5a979b1675214a3d749638460c595a10c26 Mon Sep 17 00:00:00 2001 From: Nicholas Nethercote Date: Sun, 14 Aug 2005 18:24:44 +0000 Subject: [PATCH] Remove ancient backwards compatibility code which is no longer needed, since backwards compatibility was broken in various other ways by 3.0.0. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4408 --- memcheck/mac_shared.c | 11 ----------- memcheck/memcheck.h | 23 ----------------------- 2 files changed, 34 deletions(-) diff --git a/memcheck/mac_shared.c b/memcheck/mac_shared.c index 0f9c33e104..eb5f53f35f 100644 --- a/memcheck/mac_shared.c +++ b/memcheck/mac_shared.c @@ -965,13 +965,6 @@ void MAC_(common_fini)(void (*leak_check)(ThreadId tid, LeakCheckMode mode)) Bool MAC_(handle_common_client_requests)(ThreadId tid, UWord* arg, UWord* ret ) { - Char* err = - "The client requests VALGRIND_MALLOCLIKE_BLOCK and\n" - " VALGRIND_FREELIKE_BLOCK have moved. Please recompile your\n" - " program to incorporate the updates in the Valgrind header files.\n" - " You shouldn't need to change the text of your program at all.\n" - " Everything should then work as before. Sorry for the bother.\n"; - switch (arg[0]) { case VG_USERREQ__COUNT_LEAKS: { /* count leaked bytes */ UWord** argp = (UWord**)arg; @@ -987,10 +980,6 @@ Bool MAC_(handle_common_client_requests)(ThreadId tid, UWord* arg, UWord* ret ) *ret = 0; return True; } - case VG_USERREQ__MALLOCLIKE_BLOCK__OLD_DO_NOT_USE: - case VG_USERREQ__FREELIKE_BLOCK__OLD_DO_NOT_USE: - VG_(tool_panic)(err); - case VG_USERREQ__MALLOCLIKE_BLOCK: { Addr p = (Addr)arg[1]; SizeT sizeB = arg[2]; diff --git a/memcheck/memcheck.h b/memcheck/memcheck.h index faff792346..dccc254930 100644 --- a/memcheck/memcheck.h +++ b/memcheck/memcheck.h @@ -81,13 +81,6 @@ typedef VG_USERREQ__DO_LEAK_CHECK, VG_USERREQ__COUNT_LEAKS, - /* These two have been moved into core, because they are useful for - any tool that tracks heap blocks. Hence the suffix. But they're - still here for backwards compatibility, although Valgrind will - abort with an explanatory message if you use them. */ - VG_USERREQ__MALLOCLIKE_BLOCK__OLD_DO_NOT_USE, - VG_USERREQ__FREELIKE_BLOCK__OLD_DO_NOT_USE, - VG_USERREQ__GET_VBITS, VG_USERREQ__SET_VBITS, @@ -218,22 +211,6 @@ typedef } -/* These two have been moved to valgrind.h; still here so that a warning can - be printed out for any programs using the old ones. */ -#define VALGRIND_MALLOCLIKE_BLOCK__OLD_DO_NOT_USE(addr, sizeB, rzB, is_zeroed)\ - {unsigned int _qzz_res; \ - VALGRIND_MAGIC_SEQUENCE(_qzz_res, 0, \ - VG_USERREQ__MALLOCLIKE_BLOCK, \ - addr, sizeB, rzB, is_zeroed); \ - } -#define VALGRIND_FREELIKE_BLOCK__OLD_DO_NOT_USE(addr, rzB) \ - {unsigned int _qzz_res; \ - VALGRIND_MAGIC_SEQUENCE(_qzz_res, 0, \ - VG_USERREQ__FREELIKE_BLOCK, \ - addr, rzB, 0, 0); \ - } - - /* Get in zzvbits the validity data for the zznbytes starting at zzsrc. Return values: 0 if not running on valgrind -- 2.47.3