[Libreoffice-commits] .: 3 commits - io/test sal/osl sal/workben

[Christina Rossmanith]

 io/test/testconnection.cxx |    6 +-----
 sal/osl/unx/file.cxx       |    6 ++++--
 sal/osl/unx/file_url.cxx   |    2 +-
 sal/workben/t_random.c     |    6 +-----
 4 files changed, 7 insertions(+), 13 deletions(-)

New commits:
commit b002b82925ac159d7baeb179022bd03675f08f00
Author: Christina Rossmanith <ChrRossmanith at web.de>
Date:   Thu May 26 16:52:36 2011 +0200

    __cdecl -> SAL_CALL

diff --git a/io/test/testconnection.cxx b/io/test/testconnection.cxx
index 4fddf5f..d44a4b2 100644
--- a/io/test/testconnection.cxx
+++ b/io/test/testconnection.cxx
@@ -179,11 +179,7 @@ void testConnection( const OUString &sConnectionDescription  ,
 }
 
 
-#if (defined UNX)
-int main( int argc, char * argv[] )
-#else
-int __cdecl main( int argc, char * argv[] )
-#endif
+int SAL_CALL main( int argc, char * argv[] )
 {	
     Reference< XMultiServiceFactory > xMgr(
         createRegistryServiceFactory( OUString( RTL_CONSTASCII_USTRINGPARAM("applicat.rdb")) ) );
diff --git a/sal/workben/t_random.c b/sal/workben/t_random.c
index ea24cc4..56f2da5 100644
--- a/sal/workben/t_random.c
+++ b/sal/workben/t_random.c
@@ -45,11 +45,7 @@ static char *pt (unsigned char *md, int length)
 /*
  * main.
  */
-#ifdef WIN32
-int __cdecl main (void)
-#else
-int main (void)
-#endif
+int SAL_CALL main (void)
 {
     rtlRandomPool pool;
     pool = rtl_random_createPool();
commit 6ef75a4b1d6af87ca64f762903685bc4ef9caabf
Author: Christina Rossmanith <ChrRossmanith at web.de>
Date:   Fri May 13 21:36:25 2011 +0200

    Simplified #define OSL_FILE_TRACE

diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 24f6311..6507d9c 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -59,13 +59,15 @@
 #endif /* MACOSX */
 
 #ifdef DEBUG_OSL_FILE
-#   define OSL_FILE_TRACE 0 ? (void)(0) : osl_trace
+#   define OSL_FILE_TRACE osl_trace
 #	define PERROR( a, b ) perror( a ); fprintf( stderr, b )
 #else
-#   define OSL_FILE_TRACE 1 ? (void)(0) : osl_trace
+#   define OSL_FILE_TRACE(fmt, ...)
 #	define PERROR( a, b )
 #endif
 
+
+
 /*******************************************************************
  *
  * FileHandle_Impl interface
commit 3c5bec731b487158e2d1ab05f2d2f29325a2a3ac
Author: Christina Rossmanith <ChrRossmanith at web.de>
Date:   Thu May 12 10:55:22 2011 +0200

    Simplified if ((FileBase::E_None != rc) && (FileBase::E_INVAL == rc))

diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx
index a005cc8..858a7d7 100644
--- a/sal/osl/unx/file_url.cxx
+++ b/sal/osl/unx/file_url.cxx
@@ -762,7 +762,7 @@ oslFileError osl_searchFileURL(rtl_uString* ustrFilePath, rtl_uString* ustrSearc
         
     // try to interpret search path as file url else assume it's a system path list
     rc = FileBase::getSystemPathFromFileURL(rtl::OUString(ustrFilePath), file_path);
-    if ((FileBase::E_None != rc) && (FileBase::E_INVAL == rc))
+    if (FileBase::E_INVAL == rc)
         file_path = ustrFilePath; 
     else if (FileBase::E_None != rc)
         return oslFileError(rc);