Put braces around all calls to wxLogFunctions() inside an if statement.
This suppresses all the remaining g++ -Wparentheses warnings and uses consistent style everywhere. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -614,7 +614,9 @@ EventWorker::OnSocketEvent(wxSocketEvent& pEvent) {
|
||||
//wxLogMessage(wxT("EventWorker: got connection"));
|
||||
wxLogMessage(wxT("%s: starting writing message (2 bytes for signature and %d bytes of data to write)"),CreateIdent(m_localaddr).c_str(),m_outsize-2);
|
||||
if (!m_clientSocket->GetLocal(m_localaddr))
|
||||
{
|
||||
wxLogError(_("Cannot get peer data for socket %p"),m_clientSocket);
|
||||
}
|
||||
m_currentType = WorkerEvent::SENDING;
|
||||
wxLogDebug(wxT("%s: CONNECTING"),CreateIdent(m_localaddr).c_str());
|
||||
SendEvent(false);
|
||||
|
@@ -618,7 +618,9 @@ void MyFrame::OnTestURL(wxCommandEvent& WXUNUSED(event))
|
||||
// Get the data
|
||||
wxStringOutputStream sout;
|
||||
if ( data->Read(sout).GetLastError() != wxSTREAM_EOF )
|
||||
{
|
||||
wxLogError("Error reading the input stream.");
|
||||
}
|
||||
|
||||
wxLogMessage("Text retrieved from URL \"%s\" follows:\n%s",
|
||||
urlname, sout.GetString());
|
||||
|
@@ -220,10 +220,14 @@ MyFrame::MyFrame() : wxFrame((wxFrame *)NULL, wxID_ANY,
|
||||
|
||||
IPaddress addrReal;
|
||||
if ( !m_server->GetLocal(addrReal) )
|
||||
{
|
||||
wxLogMessage("ERROR: couldn't get the address we bound to");
|
||||
}
|
||||
else
|
||||
{
|
||||
wxLogMessage("Server listening at %s:%u",
|
||||
addrReal.IPAddress(), addrReal.Service());
|
||||
}
|
||||
|
||||
// Setup the event handler and subscribe to connection events
|
||||
m_server->SetEventHandler(*this, SERVER_ID);
|
||||
@@ -387,10 +391,14 @@ void MyFrame::OnServerEvent(wxSocketEvent& event)
|
||||
{
|
||||
IPaddress addr;
|
||||
if ( !sock->GetPeer(addr) )
|
||||
{
|
||||
wxLogMessage("New connection from unknown client accepted.");
|
||||
}
|
||||
else
|
||||
{
|
||||
wxLogMessage("New client connection from %s:%u accepted",
|
||||
addr.IPAddress(), addr.Service());
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
Reference in New Issue
Block a user