Kaydet (Commit) 8c3c491d authored tarafından Julien Nabet's avatar Julien Nabet

Some cppcheck cleaning

Change-Id: Iac1c26d031e8196ef93cb403dc60f07e0eef6380
üst a8fdb0ba
...@@ -410,7 +410,6 @@ Reference< ::com::sun::star::sdbc::XConnection> TestConnected ...@@ -410,7 +410,6 @@ Reference< ::com::sun::star::sdbc::XConnection> TestConnected
break; break;
default: default:
return pConnection; return pConnection;
break;
} }
pConnection = pConnection =
pDriver->connect(url,aValue); pDriver->connect(url,aValue);
......
...@@ -319,9 +319,7 @@ void AffineBridge::v_leave(void) ...@@ -319,9 +319,7 @@ void AffineBridge::v_leave(void)
int AffineBridge::v_isValid(rtl::OUString * pReason) int AffineBridge::v_isValid(rtl::OUString * pReason)
{ {
int result = 1; int result = m_enterCount > 0;
result = m_enterCount > 0;
if (!result) if (!result)
*pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("not entered")); *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("not entered"));
......
...@@ -109,12 +109,11 @@ void LogBridge::v_leave(void) ...@@ -109,12 +109,11 @@ void LogBridge::v_leave(void)
int LogBridge::v_isValid(rtl::OUString * pReason) int LogBridge::v_isValid(rtl::OUString * pReason)
{ {
int result = 1; int result = m_count > 0;
result = m_count > 0;
if (!result) if (!result)
{
*pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("not entered")); *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("not entered"));
}
else else
{ {
result = m_threadId == osl_getThreadIdentifier(NULL); result = m_threadId == osl_getThreadIdentifier(NULL);
......
...@@ -118,12 +118,11 @@ void UnsafeBridge::v_leave(void) ...@@ -118,12 +118,11 @@ void UnsafeBridge::v_leave(void)
int UnsafeBridge::v_isValid(rtl::OUString * pReason) int UnsafeBridge::v_isValid(rtl::OUString * pReason)
{ {
int result = 1; int result = m_count > 0;
result = m_count > 0;
if (!result) if (!result)
{
*pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("not entered")); *pReason = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("not entered"));
}
else else
{ {
result = m_threadId == osl_getThreadIdentifier(NULL); result = m_threadId == osl_getThreadIdentifier(NULL);
......
...@@ -336,7 +336,7 @@ bool SendHTTPRequest( ...@@ -336,7 +336,7 @@ bool SendHTTPRequest(
if ( pszProxyServer ) if ( pszProxyServer )
sprintf( buffer, 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-Type: text/xml; charset=\"utf-8\"\r\n"
"Content-Length: %d\r\n" "Content-Length: %d\r\n"
"SOAPAction: \"\"\r\n\r\n", "SOAPAction: \"\"\r\n\r\n",
...@@ -525,21 +525,19 @@ bool send_crash_report( const boost::unordered_map< string, string >& rSettings ...@@ -525,21 +525,19 @@ bool send_crash_report( const boost::unordered_map< string, string >& rSettings
static bool append_file( const char *filename, string& rString ) static bool append_file( const char *filename, string& rString )
{ {
char buf[1024];
bool bSuccess = false;
FILE *fp = fopen( filename, "r" ); FILE *fp = fopen( filename, "r" );
if ( fp ) if ( fp )
{ {
char buf[1024];
while (fgets(buf, sizeof(buf), fp) != NULL) while (fgets(buf, sizeof(buf), fp) != NULL)
{ {
rString.append( buf ); rString.append( buf );
} }
fclose( fp ); fclose( fp );
bSuccess = true; return true;
} }
return bSuccess; return false;
} }
string crash_get_details( const boost::unordered_map< string, string >& rSettings ) string crash_get_details( const boost::unordered_map< string, string >& rSettings )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment