Fix for Jason's bug.. this needs more thought, though. I'll probably whip up somethin...

[user/henk/code/inspircd.git] / include / wildcard.h

diff --git a/include/wildcard.h b/include/wildcard.h
index dc2790b54428cf65c5bdbee3743a38c7a5b2e965..8c99b8dcaf5abbf1eaff12ef621657411f530189 100644 (file)
--- a/include/wildcard.h
+++ b/include/wildcard.h
@@ -11,28 +11,26 @@
  * ---------------------------------------------------
  */
 
-#include "inspircd_config.h"
-
 /** Match a string against a mask.
  * @param str The string to check
  * @param mask the mask to check against
  * @return true if the strings match
  */
-CoreExport bool match(const char *str, const char *mask);
+CoreExport bool match(const std::string &str, const std::string &mask);
 /** Match a string against a mask, and define wether or not to use CIDR rules
  * @param str The string to check
  * @param mask the mask to check against
  * @param use_cidr_match True if CIDR matching rules should be applied first
  * @return true if the strings match
  */
-CoreExport bool match(const char *str, const char *mask, bool use_cidr_match);
+CoreExport bool match(const std::string &str, const std::string &mask, bool use_cidr_match);
 /** Match a string against a mask, defining wether case sensitivity applies.
  * @param str The string to check
  * @param mask the mask to check against
  * @param case_sensitive True if the match is case sensitive
  * @return True if the strings match
  */
-CoreExport bool match(bool case_sensitive, const char *str, const char *mask);
+CoreExport bool match(bool case_sensitive, const std::string &str, const std::string &mask);
 /** Match a string against a mask, defining wether case sensitivity applies,
  * and defining wether or not to use CIDR rules first.
  * @param case_sensitive True if the match is case sensitive
@@ -41,5 +39,5 @@ CoreExport bool match(bool case_sensitive, const char *str, const char *mask);
  * @param use_cidr_match True if CIDR matching rules should be applied first
  * @return true if the strings match
  */
-CoreExport bool match(bool case_sensitive, const char *str, const char *mask, bool use_cidr_match);
+CoreExport bool match(bool case_sensitive, const std::string &str, const std::string &mask, bool use_cidr_match);