Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d90b11b6 authored by Colin Cross's avatar Colin Cross Committed by Android Git Automerger
Browse files

am 13274a26: Merge "Fix logging errors inside ALOGV" 

* commit '13274a26':
  Fix logging errors inside ALOGV
parents 3bff7e3e 13274a26

libbacktrace/BacktraceMap.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -93,7 +93,8 @@ bool BacktraceMap::ParseLine(const char* line, backtrace_map_t* map) { 
  }

  }





  ALOGV("Parsed map: start=%p, end=%p, flags=%x, name=%s",

  ALOGV("Parsed map: start=%p, end=%p, flags=%x, name=%s",

        map->start, map->end, map->flags, map->name.c_str());

        reinterpret_cast<void*>(map->start), reinterpret_cast<void*>(map->end),

        map->flags, map->name.c_str());

  return true;

  return true;

}

}

libziparchive/zip_archive.cc

+1 −1
Original line number Original line Diff line number Diff line
@@ -279,7 +279,7 @@ static int64_t EntryToIndex(const ZipEntryName* hash_table, 
    ent = (ent + 1) & (hash_table_size - 1);

    ent = (ent + 1) & (hash_table_size - 1);

  }

  }





  ALOGV("Zip: Unable to find entry %.*s", name_length, name);

  ALOGV("Zip: Unable to find entry %.*s", length, name);

  return kEntryNotFound;

  return kEntryNotFound;

}

}