Revert "Fix issue that return type of strerror_r() is changed when the toolchain...

This reverts commit 3d9fb36ffdff59f0de77849ee314dfa40c5e195c.

Change-Id: I2d83fbe677855983b979bb24f7dfd75f41909aef

diff --git a/ism/src/isf_query_utility.cpp b/ism/src/isf_query_utility.cpp
index a25916f..7dcf859 100644 (file)
--- a/ism/src/isf_query_utility.cpp
+++ b/ism/src/isf_query_utility.cpp
@@ -240,8 +240,7 @@ static inline int _db_init(void)
 
     if (lstat(databaseInfo.pPath, &stat) < 0) {
         char buf_err[256];
-        strerror_r (errno, buf_err, sizeof (buf_err));
-        LOGE("lstat failed. %s", buf_err);
+        LOGE("lstat failed. %s", strerror_r (errno, buf_err, sizeof (buf_err)));
         if (databaseInfo.pHandle)
             db_util_close(databaseInfo.pHandle);
         databaseInfo.pHandle = NULL;

diff --git a/ism/src/scim_socket.cpp b/ism/src/scim_socket.cpp
index 495dc01..8b12e2d 100644 (file)
--- a/ism/src/scim_socket.cpp
+++ b/ism/src/scim_socket.cpp
@@ -510,8 +510,7 @@ public:
     String get_error_message () const {
         if (m_err > 0) {
             char buf_err[256];
-            strerror_r (m_err, buf_err, sizeof (buf_err));
-            return String (buf_err);
+            return String (strerror_r (m_err, buf_err, sizeof (buf_err)));
         }
         return String ();
     }
@@ -546,8 +545,7 @@ public:
             if (fcntl (m_id, F_SETFL, flags | O_NONBLOCK) == -1) {
                 char buf_err[256];
                 m_err = errno;
-                strerror_r (m_err, buf_err, sizeof (buf_err));
-                LOGW ("ppid : %d fcntl() failed, %d %s", getppid (), m_err, buf_err);
+                LOGW ("ppid : %d fcntl() failed, %d %s", getppid (), m_err, strerror_r (m_err, buf_err, sizeof (buf_err)));
             }
 
             char proc_name[17] = {0}; /* the buffer provided shall at least be 16+1 bytes long */
@@ -597,8 +595,7 @@ public:
             } else {
                 char buf_err[256];
                 m_err = errno;
-                strerror_r (m_err, buf_err, sizeof (buf_err));
-                LOGW ("connect() failed with %d (%s)", m_err, buf_err);
+                LOGW ("connect() failed with %d (%s)", m_err, strerror_r (m_err, buf_err, sizeof (buf_err)));
             }
             if (fcntl (m_id, F_SETFL, flags) == -1) {
                 m_err = errno;
@@ -1302,8 +1299,7 @@ SocketServer::get_error_message () const
 {
     if (m_impl->err) {
         char buf_err[256];
-        strerror_r (m_impl->err, buf_err, sizeof (buf_err));
-        return String (buf_err);
+        return String (strerror_r (m_impl->err, buf_err, sizeof (buf_err)));
     }
 
     return Socket::get_error_message ();

diff --git a/packaging/isf.spec b/packaging/isf.spec
index 9a203e6..d88ec20 100644 (file)
--- a/packaging/isf.spec
+++ b/packaging/isf.spec
@@ -82,8 +82,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} -Werror -Wno-unused-result"
-export CXXFLAGS="$CXXFLAGS -fvisibility=hidden -fvisibility-inlines-hidden ${GC_SECTIONS_FLAGS} -Werror -Wno-unused-result"
+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"