commit 701bb65511aed14da6c51179619785e5706fa5a6
author Christopher Ferris <cferris@google.com> Tue Feb 02 13:09:59 2016 -0800
committer Christopher Ferris <cferris@google.com> Tue Feb 02 13:22:40 2016 -0800
tree 04cffebe6ad88578e7212d690318563b4bb3bfa5
parent 4821db1b3ecc14828d4acf4abed26bb7d8b8cf6a

Remove the unused TrackHeader structure.

Change-Id: I07ae5de717e1fcfbe5dfe552a531db9f630da622

libc/malloc_debug/malloc_debug.h

diff --git a/libc/malloc_debug/malloc_debug.h b/libc/malloc_debug/malloc_debug.h
index cd025a7..6f9f90f 100644
--- a/libc/malloc_debug/malloc_debug.h
+++ b/libc/malloc_debug/malloc_debug.h
@@ -58,11 +58,6 @@
   static size_t max_size() { return (1U << 31) - 1; }
 } __attribute__((packed));
 
-struct TrackHeader {
-  Header* prev = nullptr;
-  Header* next = nullptr;
-} __attribute__((packed));
-
 struct BacktraceHeader {
   size_t num_frames;
   uintptr_t frames[0];

libc/malloc_debug/tests/malloc_debug_unit_tests.cpp

diff --git a/libc/malloc_debug/tests/malloc_debug_unit_tests.cpp b/libc/malloc_debug/tests/malloc_debug_unit_tests.cpp
index 4b8aaeb..9fc8a57 100644
--- a/libc/malloc_debug/tests/malloc_debug_unit_tests.cpp
+++ b/libc/malloc_debug/tests/malloc_debug_unit_tests.cpp
@@ -67,14 +67,10 @@
 constexpr char DIVIDER[] =
     "6 malloc_debug *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***\n";
 
-constexpr uint32_t TRACK_HEADER = 0x2;
-constexpr uint32_t BACKTRACE_HEADER = 0x4;
+constexpr uint32_t BACKTRACE_HEADER = 0x1;
 
 static size_t get_tag_offset(uint32_t flags = 0, size_t backtrace_frames = 0) {
   size_t offset = BIONIC_ALIGN(sizeof(Header), sizeof(uintptr_t));
-  if (flags & TRACK_HEADER) {
-    offset += BIONIC_ALIGN(sizeof(TrackHeader), sizeof(uintptr_t));
-  }
   if (flags & BACKTRACE_HEADER) {
     offset += BIONIC_ALIGN(sizeof(BacktraceHeader) + sizeof(uintptr_t) * backtrace_frames, sizeof(uintptr_t));
   }