Style update: spaces around assignments

[libs/core.git] / source / poll.cpp

diff --git a/source/poll.cpp b/source/poll.cpp
index 659e2385ff5c5c3dadf0ffea2bde277e1bdfb711..49e48870a071f48f44c13ce5c4da67fa5f91a5e0 100644 (file)
--- a/source/poll.cpp
+++ b/source/poll.cpp
@@ -18,18 +18,18 @@ using namespace Msp::IO;
 
 inline int sys_poll_event(PollEvent event)
 {
-       int result=0;
+       int result = 0;
 
        if(event&~(P_INPUT|P_PRIO|P_OUTPUT))
                throw InvalidParameterValue("Invalid poll events");
 
 #ifndef WIN32
        if(event&P_INPUT)
-               result|=POLLIN;
+               result |= POLLIN;
        if(event&P_PRIO)
-               result|=POLLPRI;
+               result |= POLLPRI;
        if(event&P_OUTPUT)
-               result|=POLLOUT;
+               result |= POLLOUT;
 #endif
 
        return result;
@@ -37,20 +37,20 @@ inline int sys_poll_event(PollEvent event)
 
 inline PollEvent poll_event_from_sys(int event)
 {
-       PollEvent result=P_NONE;
+       PollEvent result = P_NONE;
 
 #ifdef WIN32
        // Stop the compiler from complaining about unused parameter
-       event=event;
+       event = event;
 #else
        if(event&POLLIN)
-               result=result|P_INPUT;
+               result = result|P_INPUT;
        if(event&POLLPRI)
-               result=result|P_PRIO;
+               result = result|P_PRIO;
        if(event&POLLOUT)
-               result=result|P_OUTPUT;
+               result = result|P_OUTPUT;
        if(event&POLLERR)
-               result=result|P_ERROR;
+               result = result|P_ERROR;
 #endif
 
        return result;
@@ -60,9 +60,9 @@ inline PollEvent do_poll(Base &obj, PollEvent pe, int timeout)
 {
 #ifdef WIN32
        if(timeout<0)
-               timeout=INFINITE;
+               timeout = INFINITE;
 
-       DWORD ret=WaitForSingleObject(obj.get_event_handle(), timeout);
+       DWORD ret = WaitForSingleObject(obj.get_event_handle(), timeout);
        if(ret==WAIT_OBJECT_0)
                return pe;
        else if(ret==WAIT_FAILED)
@@ -70,9 +70,9 @@ inline PollEvent do_poll(Base &obj, PollEvent pe, int timeout)
 
        return P_NONE;
 #else
-       pollfd pfd={obj.get_event_handle(), sys_poll_event(pe), 0};
+       pollfd pfd = {obj.get_event_handle(), sys_poll_event(pe), 0};
 
-       int ret=::poll(&pfd, 1, timeout);
+       int ret = ::poll(&pfd, 1, timeout);
        if(ret==-1)
        {
                if(errno==EINTR)
@@ -100,15 +100,15 @@ void Poller::set_object(Base &obj, PollEvent ev)
        if(ev)
                obj.get_event_handle();
 
-       SlotMap::iterator i=objects.find(&obj);
+       SlotMap::iterator i = objects.find(&obj);
        if(i!=objects.end())
        {
                if(ev)
-                       i->second.events=ev;
+                       i->second.events = ev;
                else
                        objects.erase(i);
 
-               pfd_dirty=true;
+               pfd_dirty = true;
        }
        else if(ev)
        {
@@ -118,7 +118,7 @@ void Poller::set_object(Base &obj, PollEvent ev)
 #endif
                objects.insert(SlotMap::value_type(&obj, Slot(&obj, ev)));
 
-               pfd_dirty=true;
+               pfd_dirty = true;
        }
 }
 
@@ -143,14 +143,14 @@ void Poller::rebuild_pfd()
 
        for(SlotMap::iterator i=objects.begin(); i!=objects.end(); ++i)
        {
-               p.fd=i->second.object->get_event_handle();
+               p.fd = i->second.object->get_event_handle();
 #ifndef WIN32
-               p.events=sys_poll_event(i->second.events);
+               p.events = sys_poll_event(i->second.events);
 #endif
                pfd.push_back(p);
        }
 
-       pfd_dirty=false;
+       pfd_dirty = false;
 }
 
 int Poller::do_poll(int timeout)
@@ -162,12 +162,12 @@ int Poller::do_poll(int timeout)
 
 #ifdef WIN32
        if(timeout<0)
-               timeout=INFINITE;
+               timeout = INFINITE;
 
-       DWORD ret=WaitForMultipleObjects(pfd.size(), &pfd.front().fd, false, timeout);
+       DWORD ret = WaitForMultipleObjects(pfd.size(), &pfd.front().fd, false, timeout);
        if(/*ret>=WAIT_OBJECT_0 &&*/ ret<WAIT_OBJECT_0+pfd.size())
        {
-               SlotMap::iterator i=objects.begin();
+               SlotMap::iterator i = objects.begin();
                advance(i, ret-WAIT_OBJECT_0);
                poll_result.push_back(Slot(i->second.object, i->second.events));
 
@@ -178,7 +178,7 @@ int Poller::do_poll(int timeout)
 
        return 0;
 #else
-       int ret=::poll(&pfd.front(), pfd.size(), timeout);
+       int ret = ::poll(&pfd.front(), pfd.size(), timeout);
        if(ret==-1)
        {
                if(errno==EINTR)
@@ -187,8 +187,8 @@ int Poller::do_poll(int timeout)
                        throw SystemError("Poll failed", errno);
        }
 
-       int n=ret;
-       SlotMap::iterator j=objects.begin();
+       int n = ret;
+       SlotMap::iterator j = objects.begin();
        for(std::vector<pollfd>::iterator i=pfd.begin(); (i!=pfd.end() && n>0); ++i,++j)
                if(i->revents)
                {