summaryrefslogtreecommitdiff
path: root/src/socketengines/socketengine_select.cpp
diff options
context:
space:
mode:
authorAdam <Adam@anope.org>2013-01-22 21:20:05 -0500
committerAdam <Adam@anope.org>2013-01-22 21:20:05 -0500
commita634c7be65113c74736be0fb98f31b0c83ec2882 (patch)
tree6741e67e0aaee878964ddd56e16e40506411a272 /src/socketengines/socketengine_select.cpp
parentf656e3195f638336feea8f15cf9ae25298525adf (diff)
Fix some compile errors
Diffstat (limited to 'src/socketengines/socketengine_select.cpp')
-rw-r--r--src/socketengines/socketengine_select.cpp27
1 files changed, 12 insertions, 15 deletions
diff --git a/src/socketengines/socketengine_select.cpp b/src/socketengines/socketengine_select.cpp
index 4aa82529b..81c8d844e 100644
--- a/src/socketengines/socketengine_select.cpp
+++ b/src/socketengines/socketengine_select.cpp
@@ -40,25 +40,22 @@ void SocketEngine::Shutdown()
void SocketEngine::Change(Socket *s, bool set, SocketFlag flag)
{
- if (set == s->HasFlag(flag))
+ if (set == s->flags[flag])
return;
- bool before_registered = s->HasFlag(SF_READABLE) || s->HasFlag(SF_WRITABLE);
+ bool before_registered = s->flags[SF_READABLE] || s->flags[SF_WRITABLE];
- if (set)
- s->SetFlag(flag);
- else
- s->UnsetFlag(flag);
+ s->flags[flag] = set;
- bool now_registered = s->HasFlag(SF_READABLE) || s->HasFlag(SF_WRITABLE);
+ bool now_registered = s->flags[SF_READABLE] || s->flags[SF_WRITABLE];
if (!before_registered && now_registered)
{
if (s->GetFD() > MaxFD)
MaxFD = s->GetFD();
- if (s->HasFlag(SF_READABLE))
+ if (s->flags[SF_READABLE])
FD_SET(s->GetFD(), &ReadFDs);
- if (s->HasFlag(SF_WRITABLE))
+ if (s->flags[SF_WRITABLE])
FD_SET(s->GetFD(), &WriteFDs);
++FDCount;
}
@@ -72,12 +69,12 @@ void SocketEngine::Change(Socket *s, bool set, SocketFlag flag)
}
else if (before_registered && now_registered)
{
- if (s->HasFlag(SF_READABLE))
+ if (s->flags[SF_READABLE])
FD_SET(s->GetFD(), &ReadFDs);
else
FD_CLR(s->GetFD(), &ReadFDs);
- if (s->HasFlag(SF_WRITABLE))
+ if (s->flags[SF_WRITABLE])
FD_SET(s->GetFD(), &WriteFDs);
else
FD_CLR(s->GetFD(), &WriteFDs);
@@ -133,18 +130,18 @@ void SocketEngine::Process()
if (!s->Process())
{
- if (s->HasFlag(SF_DEAD))
+ if (s->flags[SF_DEAD])
delete s;
continue;
}
if (has_read && !s->ProcessRead())
- s->SetFlag(SF_DEAD);
+ s->flags[SF_DEAD] = true;
if (has_write && !s->ProcessWrite())
- s->SetFlag(SF_DEAD);
+ s->flags[SF_DEAD] = true;
- if (s->HasFlag(SF_DEAD))
+ if (s->flags[SF_DEAD])
delete s;
}
}