am 9743d7fb: am fb55511e: am e1a124e5: Merge "Say explicitly if there were no leaks."

# Via Android Git Automerger (2) and others
* commit '9743d7fb60836229fde0fbdbd9fb87c78eaa00b7':
  Say explicitly if there were no leaks.
This commit is contained in:
Elliott Hughes 2013-01-30 12:27:12 -08:00 committed by Android Git Automerger
commit 8db7a4cb20

View File

@ -437,10 +437,6 @@ extern "C" void *chk_calloc(int nmemb, size_t size) {
}
static void heaptracker_free_leaked_memory() {
if (gAllocatedBlockCount == 0) {
return;
}
// Use /proc/self/exe link to obtain the program name for logging
// purposes. If it's not available, we set it to "<unknown>".
char exe[PATH_MAX];
@ -451,6 +447,11 @@ static void heaptracker_free_leaked_memory() {
exe[count] = '\0';
}
if (gAllocatedBlockCount == 0) {
log_message("+++ %s did not leak", exe);
return;
}
size_t index = 1;
const size_t total = gAllocatedBlockCount;
while (head != NULL) {