diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2014-07-10 12:17:55 +0200 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2014-07-10 12:17:55 +0200 |
| commit | acccaa39641500b8a691db4136e6571102a438ed (patch) | |
| tree | 5faed16f0fc7ac11566d6df19561abd3c3ad8c43 /include | |
| parent | 8186e0b091a4f487448dcfab7144217a85870d4c (diff) | |
Remove current time parameter of the Timer constructor
Diffstat (limited to 'include')
| -rw-r--r-- | include/inspsocket.h | 2 | ||||
| -rw-r--r-- | include/modules/dns.h | 2 | ||||
| -rw-r--r-- | include/timer.h | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/include/inspsocket.h b/include/inspsocket.h index 720489b77..1bcfbea09 100644 --- a/include/inspsocket.h +++ b/include/inspsocket.h @@ -90,7 +90,7 @@ class CoreExport SocketTimeout : public Timer * @param secs_from_now Seconds from now to time out * @param now The current time */ - SocketTimeout(int fd, BufferedSocket* thesock, long secs_from_now, time_t now) : Timer(secs_from_now, now), sock(thesock), sfd(fd) { } + SocketTimeout(int fd, BufferedSocket* thesock, long secs_from_now) : Timer(secs_from_now), sock(thesock), sfd(fd) { } /** Handle tick event */ diff --git a/include/modules/dns.h b/include/modules/dns.h index c76c53805..400d2085d 100644 --- a/include/modules/dns.h +++ b/include/modules/dns.h @@ -152,7 +152,7 @@ namespace DNS Module* const creator; Request(Manager* mgr, Module* mod, const std::string& addr, QueryType qt, bool usecache = true) - : Timer((ServerInstance->Config->dns_timeout ? ServerInstance->Config->dns_timeout : 5), ServerInstance->Time()) + : Timer((ServerInstance->Config->dns_timeout ? ServerInstance->Config->dns_timeout : 5)) , Question(addr, qt) , manager(mgr) , use_cache(usecache) diff --git a/include/timer.h b/include/timer.h index 1787da7ba..2ac0517b8 100644 --- a/include/timer.h +++ b/include/timer.h @@ -50,10 +50,9 @@ class CoreExport Timer public: /** Default constructor, initializes the triggering time * @param secs_from_now The number of seconds from now to trigger the timer - * @param now The time now * @param repeating Repeat this timer every secs_from_now seconds if set to true */ - Timer(unsigned int secs_from_now, time_t now, bool repeating = false); + Timer(unsigned int secs_from_now, bool repeating = false); /** Default destructor, removes the timer from the timer manager */ |