[Libreoffice-commits] core.git: ucbhelper/source ucb/source

[Caolán McNamara]

 ucb/source/ucp/ftp/ftpurl.cxx                |    5 ++++-
 ucbhelper/source/provider/fd_inputstream.cxx |   13 ++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

New commits:
commit 2684858c79877d81f8ec20b70abda43ca72f060d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jun 4 11:27:18 2013 +0100

    fix build, bad merge
    
    Change-Id: I153b5ac4c2c75aca055ef49920cbccf3bd7720d4

diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx
index 50309e9..6da2bf4 100644
--- a/ucb/source/ucp/ftp/ftpurl.cxx
+++ b/ucb/source/ucp/ftp/ftpurl.cxx
@@ -411,7 +411,10 @@ oslFileHandle FTPURL::open()
         CURLcode err = curl_easy_perform(curl);
 
         if(err == CURLE_OK)
-            osl_setFilePos( res, osl_Pos_Absolut, 0 );
+        {
+            oslFileError rc = osl_setFilePos( res, osl_Pos_Absolut, 0 );
+            SAL_WARN_IF(rc != osl_File_E_None, "ucb", "osl_setFilePos failed");
+        }
         else {
             osl_closeFile(res),res = 0;
             throw curl_exception(err);
diff --git a/ucbhelper/source/provider/fd_inputstream.cxx b/ucbhelper/source/provider/fd_inputstream.cxx
index f70a6e9..b7857b6 100644
--- a/ucbhelper/source/provider/fd_inputstream.cxx
+++ b/ucbhelper/source/provider/fd_inputstream.cxx
@@ -28,7 +28,7 @@ using namespace com::sun::star::io;
 
 namespace ucbhelper
 {
-    FdInputStream:::FdInputStream:( oslFileHandle tmpfl )
+    FdInputStream::FdInputStream( oslFileHandle tmpfl )
         : m_tmpfl(tmpfl)
         , m_nLength( 0 )
     {
@@ -41,7 +41,8 @@ namespace ucbhelper
             sal_uInt64 nFileSize = 0;
             if ( osl_getFilePos( m_tmpfl, &nFileSize ) == osl_File_E_None )
                 m_nLength = nFileSize;
-            osl_setFilePos( m_tmpfl, osl_Pos_Absolut, 0 );
+            oslFileError rc = osl_setFilePos( m_tmpfl, osl_Pos_Absolut, 0 );
+            SAL_WARN_IF(rc != osl_File_E_None, "ucbhelper", "osl_setFilePos failed");
         }
     }
 
@@ -101,7 +102,8 @@ namespace ucbhelper
         if(!m_tmpfl)
             throw IOException();
 
-        osl_setFilePos( m_tmpfl, osl_Pos_Current, nBytesToSkip );
+        oslFileError rc = osl_setFilePos( m_tmpfl, osl_Pos_Current, nBytesToSkip );
+        SAL_WARN_IF(rc != osl_File_E_None, "ucbhelper", "osl_setFilePos failed");
     }
 
 
@@ -123,7 +125,7 @@ namespace ucbhelper
     {
         osl::MutexGuard aGuard(m_aMutex);
         if(m_tmpfl)
-            fclose(m_tmpfl),m_tmpfl = 0;
+            osl_closeFile(m_tmpfl),m_tmpfl = 0;
     }
 
 
@@ -137,7 +139,8 @@ namespace ucbhelper
         if(!m_tmpfl)
             throw IOException();
 
-        fseek(m_tmpfl,long(location),SEEK_SET);
+        oslFileError rc = osl_setFilePos( m_tmpfl, osl_Pos_Absolut, location );
+        SAL_WARN_IF(rc != osl_File_E_None, "ucbhelper", "osl_setFilePos failed");
     }