Remove a few unnecessary .c_str() calls

[user/henk/code/inspircd.git] / src / socketengines / socketengine_select.cpp

diff --git a/src/socketengines/socketengine_select.cpp b/src/socketengines/socketengine_select.cpp
index eba54a7cb27b1dd8e42dfa82faf8e6ffe225532e..f995b5472d66d1d4a83c985a6adafcb03c34ea7a 100644 (file)
--- a/src/socketengines/socketengine_select.cpp
+++ b/src/socketengines/socketengine_select.cpp
@@ -18,8 +18,6 @@
  */
 
 
-#include "inspircd_config.h"
-
 #include "inspircd.h"
 #include "socketengine.h"
 
@@ -86,7 +84,7 @@ bool SelectEngine::AddFd(EventHandler* eh, int event_mask)
 
        CurrentSetSize++;
 
-       ServerInstance->Logs->Log("SOCKET",DEBUG,"New file descriptor: %d", fd);
+       ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "New file descriptor: %d", fd);
        return true;
 }
 
@@ -106,7 +104,7 @@ void SelectEngine::DelFd(EventHandler* eh)
        if (fd == MaxFD)
                --MaxFD;
 
-       ServerInstance->Logs->Log("SOCKET",DEBUG,"Remove file descriptor: %d", fd);
+       ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Remove file descriptor: %d", fd);
 }
 
 void SelectEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask)
@@ -179,7 +177,9 @@ int SelectEngine::DispatchEvents()
                        if (has_write)
                        {
                                WriteEvents++;
-                               SetEventMask(ev, ev->GetEventMask() & ~(FD_WRITE_WILL_BLOCK | FD_WANT_SINGLE_WRITE));
+                               int newmask = (ev->GetEventMask() & ~(FD_WRITE_WILL_BLOCK | FD_WANT_SINGLE_WRITE));
+                               this->OnSetEvent(ev, ev->GetEventMask(), newmask);
+                               SetEventMask(ev, newmask);
                                ev->HandleEvent(EVENT_WRITE);
                        }
                }