sensord: use readdir() instead of deprecated readdir_r 63/125263/1
authorkibak.yoon <kibak.yoon@samsung.com>
Fri, 14 Apr 2017 08:58:03 +0000 (17:58 +0900)
committerkibak.yoon <kibak.yoon@samsung.com>
Fri, 14 Apr 2017 08:58:03 +0000 (17:58 +0900)
Change-Id: Iad45c3eea70923dc6f42a966b4ed0c62fcb3ebc4
Signed-off-by: kibak.yoon <kibak.yoon@samsung.com>
src/server/sensor_loader.cpp

index 9ea7e7f..9611b3a 100644 (file)
@@ -107,10 +107,8 @@ bool sensor_loader::load(const std::string &dir_path, std::vector<std::shared_pt
 
 bool sensor_loader::get_module_paths(const std::string &dir_path, std::vector<std::string> &paths)
 {
-       int ret;
        DIR *dir = NULL;
-       struct dirent entry;
-       struct dirent *result;
+       struct dirent *entry;
        struct stat buf;
        std::string filename;
 
@@ -118,14 +116,10 @@ bool sensor_loader::get_module_paths(const std::string &dir_path, std::vector<st
        retvm_if(!dir, false, "Failed to open directory[%s]", dir_path.c_str());
 
        while (true) {
-               ret = readdir_r(dir, &entry, &result);
+               entry = readdir(dir);
+               if (!entry) break;
 
-               if (ret != 0)
-                       continue;
-               if (!result)
-                       break;
-
-               filename = std::string(entry.d_name);
+               filename = std::string(entry->d_name);
 
                if (filename == "." || filename == "..")
                        continue;