diff options
Diffstat (limited to 'tools/perf/util/event.c')
-rw-r--r-- | tools/perf/util/event.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index 956187bf1a85..26cba64345e3 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c | |||
@@ -416,7 +416,7 @@ static int __event__synthesize_thread(union perf_event *comm_event, | |||
416 | { | 416 | { |
417 | char filename[PATH_MAX]; | 417 | char filename[PATH_MAX]; |
418 | DIR *tasks; | 418 | DIR *tasks; |
419 | struct dirent dirent, *next; | 419 | struct dirent *dirent; |
420 | pid_t tgid, ppid; | 420 | pid_t tgid, ppid; |
421 | int rc = 0; | 421 | int rc = 0; |
422 | 422 | ||
@@ -445,11 +445,11 @@ static int __event__synthesize_thread(union perf_event *comm_event, | |||
445 | return 0; | 445 | return 0; |
446 | } | 446 | } |
447 | 447 | ||
448 | while (!readdir_r(tasks, &dirent, &next) && next) { | 448 | while ((dirent = readdir(tasks)) != NULL) { |
449 | char *end; | 449 | char *end; |
450 | pid_t _pid; | 450 | pid_t _pid; |
451 | 451 | ||
452 | _pid = strtol(dirent.d_name, &end, 10); | 452 | _pid = strtol(dirent->d_name, &end, 10); |
453 | if (*end) | 453 | if (*end) |
454 | continue; | 454 | continue; |
455 | 455 | ||
@@ -558,7 +558,7 @@ int perf_event__synthesize_threads(struct perf_tool *tool, | |||
558 | { | 558 | { |
559 | DIR *proc; | 559 | DIR *proc; |
560 | char proc_path[PATH_MAX]; | 560 | char proc_path[PATH_MAX]; |
561 | struct dirent dirent, *next; | 561 | struct dirent *dirent; |
562 | union perf_event *comm_event, *mmap_event, *fork_event; | 562 | union perf_event *comm_event, *mmap_event, *fork_event; |
563 | int err = -1; | 563 | int err = -1; |
564 | 564 | ||
@@ -583,9 +583,9 @@ int perf_event__synthesize_threads(struct perf_tool *tool, | |||
583 | if (proc == NULL) | 583 | if (proc == NULL) |
584 | goto out_free_fork; | 584 | goto out_free_fork; |
585 | 585 | ||
586 | while (!readdir_r(proc, &dirent, &next) && next) { | 586 | while ((dirent = readdir(proc)) != NULL) { |
587 | char *end; | 587 | char *end; |
588 | pid_t pid = strtol(dirent.d_name, &end, 10); | 588 | pid_t pid = strtol(dirent->d_name, &end, 10); |
589 | 589 | ||
590 | if (*end) /* only interested in proper numerical dirents */ | 590 | if (*end) /* only interested in proper numerical dirents */ |
591 | continue; | 591 | continue; |