Don't break the API.

Have a ignore_find_full method that is the one that all the new code
should be using and provide some working stubs for ignore_find and
ignore_find_noact.

4 files changed, 22 insertions, 7 deletions

diff --git a/src/core/ignore.c b/src/core/ignore.c
index ee9e180d..8d5a27c2 100644
--- a/src/core/ignore.c
+++ b/src/core/ignore.c
@@ -186,7 +186,7 @@ int ignore_check(SERVER_REC *server, const char *nick, const char *host,
         return ignore_check_replies(chanrec, text, level);
 }
 
-IGNORE_REC *ignore_find(const char *servertag, const char *mask, const char *pattern,
+IGNORE_REC *ignore_find_full(const char *servertag, const char *mask, const char *pattern,
 		char **channels, const int flags)
 {
 	GSList *tmp;
@@ -257,6 +257,16 @@ IGNORE_REC *ignore_find(const char *servertag, const char *mask, const char *pat
 	return NULL;
 }
 
+IGNORE_REC *ignore_find(const char *servertag, const char *mask, char **channels)
+{
+	return ignore_find_full(servertag, mask, NULL, channels, 0);
+}
+
+IGNORE_REC *ignore_find_noact(const char *servertag, const char *mask, char **channels, int noact)
+{
+	return ignore_find_full(servertag, mask, NULL, channels, IGNORE_FIND_NOACT);
+}
+
 static void ignore_set_config(IGNORE_REC *rec)
 {
 	CONFIG_NODE *node;
diff --git a/src/core/ignore.h b/src/core/ignore.h
index 0901e795..f889740f 100644
--- a/src/core/ignore.h
+++ b/src/core/ignore.h
@@ -36,8 +36,13 @@ enum {
 	IGNORE_FIND_NOACT   = 0x02, // Exclude the targets with NOACT level
 };
 
-IGNORE_REC *ignore_find(const char *servertag, const char *mask, const char *pattern,
-		char **channels, const int flags);
+IGNORE_REC *ignore_find_full (const char *servertag, const char *mask, const char *pattern,
+                char **channels, const int flags);
+
+// Convenience wrappers around ignore_find_full, for compatibility purpose
+
+IGNORE_REC *ignore_find(const char *servertag, const char *mask, char **channels);
+IGNORE_REC *ignore_find_noact(const char *servertag, const char *mask, char **channels, int noact);
 
 void ignore_add_rec(IGNORE_REC *rec);
 void ignore_update_rec(IGNORE_REC *rec);
diff --git a/src/fe-common/core/fe-ignore.c b/src/fe-common/core/fe-ignore.c
index 2799e15f..a809ac91 100644
--- a/src/fe-common/core/fe-ignore.c
+++ b/src/fe-common/core/fe-ignore.c
@@ -158,7 +158,7 @@ static void cmd_ignore(const char *data)
 	channels = (chanarg == NULL || *chanarg == '\0') ? NULL :
 		g_strsplit(chanarg, ",", -1);
 
-	rec = ignore_find(servertag, mask, patternarg, channels,
+	rec = ignore_find_full(servertag, mask, patternarg, channels,
 			  IGNORE_FIND_PATTERN | ((level & MSGLEVEL_NO_ACT) ? IGNORE_FIND_NOACT : 0));
 	new_ignore = rec == NULL;
 
@@ -237,9 +237,9 @@ static void cmd_unignore(const char *data)
 			chans[0] = mask;
 			mask = NULL;
 		}
-		rec = ignore_find("*", mask, NULL, (char **) chans, 0);
+		rec = ignore_find_full("*", mask, NULL, (char **) chans, 0);
 		if (rec == NULL) {
-			rec = ignore_find("*", mask, NULL, (char **) chans, IGNORE_FIND_NOACT);
+			rec = ignore_find_full("*", mask, NULL, (char **) chans, IGNORE_FIND_NOACT);
 		}
 	}
 
diff --git a/src/irc/flood/autoignore.c b/src/irc/flood/autoignore.c
index 4708cb03..86ff3ec5 100644
--- a/src/irc/flood/autoignore.c
+++ b/src/irc/flood/autoignore.c
@@ -66,7 +66,7 @@ static void sig_flood(IRC_SERVER_REC *server, const char *nick, const char *host
 
         mask = g_strdup_printf("%s!%s", nick, host);
 	if (level & check_level) {
-		rec = ignore_find(server->tag, mask, NULL, NULL, 0);
+		rec = ignore_find_full(server->tag, mask, NULL, NULL, 0);
 		if (rec == NULL)
 			autoignore_add(server, mask, level);
 		else