diff options
| -rw-r--r-- | connectivity/workben/testmoz/main.cxx | 1 | ||||
| -rw-r--r-- | cppu/source/AffineBridge/AffineBridge.cxx | 4 | ||||
| -rw-r--r-- | cppu/source/LogBridge/LogBridge.cxx | 7 | ||||
| -rw-r--r-- | cppu/source/UnsafeBridge/UnsafeBridge.cxx | 7 | ||||
| -rw-r--r-- | crashrep/source/unx/main.cxx | 10 |
5 files changed, 11 insertions, 18 deletions
diff --git a/connectivity/workben/testmoz/main.cxx b/connectivity/workben/testmoz/main.cxx index 10e9bc8af060..b9efa6940d78 100644 --- a/connectivity/workben/testmoz/main.cxx +++ b/connectivity/workben/testmoz/main.cxx @@ -410,7 +410,6 @@ Reference< ::com::sun::star::sdbc::XConnection> TestConnected break; default: return pConnection; - break; } pConnection = pDriver->connect(url,aValue); diff --git a/cppu/source/AffineBridge/AffineBridge.cxx b/cppu/source/AffineBridge/AffineBridge.cxx index 7d62b46cfa58..86d79f1f7564 100644 --- a/cppu/source/AffineBridge/AffineBridge.cxx +++ b/cppu/source/AffineBridge/AffineBridge.cxx @@ -319,9 +319,7 @@ void AffineBridge::v_leave(void) int AffineBridge::v_isValid(rtl::OUString * pReason) { - int result = 1; - - result = m_enterCount > 0; + int result = m_enterCount > 0; if (!result) *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("not entered")); diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx index 0d161fb88321..a1cacf442db8 100644 --- a/cppu/source/LogBridge/LogBridge.cxx +++ b/cppu/source/LogBridge/LogBridge.cxx @@ -109,12 +109,11 @@ void LogBridge::v_leave(void) int LogBridge::v_isValid(rtl::OUString * pReason) { - int result = 1; - - result = m_count > 0; + int result = m_count > 0; if (!result) + { *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("not entered")); - + } else { result = m_threadId == osl_getThreadIdentifier(NULL); diff --git a/cppu/source/UnsafeBridge/UnsafeBridge.cxx b/cppu/source/UnsafeBridge/UnsafeBridge.cxx index 96a531068123..382ed3e36f7f 100644 --- a/cppu/source/UnsafeBridge/UnsafeBridge.cxx +++ b/cppu/source/UnsafeBridge/UnsafeBridge.cxx @@ -118,12 +118,11 @@ void UnsafeBridge::v_leave(void) int UnsafeBridge::v_isValid(rtl::OUString * pReason) { - int result = 1; - - result = m_count > 0; + int result = m_count > 0; if (!result) + { *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("not entered")); - + } else { result = m_threadId == osl_getThreadIdentifier(NULL); diff --git a/crashrep/source/unx/main.cxx b/crashrep/source/unx/main.cxx index d70780ff4152..652593dd42f4 100644 --- a/crashrep/source/unx/main.cxx +++ b/crashrep/source/unx/main.cxx @@ -336,7 +336,7 @@ bool SendHTTPRequest( if ( pszProxyServer ) sprintf( buffer, - "POST http://%s:%d/soap/servlet/rpcrouter HTTP/1.0\r\n" + "POST http://%s:%u/soap/servlet/rpcrouter HTTP/1.0\r\n" "Content-Type: text/xml; charset=\"utf-8\"\r\n" "Content-Length: %d\r\n" "SOAPAction: \"\"\r\n\r\n", @@ -525,21 +525,19 @@ bool send_crash_report( const boost::unordered_map< string, string >& rSettings static bool append_file( const char *filename, string& rString ) { - char buf[1024]; - bool bSuccess = false; - FILE *fp = fopen( filename, "r" ); if ( fp ) { + char buf[1024]; while (fgets(buf, sizeof(buf), fp) != NULL) { rString.append( buf ); } fclose( fp ); - bSuccess = true; + return true; } - return bSuccess; + return false; } string crash_get_details( const boost::unordered_map< string, string >& rSettings ) |