WaE: some simple warnings

2 files changed, 7 insertions, 4 deletions

diff --git a/sal/qa/OStringBuffer/rtl_String_Utils.cxx b/sal/qa/OStringBuffer/rtl_String_Utils.cxx
index 06764b177e27..68d3534ccef1 100644
--- a/sal/qa/OStringBuffer/rtl_String_Utils.cxx
+++ b/sal/qa/OStringBuffer/rtl_String_Utils.cxx
@@ -76,8 +76,9 @@ sal_Char* cpystr( sal_Char* dst, const sal_Char* src )
     const sal_Char* psrc = src;
     sal_Char* pdst = dst;
 
-    while( (*pdst++ = *psrc++) );
-    return ( dst );
+    while( (*pdst++ = *psrc++) ) {}
+
+    return dst;
 }
 
 sal_Char* cpynstr( sal_Char* dst, const sal_Char* src, sal_uInt32 cnt )
diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx
index 5c0dec245a92..063ddf2b2591 100644
--- a/sal/qa/osl/security/osl_Security.cxx
+++ b/sal/qa/osl/security/osl_Security.cxx
@@ -637,7 +637,8 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *,
 
             aLogonPasswd = aStringForward.copy( nFirstSpacePoint +1, aStringForward.getLength( ) - 1 );
             t_print("#Forwarded password: ");
-            for ( int i = nFirstSpacePoint +1; i <= aStringForward.getLength( ) - 1; i++, t_print("*") );
+            for (int i = nFirstSpacePoint+1; i <= aStringForward.getLength()-1; ++i)
+                t_print("*");
             t_print("\n" );
         }
         else
@@ -649,7 +650,8 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *,
 
             aLogonPasswd = aStringForward.copy( nFirstSpacePoint +1, nLastSpacePoint );
             t_print("#Forwarded password: ");
-            for ( int i = nFirstSpacePoint +1; i <= nLastSpacePoint; i++, t_print("*") );
+            for (int i = nFirstSpacePoint+1; i <= nLastSpacePoint; ++i)
+                t_print("*");
             t_print("\n" );
 
             aFileServer = aStringForward.copy( nLastSpacePoint +1, aStringForward.getLength( ) - 1 );