From dbee606c60c4d8d7c6e5cabd1241fc182ae6c4a3 Mon Sep 17 00:00:00 2001 From: LemonBoy Date: Sun, 3 Jan 2016 21:19:46 +0100 Subject: 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. --- src/core/ignore.c | 12 +++++++++++- src/core/ignore.h | 9 +++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) (limited to 'src/core') 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); -- cgit debian/1.2.3+git2.25.1-1-2-gaceb0