Fix issue that return type of strerror_r() is changed when the toolchain is different

Change-Id: I2eb1d4a7f2a5e0dc539c0168332b316f44b6a432

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

diff --git a/packaging/isf.spec b/packaging/isf.spec
index d88ec20..9a203e6 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"
-export CXXFLAGS="$CXXFLAGS -fvisibility=hidden -fvisibility-inlines-hidden ${GC_SECTIONS_FLAGS} -Werror"
+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_BASIS="$CFLAGS"
 export CXXFLAGS_BASIS="$CXXFLAGS"