6 files changed, 5 insertions, 62 deletions
diff --git a/include/xline.h b/include/xline.h
index 2a49d8b80..4094e05df 100644
--- a/include/xline.h
+++ b/include/xline.h
@@ -101,7 +101,7 @@ class CoreExport XLine : public classbase
 	 * line. Usually a line in the form 'expiring Xline blah, set by...'
 	 * see the DisplayExpiry methods of GLine, ELine etc.
 	 */
-	virtual void DisplayExpiry() = 0;
+	virtual void DisplayExpiry();
 
 	/** Returns the displayable form of the pattern for this xline,
 	 * e.g. '*\@foo' or '*baz*'. This must always return the full pattern
@@ -177,8 +177,6 @@ class CoreExport KLine : public XLine
 
 	virtual void Apply(User* u);
 
-	virtual void DisplayExpiry();
-
 	virtual const char* Displayable();
 
 	virtual bool IsBurstable();
@@ -225,8 +223,6 @@ class CoreExport GLine : public XLine
 
 	virtual void Apply(User* u);
 
-	virtual void DisplayExpiry();
-
 	virtual const char* Displayable();
 
 	/** Ident mask (ident part only)
@@ -269,8 +265,6 @@ class CoreExport ELine : public XLine
 
 	virtual void Unset();
 
-	virtual void DisplayExpiry();
-
 	virtual void OnAdd();
 
 	virtual const char* Displayable();
@@ -314,8 +308,6 @@ class CoreExport ZLine : public XLine
 
 	virtual void Apply(User* u);
 
-	virtual void DisplayExpiry();
-
 	virtual const char* Displayable();
 
 	/** IP mask (no ident part)
@@ -351,8 +343,6 @@ class CoreExport QLine : public XLine
 
 	virtual void Apply(User* u);
 
-	virtual void DisplayExpiry();
-
 	virtual const char* Displayable();
 
 	/** Nickname mask
diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index 69eb82e51..1ecb7f9d4 100644
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -51,12 +51,6 @@ public:
 		return false;
 	}
 
-	void DisplayExpiry()
-	{
-		ServerInstance->SNO->WriteToSnoMask('x',"Removing expired CBan %s (set by %s %ld seconds ago)",
-			this->matchtext.c_str(), this->source.c_str(), (long int)(ServerInstance->Time() - this->set_time));
-	}
-
 	const char* Displayable()
 	{
 		return matchtext.c_str();
diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp
index 9e8539b61..2e94df042 100644
--- a/src/modules/m_rline.cpp
+++ b/src/modules/m_rline.cpp
@@ -92,12 +92,6 @@ class RLine : public XLine
 		DefaultApply(u, "R", false);
 	}
 
-	void DisplayExpiry()
-	{
-		ServerInstance->SNO->WriteToSnoMask('x',"Removing expired R-line %s (set by %s %ld seconds ago)",
-			this->matchtext.c_str(), this->source.c_str(), (long int)(ServerInstance->Time() - this->set_time));
-	}
-
 	const char* Displayable()
 	{
 		return matchtext.c_str();
diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index bf31cd70e..0638cb92d 100644
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -56,12 +56,6 @@ public:
 		return false;
 	}
 
-	void DisplayExpiry()
-	{
-		ServerInstance->SNO->WriteToSnoMask('x',"Removing expired shun %s (set by %s %ld seconds ago)",
-			this->matchtext.c_str(), this->source.c_str(), (long int)(ServerInstance->Time() - this->set_time));
-	}
-
 	const char* Displayable()
 	{
 		return matchtext.c_str();
diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp
index 93fb8a12f..05a8d09b1 100644
--- a/src/modules/m_svshold.cpp
+++ b/src/modules/m_svshold.cpp
@@ -52,12 +52,6 @@ public:
 		return false;
 	}
 
-	void DisplayExpiry()
-	{
-		ServerInstance->SNO->WriteToSnoMask('x',"Removing expired SVSHOLD %s (set by %s %ld seconds ago)",
-			this->nickname.c_str(), this->source.c_str(), (long int)(ServerInstance->Time() - this->set_time));
-	}
-
 	const char* Displayable()
 	{
 		return nickname.c_str();
diff --git a/src/xline.cpp b/src/xline.cpp
index 1f192e22a..53cbe5c96 100644
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -691,34 +691,11 @@ void ELine::OnAdd()
 	}
 }
 
-void ELine::DisplayExpiry()
+void XLine::DisplayExpiry()
 {
-	ServerInstance->SNO->WriteToSnoMask('x',"Removing expired E-Line %s@%s (set by %s %ld seconds ago)",
-		identmask.c_str(),hostmask.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time));
-}
-
-void QLine::DisplayExpiry()
-{
-	ServerInstance->SNO->WriteToSnoMask('x',"Removing expired Q-Line %s (set by %s %ld seconds ago)",
-		nick.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time));
-}
-
-void ZLine::DisplayExpiry()
-{
-	ServerInstance->SNO->WriteToSnoMask('x',"Removing expired Z-Line %s (set by %s %ld seconds ago)",
-		ipaddr.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time));
-}
-
-void KLine::DisplayExpiry()
-{
-	ServerInstance->SNO->WriteToSnoMask('x',"Removing expired K-Line %s@%s (set by %s %ld seconds ago)",
-		identmask.c_str(),hostmask.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time));
-}
-
-void GLine::DisplayExpiry()
-{
-	ServerInstance->SNO->WriteToSnoMask('x',"Removing expired G-Line %s@%s (set by %s %ld seconds ago)",
-		identmask.c_str(),hostmask.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time));
+	bool onechar = (type.length() == 1);
+	ServerInstance->SNO->WriteToSnoMask('x', "Removing expired %s%s %s (set by %s %ld seconds ago)",
+		type.c_str(), (onechar ? "-Line" : ""), Displayable(), source.c_str(), (long)(ServerInstance->Time() - set_time));
 }
 
 const char* ELine::Displayable()