[Libreoffice-commits] .: 3 commits - sal/osl

[Tor Lillqvist]

 sal/osl/unx/diagnose.c      |    1 +
 sal/osl/unx/file_volume.cxx |    2 +-
 sal/osl/unx/process.c       |    4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 349e80f02be562cd5a863b6a5edda94864f3c92a
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Oct 19 13:56:53 2011 +0300

    WaE: two functions defined but not used

diff --git a/sal/osl/unx/file_volume.cxx b/sal/osl/unx/file_volume.cxx
index ea6ad6e..09ba561 100644
--- a/sal/osl/unx/file_volume.cxx
+++ b/sal/osl/unx/file_volume.cxx
@@ -542,7 +542,7 @@ oslFileError osl_releaseVolumeDeviceHandle( oslVolumeDeviceHandle Handle )
     return osl_File_E_None;
 }
 
-#if !defined(MACOSX) && !defined(AIX)
+#if !defined(MACOSX) && !defined(AIX) && !defined(ANDROID)
 
 /*****************************************
  * osl_newVolumeDeviceHandleImpl
commit 43a33ef69331c2dc6a1812421ac5637dfdeeb288
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Oct 19 13:42:08 2011 +0300

    WaE: passing argument discards qualifiers from pointer target type
    
    expected 'void *' but argument is of type 'volatile int *'
    
    errno is volatile on Android, and apparently it is not OK to pass the
    address of a volatile valye to a function expecting void * in their
    gcc version.

diff --git a/sal/osl/unx/process.c b/sal/osl/unx/process.c
index 22c6adb..4240567 100644
--- a/sal/osl/unx/process.c
+++ b/sal/osl/unx/process.c
@@ -481,6 +481,7 @@ static void ChildStatusProc(void *pData)
     {
         /* Child */
         int chstatus = 0;
+        int errno_copy;
 
         if (channel[0] != -1) close(channel[0]);
 
@@ -558,7 +559,8 @@ static void ChildStatusProc(void *pData)
         OSL_TRACE("ChildStatusProc : starting '%s' failed",data.m_pszArgs[0]);
 
         /* if we reach here, something went wrong */
-        if ( !safeWrite(channel[1], &errno, sizeof(errno)) )
+        errno_copy = errno;
+        if ( !safeWrite(channel[1], &errno_copy, sizeof(errno_copy)) )
             OSL_TRACE("sendFdPipe : sending failed (%s)",strerror(errno));
 
         if ( channel[1] != -1 )
commit 3cbd8c24a8550296154fe4e85fc879af034aa978
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Oct 19 13:39:00 2011 +0300

    WaE: unused parameter 'f'

diff --git a/sal/osl/unx/diagnose.c b/sal/osl/unx/diagnose.c
index ae5e625..7832b16 100644
--- a/sal/osl/unx/diagnose.c
+++ b/sal/osl/unx/diagnose.c
@@ -203,6 +203,7 @@ static void osl_diagnose_backtrace_Impl (oslDebugMessageFunc f)
 
 static void osl_diagnose_backtrace_Impl (oslDebugMessageFunc f)
 {
+    (void) f;
     /* not yet implemented */
 }