X-line expiries: use the new DurationString() function.

diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp
index daffdf7d96aa2b4b981b5e00ef6361324fa39bfb..dbf621932f07560546c1c47376cf8985b7a78760 100644 (file)
--- a/src/modules/m_svshold.cpp
+++ b/src/modules/m_svshold.cpp
@@ -58,8 +58,8 @@ public:
        {
                if (!silent)
                {
-                       ServerInstance->SNO->WriteToSnoMask('x', "Removing expired SVSHOLD %s (set by %s %ld seconds ago): %s",
-                               nickname.c_str(), source.c_str(), (long)(ServerInstance->Time() - set_time), reason.c_str());
+                       ServerInstance->SNO->WriteToSnoMask('x', "Removing expired SVSHOLD %s (set by %s %s ago): %s",
+                               nickname.c_str(), source.c_str(), InspIRCd::DurationString(ServerInstance->Time() - set_time).c_str(), reason.c_str());
                }
        }
 

diff --git a/src/xline.cpp b/src/xline.cpp
index ccdc58dc235cec6021998872fd50aa458916de70..c5b95208736c428562dcd4de88938e0e2011a049 100644 (file)
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -682,8 +682,8 @@ void ELine::OnAdd()
 void XLine::DisplayExpiry()
 {
        bool onechar = (type.length() == 1);
-       ServerInstance->SNO->WriteToSnoMask('x', "Removing expired %s%s %s (set by %s %ld seconds ago): %s",
-               type.c_str(), (onechar ? "-line" : ""), Displayable().c_str(), source.c_str(), (long)(ServerInstance->Time() - set_time), reason.c_str());
+       ServerInstance->SNO->WriteToSnoMask('x', "Removing expired %s%s %s (set by %s %s ago): %s",
+               type.c_str(), (onechar ? "-line" : ""), Displayable().c_str(), source.c_str(), InspIRCd::DurationString(ServerInstance->Time() - set_time).c_str(), reason.c_str());
 }
 
 const std::string& ELine::Displayable()