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

Commit 236daaf4 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge "liblog: tests: crashes in logcat.descriptive" 

am: f218210f

Change-Id: I4efdd4e727d32f06f2c352c0c211cc51b5bbe0e9
parents ee178d69 f218210f

liblog/event_tag_map.cpp

+4 −4
Original line number Original line Diff line number Diff line
@@ -297,9 +297,9 @@ static int scanTagLine(EventTagMap* map, const char*& pData, int lineNum) { 
  while (isspace(*cp) && (*cp != '\n')) ++cp;

  while (isspace(*cp) && (*cp != '\n')) ++cp;

  const char* fmt = NULL;

  const char* fmt = NULL;

  size_t fmtLen = 0;

  size_t fmtLen = 0;

  if (*cp != '#') {

  if (*cp && (*cp != '#')) {

    fmt = cp;

    fmt = cp;

    while ((*cp != '\n') && (*cp != '#')) ++cp;

    while (*cp && (*cp != '\n') && (*cp != '#')) ++cp;

    while ((cp > fmt) && isspace(*(cp - 1))) --cp;

    while ((cp > fmt) && isspace(*(cp - 1))) --cp;

    fmtLen = cp - fmt;

    fmtLen = cp - fmt;

  }

  }
@@ -309,7 +309,7 @@ static int scanTagLine(EventTagMap* map, const char*& pData, int lineNum) { 
  // recorded for the same uid, but recording that

  // recorded for the same uid, but recording that

  // unused detail in our database is too burdensome.

  // unused detail in our database is too burdensome.

  bool verbose = true;

  bool verbose = true;

  while ((*cp != '#') && (*cp != '\n')) ++cp;

  while (*cp && (*cp != '#') && (*cp != '\n')) ++cp;

  if (*cp == '#') {

  if (*cp == '#') {

    do {

    do {

      ++cp;

      ++cp;
@@ -317,7 +317,7 @@ static int scanTagLine(EventTagMap* map, const char*& pData, int lineNum) { 
    verbose = !!fastcmp<strncmp>(cp, "uid=", strlen("uid="));

    verbose = !!fastcmp<strncmp>(cp, "uid=", strlen("uid="));

  }

  }





  while (*cp != '\n') ++cp;

  while (*cp && (*cp != '\n')) ++cp;

#ifdef DEBUG

#ifdef DEBUG

  fprintf(stderr, "%d: %p: %.*s\n", lineNum, tag, (int)(cp - pData), pData);

  fprintf(stderr, "%d: %p: %.*s\n", lineNum, tag, (int)(cp - pData), pData);

#endif

#endif