summaryrefslogtreecommitdiff
path: root/sal/qa/osl
diff options
context:
space:
mode:
Diffstat (limited to 'sal/qa/osl')
-rw-r--r--sal/qa/osl/module/osl_Module.cxx14
-rw-r--r--sal/qa/osl/pipe/osl_Pipe.cxx6
-rw-r--r--sal/qa/osl/socket/osl_AcceptorSocket.cxx10
-rw-r--r--sal/qa/osl/socket/osl_ConnectorSocket.cxx18
-rw-r--r--sal/qa/osl/socket/osl_DatagramSocket.cxx16
-rw-r--r--sal/qa/osl/socket/osl_Socket.cxx30
-rw-r--r--sal/qa/osl/socket/osl_Socket2.cxx58
-rw-r--r--sal/qa/osl/socket/osl_SocketAddr.cxx112
-rw-r--r--sal/qa/osl/socket/osl_StreamSocket.cxx28
-rw-r--r--sal/qa/osl/socket/sockethelper.cxx6
10 files changed, 149 insertions, 149 deletions
diff --git a/sal/qa/osl/module/osl_Module.cxx b/sal/qa/osl/module/osl_Module.cxx
index c460acbbdc14..022e2e01b8c6 100644
--- a/sal/qa/osl/module/osl_Module.cxx
+++ b/sal/qa/osl/module/osl_Module.cxx
@@ -66,9 +66,9 @@ inline void printUString( const ::rtl::OUString & str )
inline ::rtl::OUString getDllURL( void )
{
#if ( defined WNT ) // lib in Unix and lib in Windows are not same in file name.
- ::rtl::OUString libPath( RTL_CONSTASCII_USTRINGPARAM("test_Module_DLL.dll") );
+ ::rtl::OUString libPath( "test_Module_DLL.dll" );
#else
- ::rtl::OUString libPath( RTL_CONSTASCII_USTRINGPARAM("libtest_Module_DLL.so") );
+ ::rtl::OUString libPath( "libtest_Module_DLL.so" );
#endif
::rtl::OUString dirPath, dllPath;
@@ -81,7 +81,7 @@ inline ::rtl::OUString getDllURL( void )
inline sal_Bool isURL( const ::rtl::OUString pathname )
{
- ::rtl::OUString aPreURL( RTL_CONSTASCII_USTRINGPARAM("file:///") );
+ ::rtl::OUString aPreURL( "file:///" );
return ( ( pathname.indexOf( aPreURL ) == 0 ) ? sal_True : sal_False );
}
@@ -243,7 +243,7 @@ namespace osl_Module
#if !defined( MACOSX )
// TODO: Find out why this fails on Mac OS X
::osl::Module aMod( getDllURL( ) );
- FuncPtr pFunc = ( FuncPtr ) aMod.getSymbol( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("firstfunc")) );
+ FuncPtr pFunc = ( FuncPtr ) aMod.getSymbol( rtl::OUString("firstfunc") );
OUString aFileURL;
bRes = osl::Module::getUrlFromAddress( ( void* )pFunc, aFileURL );
@@ -366,7 +366,7 @@ namespace osl_Module
#if !defined( MACOSX )
// TODO: Find out why this fails on Mac OS X
::osl::Module aMod( getDllURL( ) );
- FuncPtr pFunc = ( FuncPtr ) aMod.getSymbol( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("firstfunc")) );
+ FuncPtr pFunc = ( FuncPtr ) aMod.getSymbol( rtl::OUString("firstfunc") );
bRes = sal_False;
if ( pFunc )
bRes = pFunc( bRes );
@@ -413,7 +413,7 @@ namespace osl_Module
#if !defined( MACOSX )
// TODO: Find out why this fails on Mac OS X
::osl::Module aMod( getDllURL( ) );
- ::rtl::OUString funcName( RTL_CONSTASCII_USTRINGPARAM("firstfunc") );
+ ::rtl::OUString funcName( "firstfunc" );
FuncPtr pFunc = ( FuncPtr ) osl_getSymbol( (oslModule)aMod, funcName.pData );
bRes = sal_False;
@@ -446,7 +446,7 @@ namespace osl_Module
#if !defined( MACOSX )
// TODO: Find out why this fails on Mac OS X
::osl::Module aMod( getDllURL( ) );
- oslGenericFunction oslFunc = aMod.getFunctionSymbol( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("firstfunc")) );
+ oslGenericFunction oslFunc = aMod.getFunctionSymbol( rtl::OUString("firstfunc") );
::rtl::OUString aLibraryURL;
bRes = ::osl::Module::getUrlFromAddress( oslFunc, aLibraryURL);
aMod.unload();
diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx
index a393e4b9d881..85982858c330 100644
--- a/sal/qa/osl/pipe/osl_Pipe.cxx
+++ b/sal/qa/osl/pipe/osl_Pipe.cxx
@@ -133,9 +133,9 @@ inline void printPipeError( ::osl::Pipe aPipe )
//------------------------------------------------------------------------
// pipe name and transfer contents
//------------------------------------------------------------------------
-const rtl::OUString aTestPipeName(RTL_CONSTASCII_USTRINGPARAM("testpipe2"));
-const rtl::OUString aTestPipe1(RTL_CONSTASCII_USTRINGPARAM("testpipe1"));
-const rtl::OUString aTestString(RTL_CONSTASCII_USTRINGPARAM("Sun Microsystems"));
+const rtl::OUString aTestPipeName("testpipe2");
+const rtl::OUString aTestPipe1("testpipe1");
+const rtl::OUString aTestString("Sun Microsystems");
const OString m_pTestString1("Sun Microsystems");
const OString m_pTestString2("test pipe PASS/OK");
diff --git a/sal/qa/osl/socket/osl_AcceptorSocket.cxx b/sal/qa/osl/socket/osl_AcceptorSocket.cxx
index fbfa5c0793e1..2666b14b512d 100644
--- a/sal/qa/osl/socket/osl_AcceptorSocket.cxx
+++ b/sal/qa/osl/socket/osl_AcceptorSocket.cxx
@@ -195,8 +195,8 @@ namespace osl_AcceptorSocket
void listen_accept_001()
{
- ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT3 );
- ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT3 );
+ ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT3 );
+ ::osl::SocketAddr saTargetSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT3 );
::osl::StreamSocket ssConnection;
/// launch server socket
@@ -217,9 +217,9 @@ namespace osl_AcceptorSocket
void listen_accept_002()
{
- ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT4 );
- ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT4 );
- ::osl::SocketAddr saPeerSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP );
+ ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT4 );
+ ::osl::SocketAddr saTargetSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT4 );
+ ::osl::SocketAddr saPeerSocketAddr( rtl::OUString("129.158.217.202"), IP_PORT_FTP );
::osl::StreamSocket ssConnection;
/// launch server socket
diff --git a/sal/qa/osl/socket/osl_ConnectorSocket.cxx b/sal/qa/osl/socket/osl_ConnectorSocket.cxx
index ce7fd59f6ae8..255013acc034 100644
--- a/sal/qa/osl/socket/osl_ConnectorSocket.cxx
+++ b/sal/qa/osl/socket/osl_ConnectorSocket.cxx
@@ -160,9 +160,9 @@ namespace osl_ConnectorSocket
void connect_001()
{
- ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT2 );
- ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT2 );
- ::osl::SocketAddr saPeerSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP );
+ ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT2 );
+ ::osl::SocketAddr saTargetSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT2 );
+ ::osl::SocketAddr saPeerSocketAddr( rtl::OUString("129.158.217.202"), IP_PORT_FTP );
::osl::StreamSocket ssConnection;
/// launch server socket
@@ -189,9 +189,9 @@ namespace osl_ConnectorSocket
//non-blocking mode connect?
void connect_002()
{
- ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT3 );
- ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT3 );
- ::osl::SocketAddr saPeerSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP );
+ ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT3 );
+ ::osl::SocketAddr saTargetSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT3 );
+ ::osl::SocketAddr saPeerSocketAddr( rtl::OUString("129.158.217.202"), IP_PORT_FTP );
asAcceptorSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
asAcceptorSocket.enableNonBlockingMode( sal_True );
@@ -215,8 +215,8 @@ namespace osl_ConnectorSocket
// how to design senarios that will return osl_Socket_Interrupted, osl_Socket_TimedOut
void connect_003()
{
- ::osl::SocketAddr saTargetSocketAddr1( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT3 );
- ::osl::SocketAddr saTargetSocketAddr2( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_MYPORT3 );
+ ::osl::SocketAddr saTargetSocketAddr1( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT3 );
+ ::osl::SocketAddr saTargetSocketAddr2( rtl::OUString("123.345.67.89"), IP_PORT_MYPORT3 );
csConnectorSocket.enableNonBlockingMode( sal_False );
@@ -233,7 +233,7 @@ namespace osl_ConnectorSocket
// really an error in non-blocking mode
void connect_004()
{
- ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_MYPORT3 );
+ ::osl::SocketAddr saTargetSocketAddr( rtl::OUString("123.345.67.89"), IP_PORT_MYPORT3 );
csConnectorSocket.enableNonBlockingMode( sal_True );
diff --git a/sal/qa/osl/socket/osl_DatagramSocket.cxx b/sal/qa/osl/socket/osl_DatagramSocket.cxx
index 586c197eea88..b5979ebbd57e 100644
--- a/sal/qa/osl/socket/osl_DatagramSocket.cxx
+++ b/sal/qa/osl/socket/osl_DatagramSocket.cxx
@@ -152,7 +152,7 @@ protected:
public:
TalkerThread( ):
- saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 )
+ saTargetSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT9 )
{
}
@@ -173,7 +173,7 @@ protected:
void SAL_CALL run( )
{
- ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT10 );
+ ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT10 );
dsSocket.setOption( osl_Socket_OptionReuseAddr, 1 );
if ( dsSocket.bind( saLocalSocketAddr ) == sal_False )
{
@@ -195,7 +195,7 @@ protected:
public:
sal_Char pRecvBuffer[30];
ListenerThread( ):
- saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT10 )
+ saTargetSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT10 )
{
pRecvBuffer[0] = '\0';
}
@@ -221,7 +221,7 @@ public:
void sr_001()
{
- ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 );
+ ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT9 );
::osl::DatagramSocket dsSocket;
dsSocket.setOption( osl_Socket_OptionReuseAddr, 1 );
dsSocket.bind( saLocalSocketAddr );
@@ -241,7 +241,7 @@ public:
void sr_002()
{
- ::osl::SocketAddr saListenSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT10 );
+ ::osl::SocketAddr saListenSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT10 );
::osl::DatagramSocket dsSocket;
//listener thread construct a DatagramSocket, recvFrom waiting for data, then main thread sendto data
@@ -266,7 +266,7 @@ public:
//sendTo error, return -1; recvFrom error, return -1
void sr_003()
{
- ::osl::SocketAddr saListenSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_MYPORT10 );
+ ::osl::SocketAddr saListenSocketAddr( rtl::OUString("123.345.67.89"), IP_PORT_MYPORT10 );
::osl::DatagramSocket dsSocket;
// Transport endpoint is not connected
sal_Int32 nSend = dsSocket.sendTo( saListenSocketAddr, pTestString2, strlen( pTestString2 ) + 1 );
@@ -276,8 +276,8 @@ public:
void sr_004()
{
- ::osl::SocketAddr saListenSocketAddr1( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_MYPORT10 );
- ::osl::SocketAddr saListenSocketAddr2( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_MYPORT10 );
+ ::osl::SocketAddr saListenSocketAddr1( rtl::OUString("123.345.67.89"), IP_PORT_MYPORT10 );
+ ::osl::SocketAddr saListenSocketAddr2( rtl::OUString("129.158.217.202"), IP_PORT_MYPORT10 );
::osl::DatagramSocket dsSocket;
dsSocket.enableNonBlockingMode( sal_True );
diff --git a/sal/qa/osl/socket/osl_Socket.cxx b/sal/qa/osl/socket/osl_Socket.cxx
index 92c4a37691c0..77a8515e9c4c 100644
--- a/sal/qa/osl/socket/osl_Socket.cxx
+++ b/sal/qa/osl/socket/osl_Socket.cxx
@@ -223,11 +223,11 @@ inline ::rtl::OUString outputError( const ::rtl::OUString & returnVal, const ::r
if ( returnVal.equals( rightVal ) )
return aUString;
aUString += ::rtl::OUString::createFromAscii(msg);
- aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(": the returned value is '"));
+ aUString += ::rtl::OUString(": the returned value is '");
aUString += returnVal;
- aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("', but the value should be '"));
+ aUString += ::rtl::OUString("', but the value should be '");
aUString += rightVal;
- aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'."));
+ aUString += ::rtl::OUString("'.");
return aUString;
}
@@ -781,11 +781,11 @@ namespace osl_SocketAddr
sal_Bool bOk = compareUString(suHost, suHost2);
- rtl::OUString suError (RTL_CONSTASCII_USTRINGPARAM("Host names should be the same. From SocketAddr.getLocalHostname() it is'"));
+ rtl::OUString suError ("Host names should be the same. From SocketAddr.getLocalHostname() it is'");
suError += suHost;
- suError += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("', from getThisHostname() it is '"));
+ suError += rtl::OUString("', from getThisHostname() it is '");
suError += suHost2;
- suError += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'."));
+ suError += rtl::OUString("'.");
CPPUNIT_ASSERT_MESSAGE(STD_STRING(suError), sal_True == bOk);
}
@@ -973,7 +973,7 @@ namespace osl_SocketAddr
// LLA: this function does not work in company (Linux, Windows) but at home
void getHostname_002()
{
- rtl::OUString suHostname (RTL_CONSTASCII_USTRINGPARAM("cn-1.germany.sun.com"));
+ rtl::OUString suHostname ("cn-1.germany.sun.com");
rtl::OUString aHostIP = getIPbyName( oustring2char( suHostname ) );
::osl::SocketAddr saSocketAddr( aHostName1, IP_PORT_FTP );
@@ -1439,7 +1439,7 @@ namespace osl_SocketAddr
/** testing the method:
static inline sal_Int32 SAL_CALL getServicePort(
const ::rtl::OUString& strServiceName,
- const ::rtl::OUString & strProtocolName= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tcp")) );
+ const ::rtl::OUString & strProtocolName= ::rtl::OUString("tcp") );
*/
class gettheServicePort : public CppUnit::TestFixture
@@ -1467,7 +1467,7 @@ namespace osl_SocketAddr
void gettheServicePort_004()
{
CPPUNIT_ASSERT_MESSAGE( "test for getServicePort() function: try to get a service port which is not exist.",
- OSL_INVALID_PORT == ::osl::SocketAddr::getServicePort( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("notexist")), aProtocolUDP ) );
+ OSL_INVALID_PORT == ::osl::SocketAddr::getServicePort( ::rtl::OUString("notexist"), aProtocolUDP ) );
}
CPPUNIT_TEST_SUITE( gettheServicePort );
@@ -1809,7 +1809,7 @@ namespace osl_Socket
sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
sal_Bool bOK1 = sSocket.bind( saBindSocketAddr );
- ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString();
+ ::rtl::OUString suError1 = ::rtl::OUString("Socket bind fail:") + sSocket.getErrorAsString();
CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError1), sal_True == bOK1 );
sSocket.getLocalAddr( saLocalSocketAddr );
@@ -1857,7 +1857,7 @@ namespace osl_Socket
sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
sal_Bool bOK1 = sSocket.bind( saBindSocketAddr );
- ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString();
+ ::rtl::OUString suError1 = ::rtl::OUString("Socket bind fail:") + sSocket.getErrorAsString();
CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError1), sal_True == bOK1 );
sal_Bool bOK = ( IP_PORT_MYPORT7 == sSocket.getLocalPort( ) );
@@ -1888,7 +1888,7 @@ namespace osl_Socket
(void)bOK;
#else
//on Unix, if Addr is not an address of type osl_Socket_FamilyInet, it returns OSL_INVALID_PORT
- ::rtl::OUString suError (RTL_CONSTASCII_USTRINGPARAM("on Unix, if Addr is not an address of type osl_Socket_FamilyInet, it returns OSL_INVALID_PORT, but can not create Addr of that case"));
+ ::rtl::OUString suError ("on Unix, if Addr is not an address of type osl_Socket_FamilyInet, it returns OSL_INVALID_PORT, but can not create Addr of that case");
#endif
CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), sal_False );
@@ -1902,10 +1902,10 @@ namespace osl_Socket
sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
sal_Bool bOK1 = sSocket.bind( saBindSocketAddr );
- ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString();
+ ::rtl::OUString suError1 = ::rtl::OUString("Socket bind fail:") + sSocket.getErrorAsString();
CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError1), sal_True == bOK1 );
::rtl::OUString suError = outputError(::rtl::OUString::valueOf(sSocket.getLocalPort( )),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("34463")),
+ ::rtl::OUString("34463"),
"test for getLocalPort function: first create a new socket, then an invalid socket address, bind them, and check the port assigned");
sal_Bool bOK = ( sSocket.getLocalPort( ) >= 1 && sSocket.getLocalPort( ) <= 65535);
@@ -1954,7 +1954,7 @@ namespace osl_Socket
sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
sal_Bool bOK1 = sSocket.bind( saBindSocketAddr );
- ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString();
+ ::rtl::OUString suError1 = ::rtl::OUString("Socket bind fail:") + sSocket.getErrorAsString();
CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError1), sal_True == bOK1 );
sal_Bool bOK;
::rtl::OUString suError;
diff --git a/sal/qa/osl/socket/osl_Socket2.cxx b/sal/qa/osl/socket/osl_Socket2.cxx
index 040c64493d15..ac3fcf5dc98b 100644
--- a/sal/qa/osl/socket/osl_Socket2.cxx
+++ b/sal/qa/osl/socket/osl_Socket2.cxx
@@ -379,7 +379,7 @@ namespace osl_Socket
{
//#if defined(LINUX)
::osl::AcceptorSocket asSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
- AcceptorThread myAcceptorThread( asSocket, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")) );
+ AcceptorThread myAcceptorThread( asSocket, rtl::OUString("127.0.0.1") );
myAcceptorThread.create();
thread_sleep( 1 );
@@ -398,7 +398,7 @@ namespace osl_Socket
void close_003()
{
::osl::AcceptorSocket asSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
- AcceptorThread myAcceptorThread( asSocket, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0.0.0.0")) );
+ AcceptorThread myAcceptorThread( asSocket, rtl::OUString("0.0.0.0") );
myAcceptorThread.create();
thread_sleep( 1 );
@@ -440,13 +440,13 @@ namespace osl_Socket
void getLocalAddr_001()
{
::osl::Socket sSocket(sHandle);
- ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT8 );
+ ::osl::SocketAddr saBindSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT8 );
::osl::SocketAddr saLocalSocketAddr;
sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
sal_Bool bOK1 = sSocket.bind( saBindSocketAddr );
- ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString();
+ ::rtl::OUString suError1 = ::rtl::OUString("Socket bind fail:") + sSocket.getErrorAsString();
CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError1), sal_True == bOK1 );
sSocket.getLocalAddr( saLocalSocketAddr );
@@ -488,13 +488,13 @@ namespace osl_Socket
void getLocalPort_001()
{
::osl::Socket sSocket(sHandle);
- ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT7 ); // aHostIp1 localhost
+ ::osl::SocketAddr saBindSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT7 ); // aHostIp1 localhost
::osl::SocketAddr saLocalSocketAddr;
sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
sal_Bool bOK1 = sSocket.bind( saBindSocketAddr );
- ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString();
+ ::rtl::OUString suError1 = ::rtl::OUString("Socket bind fail:") + sSocket.getErrorAsString();
CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError1), sal_True == bOK1 );
sal_Bool bOK = ( IP_PORT_MYPORT7 == sSocket.getLocalPort( ) );
@@ -512,7 +512,7 @@ namespace osl_Socket
*/
void getLocalPort_002()
{
- ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.45.67.89")), IP_PORT_TELNET);
+ ::osl::SocketAddr saBindSocketAddr( rtl::OUString("123.45.67.89"), IP_PORT_TELNET);
#ifdef WNT
::osl::Socket sSocket(sHandle);
sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); // sal_True);
@@ -525,7 +525,7 @@ namespace osl_Socket
(void)bOK;
#else
//on Unix, if Addr is not an address of type osl_Socket_FamilyInet, it returns OSL_INVALID_PORT
- ::rtl::OUString suError (RTL_CONSTASCII_USTRINGPARAM("on Unix, if Addr is not an address of type osl_Socket_FamilyInet, it returns OSL_INVALID_PORT, but can not create Addr of that case"));
+ ::rtl::OUString suError ("on Unix, if Addr is not an address of type osl_Socket_FamilyInet, it returns OSL_INVALID_PORT, but can not create Addr of that case");
#endif
CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), sal_False );
@@ -539,10 +539,10 @@ namespace osl_Socket
sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
sal_Bool bOK1 = sSocket.bind( saBindSocketAddr );
- ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString();
+ ::rtl::OUString suError1 = ::rtl::OUString("Socket bind fail:") + sSocket.getErrorAsString();
CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError1), sal_True == bOK1 );
::rtl::OUString suError = outputError(::rtl::OUString::valueOf(sSocket.getLocalPort( )),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("34463")),
+ ::rtl::OUString("34463"),
"test for getLocalPort function: first create a new socket, then an invalid socket address, bind them, and check the port assigned");
sal_Bool bOK = ( sSocket.getLocalPort( ) >= 1 && sSocket.getLocalPort( ) <= 65535);
@@ -586,12 +586,12 @@ namespace osl_Socket
{
::osl::Socket sSocket(sHandle);
//port number from IP_PORT_HTTP1 to IP_PORT_MYPORT6, mindyliu
- ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT6 );
+ ::osl::SocketAddr saBindSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT6 );
sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
sal_Bool bOK1 = sSocket.bind( saBindSocketAddr );
- ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString();
+ ::rtl::OUString suError1 = ::rtl::OUString("Socket bind fail:") + sSocket.getErrorAsString();
CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError1), sal_True == bOK1 );
sal_Bool bOK;
::rtl::OUString suError;
@@ -613,13 +613,13 @@ namespace osl_Socket
void getLocalHost_002()
{
::osl::Socket sSocket(sHandle);
- ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.45.67.89")), IP_PORT_POP3);
+ ::osl::SocketAddr saBindSocketAddr( rtl::OUString("123.45.67.89"), IP_PORT_POP3);
::osl::SocketAddr saLocalSocketAddr;
sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
sSocket.bind( saBindSocketAddr );
//Invalid IP, so bind should fail
- sal_Bool bOK = compareUString( sSocket.getLocalHost( ), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) ) ;
+ sal_Bool bOK = compareUString( sSocket.getLocalHost( ), rtl::OUString("") ) ;
::rtl::OUString suError = outputError(sSocket.getLocalHost( ), rtl::OUString(), "test for getLocalHost function: getLocalHost with invalid SocketAddr");
CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), sal_True == bOK );
@@ -667,9 +667,9 @@ namespace osl_Socket
void getPeer_001()
{
- ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT );
- ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT );
- ::osl::SocketAddr saPeerSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP );
+ ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT );
+ ::osl::SocketAddr saTargetSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT );
+ ::osl::SocketAddr saPeerSocketAddr( rtl::OUString("129.158.217.202"), IP_PORT_FTP );
::osl::StreamSocket ssConnection;
asAcceptorSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
/// launch server socket
@@ -743,7 +743,7 @@ namespace osl_Socket
void bind_002()
{
::osl::Socket sSocket(sHandle);
- ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.45.67.89")), IP_PORT_NETBIOS );
+ ::osl::SocketAddr saBindSocketAddr( rtl::OUString("123.45.67.89"), IP_PORT_NETBIOS );
::osl::SocketAddr saLocalSocketAddr;
sSocket.setOption( osl_Socket_OptionReuseAddr, 1); // sal_True);
@@ -795,9 +795,9 @@ namespace osl_Socket
void isRecvReady_001()
{
- ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT1 );
- ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT1 );
- ::osl::SocketAddr saPeerSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP );
+ ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT1 );
+ ::osl::SocketAddr saTargetSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT1 );
+ ::osl::SocketAddr saPeerSocketAddr( rtl::OUString("129.158.217.202"), IP_PORT_FTP );
::osl::StreamSocket ssConnection;
/// launch server socket
asAcceptorSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); // sal_True);
@@ -858,9 +858,9 @@ namespace osl_Socket
void isSendReady_001()
{
- ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT );
- ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT );
- ::osl::SocketAddr saPeerSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP );
+ ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT );
+ ::osl::SocketAddr saTargetSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT );
+ ::osl::SocketAddr saPeerSocketAddr( rtl::OUString("129.158.217.202"), IP_PORT_FTP );
::osl::StreamSocket ssConnection;
/// launch server socket
@@ -1211,7 +1211,7 @@ namespace osl_Socket
void enableNonBlockingMode_001()
{
- ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT );
+ ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT );
::osl::StreamSocket ssConnection;
/// launch server socket
@@ -1249,7 +1249,7 @@ namespace osl_Socket
void isNonBlockingMode_001()
{
- ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT );
+ ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT );
::osl::StreamSocket ssConnection;
/// launch server socket
@@ -1300,7 +1300,7 @@ namespace osl_Socket
void clearError_001()
{
::osl::Socket sSocket(sHandle);
- ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.45.67.89")), IP_PORT_HTTP2 );
+ ::osl::SocketAddr saBindSocketAddr( rtl::OUString("123.45.67.89"), IP_PORT_HTTP2 );
::osl::SocketAddr saLocalSocketAddr;
sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
sSocket.bind( saBindSocketAddr );//build an error "osl_Socket_E_AddrNotAvail"
@@ -1342,7 +1342,7 @@ namespace osl_Socket
void getError_001()
{
::osl::Socket sSocket(sHandle);
- ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP );
+ ::osl::SocketAddr saBindSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_FTP );
::osl::SocketAddr saLocalSocketAddr;
CPPUNIT_ASSERT_MESSAGE( "test for getError function: should get no error.",
@@ -1352,7 +1352,7 @@ namespace osl_Socket
void getError_002()
{
::osl::Socket sSocket(sHandle);
- ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.45.67.89")), IP_PORT_FTP );
+ ::osl::SocketAddr saBindSocketAddr( rtl::OUString("123.45.67.89"), IP_PORT_FTP );
::osl::SocketAddr saLocalSocketAddr;
sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
sSocket.bind( saBindSocketAddr );//build an error "osl_Socket_E_AddrNotAvail"
diff --git a/sal/qa/osl/socket/osl_SocketAddr.cxx b/sal/qa/osl/socket/osl_SocketAddr.cxx
index 7b8c2c9f1eb0..daeae38b0dbf 100644
--- a/sal/qa/osl/socket/osl_SocketAddr.cxx
+++ b/sal/qa/osl/socket/osl_SocketAddr.cxx
@@ -122,11 +122,11 @@ namespace osl_SocketAddr
sal_Bool bOk = compareUString(suHost, suHost2);
- rtl::OUString suError (RTL_CONSTASCII_USTRINGPARAM("Host names should be the same. From SocketAddr.getLocalHostname() it is'"));
+ rtl::OUString suError ("Host names should be the same. From SocketAddr.getLocalHostname() it is'");
suError += suHost;
- suError += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("', from getThisHostname() it is '"));
+ suError += rtl::OUString("', from getThisHostname() it is '");
suError += suHost2;
- suError += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'."));
+ suError += rtl::OUString("'.");
CPPUNIT_ASSERT_MESSAGE(STD_STRING(suError), sal_True == bOk);
}
@@ -134,7 +134,7 @@ namespace osl_SocketAddr
void ctors_copy()
{
/// SocketAddr copy constructor.
- ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 );
+ ::osl::SocketAddr saSocketAddr( rtl::OUString("localhost"), IP_PORT_HTTP1 );
::osl::SocketAddr saCopySocketAddr( saSocketAddr );
sal_Int32 nPort = saCopySocketAddr.getPort( );
@@ -145,7 +145,7 @@ namespace osl_SocketAddr
void ctors_copy_no_001()
{
- ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 );
+ ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString("localhost"), IP_PORT_HTTP1 );
CPPUNIT_ASSERT_MESSAGE("check for new SocketAddr", pSocketAddr != NULL);
oslSocketAddr psaOSLSocketAddr = pSocketAddr->getHandle( );
@@ -162,7 +162,7 @@ namespace osl_SocketAddr
void ctors_copy_no_002()
{
- ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 );
+ ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString("localhost"), IP_PORT_HTTP1 );
CPPUNIT_ASSERT_MESSAGE("check for new SocketAddr", pSocketAddr != NULL);
oslSocketAddr psaOSLSocketAddr = pSocketAddr->getHandle( );
::osl::SocketAddr* pSocketAddrCopy = new ::osl::SocketAddr( psaOSLSocketAddr, SAL_NO_COPY );
@@ -175,7 +175,7 @@ namespace osl_SocketAddr
void ctors_copy_handle_001()
{
- ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 );
+ ::osl::SocketAddr saSocketAddr( rtl::OUString("localhost"), IP_PORT_HTTP1 );
::osl::SocketAddr saSocketAddrCopy( saSocketAddr.getHandle( ) );
CPPUNIT_ASSERT_MESSAGE("test for SocketAddr copy handle constructor function: copy another Socket's handle, get its port to check copy effect.",
@@ -184,7 +184,7 @@ namespace osl_SocketAddr
void ctors_copy_handle_002()
{
- ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 );
+ ::osl::SocketAddr saSocketAddr( rtl::OUString("localhost"), IP_PORT_HTTP1 );
::osl::SocketAddr saSocketAddrCopy( saSocketAddr.getHandle( ) );
saSocketAddrCopy.setPort( IP_PORT_HTTP2 );
@@ -195,7 +195,7 @@ namespace osl_SocketAddr
void ctors_hostname_port_001()
{
/// tcpip-specif constructor.
- ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP );
+ ::osl::SocketAddr saSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_FTP );
printUString( saSocketAddr.getHostname( ), "ctors_hostname_port_001:getHostname");
CPPUNIT_ASSERT_MESSAGE("test for SocketAddr tcpip specif constructor function: do a constructor using tcpip spec, check the result.",
@@ -208,7 +208,7 @@ namespace osl_SocketAddr
void ctors_hostname_port_002()
{
/// tcpip-specif constructor.
- ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_MYPORT2 );
+ ::osl::SocketAddr saSocketAddr( rtl::OUString("123.345.67.89"), IP_PORT_MYPORT2 );
CPPUNIT_ASSERT_MESSAGE("test for SocketAddr tcpip specif constructor function: using an invalid IP address, the socketaddr ctors should fail", sal_False == saSocketAddr.is( ));
}
@@ -244,7 +244,7 @@ namespace osl_SocketAddr
// refer to setPort_003()
void is_002()
{
- ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_INVAL );
+ ::osl::SocketAddr saSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_INVAL );
CPPUNIT_ASSERT_MESSAGE("test for is() function: create a tcp-ip socket using invalid port number",
sal_True == saSocketAddr.is( ) );
@@ -252,7 +252,7 @@ namespace osl_SocketAddr
void is_003()
{
- ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_MYPORT );
+ ::osl::SocketAddr saSocketAddr( rtl::OUString("123.345.67.89"), IP_PORT_MYPORT );
CPPUNIT_ASSERT_MESSAGE("test for is() function: create a tcp-ip socket using invalid Ip number",
sal_True != saSocketAddr.is( ) );
@@ -284,7 +284,7 @@ namespace osl_SocketAddr
void getHostname_000()
{
- ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.107")), IP_PORT_FTP );
+ ::osl::SocketAddr saSocketAddr( rtl::OUString("129.158.217.107"), IP_PORT_FTP );
rtl::OUString suResult = saSocketAddr.getHostname( 0 );
}
@@ -296,16 +296,16 @@ namespace osl_SocketAddr
*/
void getHostname_001()
{
- ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.107")), IP_PORT_FTP );
+ ::osl::SocketAddr saSocketAddr( rtl::OUString("129.158.217.107"), IP_PORT_FTP );
rtl::OUString suResult = saSocketAddr.getHostname( 0 );
- rtl::OUString suError = outputError(suResult, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sceri.PRC.Sun.COM")), "test for getHostname(0)");
- sal_Bool bOK = compareUString( suResult, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sceri.PRC.Sun.COM")) );
+ rtl::OUString suError = outputError(suResult, rtl::OUString("sceri.PRC.Sun.COM"), "test for getHostname(0)");
+ sal_Bool bOK = compareUString( suResult, rtl::OUString("sceri.PRC.Sun.COM") );
// search the returned hostname in /etc/hosts, if find, and the IP in the row is same as IP
// in the Addr, it's right also.
if ( bOK == sal_False)
{
rtl::OString aString = ::rtl::OUStringToOString( suResult, RTL_TEXTENCODING_ASCII_US );
- if ( compareUString( getIPbyName( aString ), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.107")) ) == sal_True )
+ if ( compareUString( getIPbyName( aString ), rtl::OUString("129.158.217.107") ) == sal_True )
bOK = sal_True;
}
CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), sal_True == bOK);
@@ -315,11 +315,11 @@ namespace osl_SocketAddr
// LLA: this function does not work in company (Linux, Windows) but at home
void getHostname_002()
{
- rtl::OUString suHostname (RTL_CONSTASCII_USTRINGPARAM("cn-1.germany.sun.com"));
+ rtl::OUString suHostname ("cn-1.germany.sun.com");
rtl::OString aString = ::rtl::OUStringToOString( suHostname, RTL_TEXTENCODING_ASCII_US );
rtl::OUString aHostIP = getIPbyName( aString );
- ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_FTP );
+ ::osl::SocketAddr saSocketAddr( rtl::OUString("localhost"), IP_PORT_FTP );
sal_Bool bOK = saSocketAddr.setHostname( suHostname );
CPPUNIT_ASSERT_MESSAGE("#SocketAddr.setHostname failed", sal_True == bOK );
oslSocketResult aResult;
@@ -359,7 +359,7 @@ namespace osl_SocketAddr
public:
void getPort_001()
{
- ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP );
+ ::osl::SocketAddr saSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_FTP );
CPPUNIT_ASSERT_MESSAGE( "test for getPort() function: get a normal port number.",
IP_PORT_FTP == saSocketAddr.getPort( ) );
@@ -367,7 +367,7 @@ namespace osl_SocketAddr
void getPort_002()
{
- ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_INVAL );
+ ::osl::SocketAddr saSocketAddr( rtl::OUString("129.158.217.202"), IP_PORT_INVAL );
//t_print("#getPort_002: Port number is %d \n", saSocketAddr.getPort( ));
@@ -378,7 +378,7 @@ namespace osl_SocketAddr
//2. SocketAddr family is not osl_Socket_FamilyInet, but case 2 could not be constructed
void getPort_003()
{
- rtl::OUString suInvalidIP (RTL_CONSTASCII_USTRINGPARAM("123.345.67.89"));
+ rtl::OUString suInvalidIP ("123.345.67.89");
::osl::SocketAddr saSocketAddr( suInvalidIP, IP_PORT_MYPORT );
CPPUNIT_ASSERT_MESSAGE( "test for getPort( ) function: give an invalid IP to a SocketAddr, get the port to see returned value. ",
@@ -405,7 +405,7 @@ namespace osl_SocketAddr
public:
void setPort_001()
{
- ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP );
+ ::osl::SocketAddr saSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_FTP );
sal_Bool bOK = saSocketAddr.setPort( IP_PORT_TELNET );
CPPUNIT_ASSERT_MESSAGE( "test for setPort() function: modify a port number setting, and check it.",
@@ -423,7 +423,7 @@ namespace osl_SocketAddr
*/
void setPort_002()
{
- ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP );
+ ::osl::SocketAddr saSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_FTP );
sal_Bool bOK = saSocketAddr.setPort( IP_PORT_ZERO );
oslSocket sHandle = osl_createSocket( osl_Socket_FamilyInet, osl_Socket_TypeStream, osl_Socket_ProtocolIp );
@@ -442,7 +442,7 @@ namespace osl_SocketAddr
void setPort_003()
{
- ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP);
+ ::osl::SocketAddr saSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_FTP);
sal_Bool bOK = saSocketAddr.setPort( IP_PORT_INVAL );
//on Linux, getPort return 34463
//t_print("#Port number is %d \n", saSocketAddr.getPort( ));
@@ -455,7 +455,7 @@ namespace osl_SocketAddr
/* this is not a inet-addr => can't set port */
void setPort_004()
{
- ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_FTP);
+ ::osl::SocketAddr saSocketAddr( rtl::OUString("123.345.67.89"), IP_PORT_FTP);
sal_Bool bOK = saSocketAddr.setPort( IP_PORT_MYPORT );
CPPUNIT_ASSERT_MESSAGE( "test for setPort( ) function: set an invalid address with valid port. it should return error.",
@@ -492,8 +492,8 @@ namespace osl_SocketAddr
public:
void setAddr_001()
{
- ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP );
- saSocketAddr.setAddr( UStringIPToByteSequence( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")) ) );
+ ::osl::SocketAddr saSocketAddr( rtl::OUString("129.158.217.202"), IP_PORT_FTP );
+ saSocketAddr.setAddr( UStringIPToByteSequence( rtl::OUString("127.0.0.1") ) );
::rtl::ByteSequence bsSocketAddr = saSocketAddr.getAddr( 0 );
sal_Bool bOK = sal_False;
@@ -523,7 +523,7 @@ namespace osl_SocketAddr
void getAddr_001()
{
oslSocketResult SocketResult;
- ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP );
+ ::osl::SocketAddr saSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_FTP );
::rtl::ByteSequence bsSocketAddr = saSocketAddr.getAddr( &SocketResult );
sal_Bool bOK = sal_False;
@@ -556,8 +556,8 @@ namespace osl_SocketAddr
public:
void operator_equal_001()
{
- ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET);
- ::osl::SocketAddr saSocketAddrEqual( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP );
+ ::osl::SocketAddr saSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_TELNET);
+ ::osl::SocketAddr saSocketAddrEqual( rtl::OUString("129.158.217.202"), IP_PORT_FTP );
saSocketAddrEqual = saSocketAddr;
sal_Bool bOK = sal_False;
@@ -574,8 +574,8 @@ namespace osl_SocketAddr
void operator_equal_002()
{
- ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.199")), IP_PORT_TELNET);
- ::osl::SocketAddr saSocketAddrEqual( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP );
+ ::osl::SocketAddr saSocketAddr( rtl::OUString("129.158.217.199"), IP_PORT_TELNET);
+ ::osl::SocketAddr saSocketAddrEqual( rtl::OUString("129.158.217.202"), IP_PORT_FTP );
saSocketAddrEqual = saSocketAddr;
CPPUNIT_ASSERT_MESSAGE( "after assign, the assigned SocketAddr is not same as the original Addr",
@@ -589,8 +589,8 @@ namespace osl_SocketAddr
void operator_equal_const_001()
{
- const ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET);
- ::osl::SocketAddr saSocketAddrEqual( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP );
+ const ::osl::SocketAddr saSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_TELNET);
+ ::osl::SocketAddr saSocketAddrEqual( rtl::OUString("129.158.217.202"), IP_PORT_FTP );
saSocketAddrEqual = saSocketAddr;
sal_Bool bOK = sal_False;
@@ -606,8 +606,8 @@ namespace osl_SocketAddr
void operator_equal_const_002()
{
- const ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET);
- ::osl::SocketAddr saSocketAddrEqual( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP );
+ const ::osl::SocketAddr saSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_TELNET);
+ ::osl::SocketAddr saSocketAddrEqual( rtl::OUString("129.158.217.202"), IP_PORT_FTP );
saSocketAddrEqual = saSocketAddr;
saSocketAddrEqual.setPort( IP_PORT_HTTP1 );
@@ -618,9 +618,9 @@ namespace osl_SocketAddr
void operator_equal_assign_001()
{
- ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET );
+ ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_TELNET );
CPPUNIT_ASSERT_MESSAGE("check for new SocketAddr", pSocketAddr != NULL);
- ::osl::SocketAddr* pSocketAddrAssign = new ::osl::SocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP );
+ ::osl::SocketAddr* pSocketAddrAssign = new ::osl::SocketAddr( rtl::OUString("129.158.217.202"), IP_PORT_FTP );
oslSocketAddr poslSocketAddr = pSocketAddr->getHandle( );
//if( m_handle ) osl_destroySocketAddr( m_handle ); so pSocketAddrAssign had been destroyed and then point to pSocketAddr
pSocketAddrAssign->assign(poslSocketAddr, SAL_NO_COPY);
@@ -633,8 +633,8 @@ namespace osl_SocketAddr
void operator_is_equal_001()
{
- ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET);
- ::osl::SocketAddr saSocketAddrequal( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET );
+ ::osl::SocketAddr saSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_TELNET);
+ ::osl::SocketAddr saSocketAddrequal( rtl::OUString("127.0.0.1"), IP_PORT_TELNET );
CPPUNIT_ASSERT_MESSAGE( "test for operator_equal_equal() function: check two identical Address.",
sal_True == ( saSocketAddrequal == saSocketAddr.getHandle( ) ) );
@@ -642,8 +642,8 @@ namespace osl_SocketAddr
void operator_is_equal_002()
{
- ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP);
- ::osl::SocketAddr saSocketAddrequal( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET );
+ ::osl::SocketAddr saSocketAddr( rtl::OUString("129.158.217.202"), IP_PORT_FTP);
+ ::osl::SocketAddr saSocketAddrequal( rtl::OUString("127.0.0.1"), IP_PORT_TELNET );
CPPUNIT_ASSERT_MESSAGE( "test for operator_equal_equal() function: check two different Address.",
sal_False == ( saSocketAddrequal == saSocketAddr.getHandle( ) ) );
@@ -673,7 +673,7 @@ namespace osl_SocketAddr
void getSocketAddrHandle_001()
{
- ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 );
+ ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString("localhost"), IP_PORT_HTTP1 );
CPPUNIT_ASSERT_MESSAGE("check for new SocketAddr", pSocketAddr != NULL);
oslSocketAddr psaOSLSocketAddr = pSocketAddr->getHandle( );
::osl::SocketAddr* pSocketAddrCopy = new ::osl::SocketAddr( psaOSLSocketAddr, SAL_NO_COPY );
@@ -686,7 +686,7 @@ namespace osl_SocketAddr
void getSocketAddrHandle_002()
{
- ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("deuce.PRC.Sun.COM")), IP_PORT_MYPORT4 );
+ ::osl::SocketAddr saSocketAddr( rtl::OUString("deuce.PRC.Sun.COM"), IP_PORT_MYPORT4 );
oslSocketAddr poslSocketAddr = saSocketAddr.getHandle( );
sal_Bool bOK = ( saSocketAddr == poslSocketAddr );
@@ -767,7 +767,7 @@ namespace osl_SocketAddr
void resolveHostname_001()
{
::osl::SocketAddr saSocketAddr;
- ::osl::SocketAddr::resolveHostname( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), saSocketAddr );
+ ::osl::SocketAddr::resolveHostname( rtl::OUString("127.0.0.1"), saSocketAddr );
::rtl::ByteSequence bsSocketAddr = saSocketAddr.getAddr( 0 );
sal_Bool bOK = sal_False;
@@ -788,7 +788,7 @@ namespace osl_SocketAddr
/** testing the method:
static inline sal_Int32 SAL_CALL getServicePort(
const ::rtl::OUString& strServiceName,
- const ::rtl::OUString & strProtocolName= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tcp")) );
+ const ::rtl::OUString & strProtocolName= ::rtl::OUString("tcp") );
*/
class gettheServicePort : public CppUnit::TestFixture
@@ -796,8 +796,8 @@ namespace osl_SocketAddr
public:
void gettheServicePort_001()
{
- rtl::OUString suServiceFTP (RTL_CONSTASCII_USTRINGPARAM("ftp"));
- rtl::OUString suProtocolTCP (RTL_CONSTASCII_USTRINGPARAM("tcp"));
+ rtl::OUString suServiceFTP ("ftp");
+ rtl::OUString suProtocolTCP ("tcp");
CPPUNIT_ASSERT_MESSAGE( "test for getServicePort() function: try to get ftp service port on TCP protocol.",
IP_PORT_FTP== ::osl::SocketAddr::getServicePort( suServiceFTP, suProtocolTCP ) );
@@ -805,8 +805,8 @@ namespace osl_SocketAddr
void gettheServicePort_002()
{
- rtl::OUString suServiceTELNET (RTL_CONSTASCII_USTRINGPARAM("telnet"));
- rtl::OUString suProtocolTCP (RTL_CONSTASCII_USTRINGPARAM("tcp"));
+ rtl::OUString suServiceTELNET ("telnet");
+ rtl::OUString suProtocolTCP ("tcp");
CPPUNIT_ASSERT_MESSAGE( "test for getServicePort() function: try to get telnet service port on TCP protocol.",
IP_PORT_TELNET== ::osl::SocketAddr::getServicePort( suServiceTELNET, suProtocolTCP ) );
}
@@ -814,17 +814,17 @@ namespace osl_SocketAddr
void gettheServicePort_003()
{
//Solaris has no service called "https", please see /etc/services
- rtl::OUString suServiceNETBIOS (RTL_CONSTASCII_USTRINGPARAM("netbios-dgm"));
- rtl::OUString suProtocolUDP (RTL_CONSTASCII_USTRINGPARAM("udp"));
+ rtl::OUString suServiceNETBIOS ("netbios-dgm");
+ rtl::OUString suProtocolUDP ("udp");
CPPUNIT_ASSERT_MESSAGE( "test for getServicePort() function: try to get netbios-ssn service port on UDP protocol.",
IP_PORT_NETBIOS_DGM == ::osl::SocketAddr::getServicePort( suServiceNETBIOS, suProtocolUDP ) );
}
void gettheServicePort_004()
{
- rtl::OUString suProtocolUDP(RTL_CONSTASCII_USTRINGPARAM( "udp" ));
+ rtl::OUString suProtocolUDP("udp" );
CPPUNIT_ASSERT_MESSAGE( "test for getServicePort() function: try to get a service port which is not exist.",
- OSL_INVALID_PORT == ::osl::SocketAddr::getServicePort( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("notexist")), suProtocolUDP ) );
+ OSL_INVALID_PORT == ::osl::SocketAddr::getServicePort( ::rtl::OUString("notexist"), suProtocolUDP ) );
}
CPPUNIT_TEST_SUITE( gettheServicePort );
@@ -845,7 +845,7 @@ namespace osl_SocketAddr
public:
void getFamilyOfSocketAddr_001()
{
- ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 );
+ ::osl::SocketAddr saSocketAddr( rtl::OUString("localhost"), IP_PORT_HTTP1 );
oslSocketAddr psaOSLSocketAddr = saSocketAddr.getHandle( );
CPPUNIT_ASSERT_EQUAL(
osl_Socket_FamilyInet,
diff --git a/sal/qa/osl/socket/osl_StreamSocket.cxx b/sal/qa/osl/socket/osl_StreamSocket.cxx
index 1d36c3a2549f..876951bdf467 100644
--- a/sal/qa/osl/socket/osl_StreamSocket.cxx
+++ b/sal/qa/osl/socket/osl_StreamSocket.cxx
@@ -142,7 +142,7 @@ protected:
void SAL_CALL run( )
{
::osl::AcceptorSocket asAcceptorSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
- ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 );
+ ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT9 );
::osl::StreamSocket ssStreamConnection;
//if has not set this option, socket addr can not be binded in some time(maybe 2 minutes) by another socket
@@ -252,7 +252,7 @@ protected:
public:
ClientSocketThread( osl::Condition &_aCond ):
m_aCondition(_aCond),
- m_saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 ),
+ m_saTargetSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT9 ),
m_csConnectorSocket( )
{
m_id = getIdentifier( );
@@ -335,7 +335,7 @@ protected:
void SAL_CALL run( )
{
- ::osl::SocketAddr m_aTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT10 );
+ ::osl::SocketAddr m_aTargetSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT10 );
::osl::ConnectorSocket m_aConnectorSocket;
if (! m_aTargetSocketAddr.is())
@@ -416,7 +416,7 @@ protected:
{
t_print("start WriteSocketThread\n");
::osl::AcceptorSocket asAcceptorSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
- ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT10 );
+ ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT10 );
if (! saLocalSocketAddr.is())
{
t_print("LocalSocketAddr was NOT created successfully!\n");
@@ -615,7 +615,7 @@ namespace osl_StreamSocket
void send_recv2()
{
::osl::AcceptorSocket asAcceptorSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
- ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 );
+ ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT9 );
::osl::StreamSocket ssStreamConnection;
sal_Char pReadBuffer[30] = "";
@@ -740,7 +740,7 @@ namespace osl_StreamSocket
}
public:
SendClientThread( ):
- m_saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 ),
+ m_saTargetSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT9 ),
m_csConnectorSocket( )
{
//t_print("# successfully creat this SendClientThread %d!\n", m_id );
@@ -772,7 +772,7 @@ namespace osl_StreamSocket
{
#if defined(LINUX)
::osl::AcceptorSocket asSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
- AcceptorThread myAcceptorThread( asSocket, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")) );
+ AcceptorThread myAcceptorThread( asSocket, rtl::OUString("127.0.0.1") );
myAcceptorThread.create();
thread_sleep( 1 );
@@ -789,7 +789,7 @@ namespace osl_StreamSocket
void shutdown_002()
{
::osl::AcceptorSocket asSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
- ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9);
+ ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT9);
asSocket.setOption( osl_Socket_OptionReuseAddr, 1 );
CPPUNIT_ASSERT_MESSAGE("shutdown_002: bind fail", asSocket.bind( saLocalSocketAddr ) == sal_True);
CPPUNIT_ASSERT_MESSAGE("shutdown_002: listen fail", asSocket.listen( 1 ) == sal_True );
@@ -842,7 +842,7 @@ namespace osl_StreamSocket
void shutdown_003()
{
::osl::AcceptorSocket asSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
- ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9);
+ ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT9);
asSocket.setOption( osl_Socket_OptionReuseAddr, 1 );
CPPUNIT_ASSERT_MESSAGE("shutdown_002: bind fail", asSocket.bind( saLocalSocketAddr ) == sal_True);
CPPUNIT_ASSERT_MESSAGE("shutdown_002: listen fail", asSocket.listen( 1 ) == sal_True );
@@ -1194,7 +1194,7 @@ namespace osl_StreamSocket
void send_recv()
{
rtl::OString sAddr;
- // if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("margritte.germany"))) == sal_True )
+ // if ( ifAvailable(rtl::OUString("margritte.germany")) == sal_True )
// {
// t_print("margritte is alive ! \n");
// sAddr = "margritte.germany";
@@ -1207,21 +1207,21 @@ namespace osl_StreamSocket
}
// else
// {
-// if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("192.168.7.2"))) == sal_True )
+// if ( ifAvailable(rtl::OUString("192.168.7.2")) == sal_True )
// {
// sAddr = "192.168.7.2";
// t_print("moon found ! \n");
// }
// else
// {
-// if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("moon.linux.bogus"))) == sal_True )
+// if ( ifAvailable(rtl::OUString("moon.linux.bogus")) == sal_True )
// {
// sAddr = "moon.linux.bogus";
// t_print("moon found ! \n");
// }
// else
// {
-// if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("moon"))) == sal_True )
+// if ( ifAvailable(rtl::OUString("moon")) == sal_True )
// {
// sAddr = "moon";
// t_print("moon found ! \n");
@@ -1230,7 +1230,7 @@ namespace osl_StreamSocket
// }
// }
- // if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("10.16.64.196"))) == sal_False )
+ // if ( ifAvailable(rtl::OUString("10.16.64.196")) == sal_False )
// {
// t_print("ip 10.16.64.196 is not alive! \n");
// return;
diff --git a/sal/qa/osl/socket/sockethelper.cxx b/sal/qa/osl/socket/sockethelper.cxx
index 91c49868bde9..8f448e258d6e 100644
--- a/sal/qa/osl/socket/sockethelper.cxx
+++ b/sal/qa/osl/socket/sockethelper.cxx
@@ -185,11 +185,11 @@ void printUString( const ::rtl::OUString & str, const char* msg)
if ( returnVal.equals( rightVal ) )
return aUString;
aUString += ::rtl::OUString::createFromAscii(msg);
- aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(": the returned value is '"));
+ aUString += ::rtl::OUString(": the returned value is '");
aUString += returnVal;
- aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("', but the value should be '"));
+ aUString += ::rtl::OUString("', but the value should be '");
aUString += rightVal;
- aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'."));
+ aUString += ::rtl::OUString("'.");
return aUString;
}
generated by cgit (git 2.34.1) at 2024-07-25 07:20:03 +0000