From 422864ce03705a92f41c97586c7cfe1248a46844 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Mon, 25 Sep 2017 13:58:10 +0900 Subject: [PATCH] Fix build warning readdir_r() is deprecated. Change-Id: I6f7adabe20422857b681bb9836f73a46ee90c6d7 Signed-off-by: Jihoon Kim --- ism/src/ltdl.cpp | 3 +-- ism/src/scim_module.cpp | 11 ++--------- packaging/isf.spec | 4 ++-- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/ism/src/ltdl.cpp b/ism/src/ltdl.cpp index 28c7cd2..6223c93 100644 --- a/ism/src/ltdl.cpp +++ b/ism/src/ltdl.cpp @@ -3606,9 +3606,8 @@ list_files_by_dir ( if (dirp) { struct dirent *dp = 0; - struct dirent entry; - while ((readdir_r (dirp, &entry, &dp) == 0 && dp)) + while ((dp = readdir (dirp))) if (dp->d_name[0] != '.') if (lt_argz_insertdir (pargz, pargz_len, dirnam, dp)) { diff --git a/ism/src/scim_module.cpp b/ism/src/scim_module.cpp index 3183dc1..f08a424 100644 --- a/ism/src/scim_module.cpp +++ b/ism/src/scim_module.cpp @@ -119,12 +119,8 @@ scim_get_module_list (std::vector & mod_list, const String& type) for (std::vector::iterator i = paths.begin (); i!= paths.end (); ++i) { DIR *dir = opendir (i->c_str ()); if (dir) { - struct dirent direntp, *result = NULL; - struct dirent *file = NULL; + struct dirent *file = readdir (dir); - if (readdir_r (dir, &direntp, &result) == 0 && result){ - file = result; - } while (file) { struct stat filestat; String absfn = *i + String (SCIM_PATH_DELIM_STRING) + file->d_name; @@ -134,10 +130,7 @@ scim_get_module_list (std::vector & mod_list, const String& type) mod_list.push_back (mod_name.substr (0, mod_name.find_last_of ('.'))); } } - - if (readdir_r (dir, &direntp, &file) != 0) { - break; - } + file = readdir (dir); } closedir (dir); } diff --git a/packaging/isf.spec b/packaging/isf.spec index bc5b186..f12d536 100644 --- a/packaging/isf.spec +++ b/packaging/isf.spec @@ -83,8 +83,8 @@ export CXXFLAGS="$CXXFLAGS -DWAYLAND" %endif export GC_SECTIONS_FLAGS="-fdata-sections -ffunction-sections -Wl,--gc-sections" -export CFLAGS="$CFLAGS -fvisibility=hidden ${GC_SECTIONS_FLAGS} " -export CXXFLAGS="$CXXFLAGS -fvisibility=hidden -fvisibility-inlines-hidden ${GC_SECTIONS_FLAGS} " +export CFLAGS="$CFLAGS -fvisibility=hidden ${GC_SECTIONS_FLAGS} -Werror" +export CXXFLAGS="$CXXFLAGS -fvisibility=hidden -fvisibility-inlines-hidden ${GC_SECTIONS_FLAGS} -Werror" export CFLAGS_BASIS="$CFLAGS" export CXXFLAGS_BASIS="$CXXFLAGS" -- 2.7.4