ModResult conversion: Change return type of all module functions

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11634 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 3 insertions, 18 deletions

diff --git a/include/channels.h b/include/channels.h
index e471e30cb..82bf50853 100644
--- a/include/channels.h
+++ b/include/channels.h
@@ -29,6 +29,7 @@ enum ChannelModes {
 
 /* Forward declarations - needed */
 class User;
+struct ModResult;
 
 /** Holds an entry for a ban list, exemption list, or invite list.
  * This class contains a single element in a channel list, such as a banlist.
@@ -530,14 +531,12 @@ class CoreExport Channel : public Extensible
 	 * a given user for this channel.
 	 * @param u The user to match bans against
 	 * @param type The type of extban to check
-	 * @returns 1 = exempt, 0 = no match, -1 = banned
 	 */
-	int GetExtBanStatus(User *u, char type);
+	ModResult GetExtBanStatus(User *u, char type);
 
 	/** Overloaded version to check whether a particular string is extbanned
-	 * @returns 1 = exempt, 0 = no match, -1 = banned
 	 */
-	int GetExtBanStatus(const std::string &str, char type);
+	ModResult GetExtBanStatus(const std::string &str, char type);
 
 	/** Clears the cached max bans value
 	 */
@@ -548,18 +547,4 @@ class CoreExport Channel : public Extensible
 	virtual ~Channel() { /* stub */ }
 };
 
-static inline int banmatch_reduce(int v1, int v2)
-{
-	int a1 = abs(v1);
-	int a2 = abs(v2);
-	if (a1 > a2)
-		return v1;
-	else if (a2 > a1)
-		return v2;
-	else if (v1 > v2)
-		return v1;
-	// otherwise v2 > v1 or equal
-	return v2;
-}
-
 #endif