Delete the correct entries from akick and badwords list when given a numlist

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2657 5417fbe8-f217-4b02-8779-1006273d7864

2 files changed, 10 insertions, 2 deletions

diff --git a/include/regchannel.h b/include/regchannel.h
index 7ce3151a6..eda83a1b7 100644
--- a/include/regchannel.h
+++ b/include/regchannel.h
@@ -208,6 +208,10 @@ class CoreExport ChannelInfo : public Extensible, public Flags<ChannelInfoFlag>
 	 */
 	void ClearAkick();
 
+	/** Clean all of the nonused entries from the akick list
+	 */
+	void CleanAkick();
+
 	/** Add a badword to the badword list
 	 * @param word The badword
 	 * @param type The type (SINGLE START END)
@@ -235,6 +239,10 @@ class CoreExport ChannelInfo : public Extensible, public Flags<ChannelInfoFlag>
 	 */
 	void ClearBadWords();
 
+	/** Clean all of the nonused entries from the badwords list
+	 */
+	void CleanBadWords();
+
 	/** Check if a mode is mlocked
 	 * @param Name The mode
 	 * @param status True to check mlock on, false for mlock off
diff --git a/include/services.h b/include/services.h
index 110da397b..5a8e84ee0 100644
--- a/include/services.h
+++ b/include/services.h
@@ -707,8 +707,6 @@ struct ChanAccess
  */
 enum AutoKickFlag
 {
-	/* This auto kick entry is in use */
-	AK_USED,
 	/* Is by nick core, not mask */
 	AK_ISNICK,
 	/* This entry is stuck */
@@ -719,6 +717,7 @@ enum AutoKickFlag
 class AutoKick : public Flags<AutoKickFlag>
 {
  public:
+ 	bool InUse;
 	/* Only one of these can be in use */
 	std::string mask;
 	NickCore *nc;
@@ -745,6 +744,7 @@ enum BadWordType
 /* Structure used to contain bad words. */
 struct BadWord
 {
+	bool InUse;
 	std::string word;
 	BadWordType type;
 };