summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2008-10-23 21:39:00 +0000
committerw00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>2008-10-23 21:39:00 +0000
commit1200d6285b1d64699c6fa2c8241e2ee40f52d2a3 (patch)
tree997983815c2f0ab3a1d434ebc5851a3b8568f843 /include
parentb928aff22f8f9a458df9aa73a0c6b22b979101bc (diff)
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
Diffstat (limited to 'include')
-rw-r--r--include/bancache.h4
-rw-r--r--include/u_listmode.h6
2 files changed, 5 insertions, 5 deletions
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;