From ba204fe0fa8c522c5a99413dc9141bdee2eb2867 Mon Sep 17 00:00:00 2001 From: michael Date: Sun, 19 Jul 2015 12:00:15 +0000 Subject: [PATCH] - scan.c, scan.h: removed prototype for scan_checkexempt() and declared it as static git-svn-id: svn://svn.ircd-hybrid.org/svnroot/hopm/branches/1.1.x@6299 82007160-df01-0410-b94d-b575c5fd34c7 --- src/scan.c | 54 +++++++++++++++++++++++++++--------------------------- src/scan.h | 1 - 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/src/scan.c b/src/scan.c index c769f07..bd7d13a 100644 --- a/src/scan.c +++ b/src/scan.c @@ -162,6 +162,33 @@ scan_gettype(int protocol) return undef; } +/* scan_checkexempt + * + * Check mask against exempt list. + * + * Parameters: + * mask: Mask to check + * + * Return: + * 1 if mask is in list + * 0 if mask is not in list + */ +static int +scan_checkexempt(const char *mask, const char *ipmask) +{ + node_t *node; + + LIST_FOREACH(node, ExemptItem->masks->head) + { + const char *exempt_mask = node->data; + + if (!match(exempt_mask, mask) || !match(exempt_mask, ipmask)) + return 1; + } + + return 0; +} + /* scan_init Initialize scanner and masks list based on configuration. @@ -938,33 +965,6 @@ scan_manual(char *param, const struct ChannelConf *target) } } -/* scan_checkexempt - * - * Check mask against exempt list. - * - * Parameters: - * mask: Mask to check - * - * Return: - * 1 if mask is in list - * 0 if mask is not in list - */ -int -scan_checkexempt(const char *mask, const char *ipmask) -{ - node_t *node; - - LIST_FOREACH(node, ExemptItem->masks->head) - { - const char *exempt_mask = node->data; - - if (!match(exempt_mask, mask) || !match(exempt_mask, ipmask)) - return 1; - } - - return 0; -} - /* scan_log * * Log the fact that a given ip/port/protocol has just been scanned, if the diff --git a/src/scan.h b/src/scan.h index e43ef37..26f9c6d 100644 --- a/src/scan.h +++ b/src/scan.h @@ -58,7 +58,6 @@ extern void scan_cycle(void); extern void scan_connect(const char *[], const char *); extern void scan_checkfinished(struct scan_struct *); extern void scan_manual(char *, const struct ChannelConf *); -extern int scan_checkexempt(const char *, const char *); extern void scan_timer(void); extern void scan_positive(struct scan_struct *, const char *, const char *); #endif /* SCAN_H */ -- 2.30.2