From 85f3ab758ee2357f695f4880d05e48c1236a4cea Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Tue, 4 Feb 2020 18:27:49 +0000 Subject: [PATCH] Replace deprecated readdir_r() with readdir() Signed-off-by: Dmitry Shmidt --- src/common/wpa_ctrl.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/common/wpa_ctrl.c b/src/common/wpa_ctrl.c index c9890a0e4..40a979531 100644 --- a/src/common/wpa_ctrl.c +++ b/src/common/wpa_ctrl.c @@ -266,7 +266,6 @@ void wpa_ctrl_close(struct wpa_ctrl *ctrl) void wpa_ctrl_cleanup(void) { DIR *dir; - struct dirent entry; struct dirent *result; size_t dirnamelen; size_t maxcopy; @@ -284,8 +283,8 @@ void wpa_ctrl_cleanup(void) } namep = pathname + dirnamelen; maxcopy = PATH_MAX - dirnamelen; - while (readdir_r(dir, &entry, &result) == 0 && result != NULL) { - if (os_strlcpy(namep, entry.d_name, maxcopy) < maxcopy) + while ((result = readdir(dir)) != NULL) { + if (os_strlcpy(namep, result->d_name, maxcopy) < maxcopy) unlink(pathname); } closedir(dir);