WaE: get %ld %d right for x86_64/x86

3 files changed, 6 insertions, 17 deletions

diff --git a/sal/qa/osl/socket/osl_Socket.cxx b/sal/qa/osl/socket/osl_Socket.cxx
index 755f183bc..566ef6747 100644
--- a/sal/qa/osl/socket/osl_Socket.cxx
+++ b/sal/qa/osl/socket/osl_Socket.cxx
@@ -2454,7 +2454,7 @@ namespace osl_Socket
             // on Linux, the value of option is 1, on Solaris, it's 16, but it's not important the exact value,
             // just judge it is zero or not!
             sal_Bool bOK = ( 0  !=  *pGetBuffer );
-            t_print("#setOption_001: getOption is %ld \n", *pGetBuffer);
+            t_print("#setOption_001: getOption is %"SAL_PRIdINT32" \n", *pGetBuffer);
 
             // toggle check, set to 0
             *pbDontRouteSet = 0;
@@ -2466,7 +2466,7 @@ namespace osl_Socket
 
             sal_Bool bOK2 = ( 0  ==  *pGetBuffer );
 
-            t_print("#setOption_001: getOption is %ld \n", *pGetBuffer);
+            t_print("#setOption_001: getOption is %"SAL_PRIdINT32" \n", *pGetBuffer);
 
 // LLA: 			sal_Bool * pbDontTouteSet = ( sal_Bool * )malloc( sizeof ( sal_Bool ) );
 // LLA: 			*pbDontTouteSet = sal_True;
diff --git a/sal/qa/osl/socket/osl_Socket2.cxx b/sal/qa/osl/socket/osl_Socket2.cxx
index ed02581d9..2d39ac60b 100644
--- a/sal/qa/osl/socket/osl_Socket2.cxx
+++ b/sal/qa/osl/socket/osl_Socket2.cxx
@@ -1107,7 +1107,7 @@ namespace osl_Socket
             // on Linux, the value of option is 1, on Solaris, it's 16, but it's not important the exact value,
             // just judge it is zero or not!
             sal_Bool bOK = ( 0  !=  *pGetBuffer );
-            t_print("#setOption_001: getOption is %ld \n", *pGetBuffer);
+            t_print("#setOption_001: getOption is %"SAL_PRIdINT32" \n", *pGetBuffer);
 
             // toggle check, set to 0
             *pbDontRouteSet = 0;
@@ -1119,7 +1119,7 @@ namespace osl_Socket
 
             sal_Bool bOK2 = ( 0  ==  *pGetBuffer );
 
-            t_print("#setOption_001: getOption is %ld \n", *pGetBuffer);
+            t_print("#setOption_001: getOption is %"SAL_PRIdINT32" \n", *pGetBuffer);
 
 // LLA: 			sal_Bool * pbDontTouteSet = ( sal_Bool * )malloc( sizeof ( sal_Bool ) );
 // LLA: 			*pbDontTouteSet = sal_True;
diff --git a/sal/qa/osl/socket/osl_StreamSocket.cxx b/sal/qa/osl/socket/osl_StreamSocket.cxx
index 2d47eba0e..ac4e28d6e 100644
--- a/sal/qa/osl/socket/osl_StreamSocket.cxx
+++ b/sal/qa/osl/socket/osl_StreamSocket.cxx
@@ -1130,10 +1130,6 @@ namespace osl_StreamSocket
 
                     t_print("received: %s\n", pBuffer2);
 
-                    // char * pBuffer3 = "quit\n";
-                    // nBufferSize = strlen(pBuffer3);
-                    // nWriteNumber = ssStreamConnection.write( pBuffer3, nBufferSize );
-
                     rtl::OUString suError = ssStreamConnection.getErrorAsString();
                     free(pBuffer2);
                     // ssStreamConnection.close();
@@ -1199,14 +1195,11 @@ namespace osl_StreamSocket
 
                     char const * pBuffer = "Test String\n";
                     sal_Int32 nBufferSize = strlen(pBuffer);
-                    sal_Int32 nWriteNumber = ssStreamConnection.write( pBuffer, nBufferSize );
-
-                    // char * pBuffer2 = "                                                                                                 ";
-                    // sal_Int32 nReadNumber = ssStreamConnection.read( pBuffer2, strlen(pBuffer2) );
+                    ssStreamConnection.write( pBuffer, nBufferSize );
 
                     char const * pBuffer3 = "quit\n";
                     nBufferSize = strlen(pBuffer3);
-                    nWriteNumber = ssStreamConnection.write( pBuffer3, nBufferSize );
+                    ssStreamConnection.write( pBuffer3, nBufferSize );
 
                     ssStreamConnection.close();
                 }
@@ -1412,10 +1405,6 @@ namespace osl_StreamSocket
                     }
                     free(pBufferPeek);
 
-                    // char * pBuffer3 = "quit\n";
-                    // nBufferSize = strlen(pBuffer3);
-                    // nWriteNumber = ssStreamConnection.write( pBuffer3, nBufferSize );
-
                     rtl::OUString suError = ssStreamConnection.getErrorAsString();
                 }
                 aSocket.shutdown(osl_Socket_DirReadWrite);