aboutsummaryrefslogtreecommitdiff
path: root/lib/base/ebase.cpp
diff options
context:
space:
mode:
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>2006-12-12 19:58:22 +0000
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>2006-12-12 19:58:22 +0000
commit1394bbf36f7e0cc591f1a31b7d5db4e8f0f2c0c6 (patch)
tree1f154c469d766be1f62c78e96e4486f51bd2e312 /lib/base/ebase.cpp
parent93236223dac3af2ee2b4b40b07d4128bff8ea653 (diff)
downloadenigma2-1394bbf36f7e0cc591f1a31b7d5db4e8f0f2c0c6.tar.gz
enigma2-1394bbf36f7e0cc591f1a31b7d5db4e8f0f2c0c6.zip
nicer code
Diffstat (limited to 'lib/base/ebase.cpp')
-rw-r--r--lib/base/ebase.cpp17
1 files changed, 7 insertions, 10 deletions
diff --git a/lib/base/ebase.cpp b/lib/base/ebase.cpp
index e5168096..75307e85 100644
--- a/lib/base/ebase.cpp
+++ b/lib/base/ebase.cpp
@@ -124,16 +124,13 @@ void eMainloop::addSocketNotifier(eSocketNotifier *sn)
void eMainloop::removeSocketNotifier(eSocketNotifier *sn)
{
- for (std::map<int,eSocketNotifier*>::iterator i = notifiers.find(sn->getFD());
- i != notifiers.end();
- ++i)
- if (i->second == sn)
- return notifiers.erase(i);
- for (std::map<int,eSocketNotifier*>::iterator i = new_notifiers.find(sn->getFD());
- i != new_notifiers.end();
- ++i)
- if (i->second == sn)
- return new_notifiers.erase(i);
+ int fd = sn->getFD();
+ std::map<int,eSocketNotifier*>::iterator i(notifiers.find(fd));
+ if (i != notifiers.end())
+ return notifiers.erase(i);
+ i = new_notifiers.find(fd);
+ if (i != new_notifiers.end())
+ return new_notifiers.erase(i);
eFatal("removed socket notifier which is not present");
}