From 1200d6285b1d64699c6fa2c8241e2ee40f52d2a3 Mon Sep 17 00:00:00 2001 From: w00t Date: Thu, 23 Oct 2008 21:39:00 +0000 Subject: Revert earlier time() -> SI->Time() diff for now, this causes problems with dns.cpp in mysterious ways.. seemingly a bad pointer there somehow..? git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10695 e03df62e-2008-0410-955e-edbf42e46eb7 --- include/bancache.h | 4 ++-- include/u_listmode.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/bancache.h b/include/bancache.h index 7771feb75..b6e037f79 100644 --- a/include/bancache.h +++ b/include/bancache.h @@ -45,7 +45,7 @@ class CoreExport BanCacheHit : public classbase this->Type = type; this->Reason = reason; this->IP = ip; - this->Expiry = ServerInstance->Time() + 86400; // a day. this might seem long, but entries will be removed as glines/etc expire. + this->Expiry = time(NULL) + 86400; // a day. this might seem long, but entries will be removed as glines/etc expire. } // overridden to allow custom time @@ -55,7 +55,7 @@ class CoreExport BanCacheHit : public classbase this->Type = type; this->Reason = reason; this->IP = ip; - this->Expiry = ServerInstance->Time() + seconds; + this->Expiry = time(NULL) + seconds; } }; diff --git a/include/u_listmode.h b/include/u_listmode.h index 6e654f64f..358ccbf83 100644 --- a/include/u_listmode.h +++ b/include/u_listmode.h @@ -16,10 +16,10 @@ /** Get the time as a string */ -inline std::string stringtime(InspIRCd* Instance) +inline std::string stringtime() { std::ostringstream TIME; - TIME << Instance->Time(); + TIME << time(NULL); return TIME.str(); } @@ -331,7 +331,7 @@ class ListModeBase : public ModeHandler ListItem e; e.mask = parameter; e.nick = servermode ? ServerInstance->Config->ServerName : source->nick; - e.time = stringtime(ServerInstance); + e.time = stringtime(); el->push_back(e); return MODEACTION_ALLOW; -- cgit v1.2.3