am 9e3a2491: Merge "Clean up /proc/<pid>/maps sscanfs."

* commit '9e3a24915241c07d8ea886533c8de6a85744a734':
  Clean up /proc/<pid>/maps sscanfs.
This commit is contained in:
Elliott Hughes 2015-09-22 22:54:45 +00:00 committed by Android Git Automerger
commit f599ea9743
2 changed files with 4 additions and 7 deletions

View File

@ -50,14 +50,11 @@ static mapinfo_t* parse_maps_line(char* line) {
uintptr_t offset;
char permissions[4];
int name_pos;
if (sscanf(line, "%" PRIxPTR "-%" PRIxPTR " %4s %" PRIxPTR " %*x:%*x %*d%n", &start,
if (sscanf(line, "%" PRIxPTR "-%" PRIxPTR " %4s %" PRIxPTR " %*x:%*x %*d %n", &start,
&end, permissions, &offset, &name_pos) < 2) {
return NULL;
}
while (isspace(line[name_pos])) {
name_pos += 1;
}
const char* name = line + name_pos;
size_t name_len = strlen(name);
if (name_len && name[name_len - 1] == '\n') {

View File

@ -1163,9 +1163,9 @@ TEST(pthread, pthread_attr_getstack__main_thread) {
char line[BUFSIZ];
while (fgets(line, sizeof(line), fp) != NULL) {
uintptr_t lo, hi;
char name[10];
sscanf(line, "%" PRIxPTR "-%" PRIxPTR " %*4s %*x %*x:%*x %*d %10s", &lo, &hi, name);
if (strcmp(name, "[stack]") == 0) {
int name_pos;
sscanf(line, "%" PRIxPTR "-%" PRIxPTR " %*4s %*x %*x:%*x %*d %n", &lo, &hi, &name_pos);
if (strcmp(line + name_pos, "[stack]\n") == 0) {
maps_stack_hi = reinterpret_cast<void*>(hi);
break;
}