diff options
| author | drstein drstein@31f1291d-b8d6-0310-a050-a5561fc1590b <drstein drstein@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864> | 2007-08-31 17:34:42 +0000 |
|---|---|---|
| committer | drstein drstein@31f1291d-b8d6-0310-a050-a5561fc1590b <drstein drstein@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864> | 2007-08-31 17:34:42 +0000 |
| commit | 6e4767644e5cef9ecbfaadfcc1860002072c38c5 (patch) | |
| tree | f3e90654ee9b72cacc75d6bfb980f25f2ae64fac /src/core | |
| parent | fb8c78607c5687596708f34d5f16fe539c323c2c (diff) | |
BUILD : 1.7.19 (1292) BUGS : 776 NOTES : Fixed wrong reply when deleting entries by number (akick, badwords)
git-svn-id: svn://svn.anope.org/anope/trunk@1292 31f1291d-b8d6-0310-a050-a5561fc1590b
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1010 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/bs_badwords.c | 4 | ||||
| -rw-r--r-- | src/core/cs_akick.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/core/bs_badwords.c b/src/core/bs_badwords.c index 3a0828db4..acdc9ad4b 100644 --- a/src/core/bs_badwords.c +++ b/src/core/bs_badwords.c @@ -279,9 +279,11 @@ int badwords_del_callback(User * u, int num, va_list args) BadWord *bw; ChannelInfo *ci = va_arg(args, ChannelInfo *); int *last = va_arg(args, int *); + + *last = num; + if (num < 1 || num > ci->bwcount) return 0; - *last = num; bw = &ci->badwords[num - 1]; if (bw->word) diff --git a/src/core/cs_akick.c b/src/core/cs_akick.c index 773388b8a..4108f58e3 100644 --- a/src/core/cs_akick.c +++ b/src/core/cs_akick.c @@ -94,9 +94,12 @@ int akick_del_callback(User * u, int num, va_list args) { ChannelInfo *ci = va_arg(args, ChannelInfo *); int *last = va_arg(args, int *); + + *last = num; + if (num < 1 || num > ci->akickcount) return 0; - *last = num; + return akick_del(u, &ci->akick[num - 1]); } |