diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/actions.c | 14 | ||||
| -rw-r--r-- | src/channels.c | 30 | ||||
| -rw-r--r-- | src/slist.c | 26 | ||||
| -rw-r--r-- | src/users.c | 7 |
4 files changed, 39 insertions, 38 deletions
diff --git a/src/actions.c b/src/actions.c index c9ca020a0..50ff90981 100644 --- a/src/actions.c +++ b/src/actions.c @@ -168,14 +168,14 @@ void common_unban(ChannelInfo * ci, char *nick) for the function. but won't prevent thus from clearing out the bans against an IP address since the first would fail and the second would match - TSL - */ + */ if (!matchfound) { - if (match_userip(bans[i], u, host)) { - anope_cmd_mode(whosends(ci), ci->name, "-b %s", - bans[i]); - av[2] = bans[i]; - do_cmode(whosends(ci), 3, av); - } + if (match_userip(bans[i], u, host)) { + anope_cmd_mode(whosends(ci), ci->name, "-b %s", + bans[i]); + av[2] = bans[i]; + do_cmode(whosends(ci), 3, av); + } } } matchfound = 0; diff --git a/src/channels.c b/src/channels.c index b3b5e2b4e..dacf98895 100644 --- a/src/channels.c +++ b/src/channels.c @@ -551,9 +551,11 @@ void do_join(const char *source, int ac, char **av) while (c) { nextc = c->next; channame = sstrdup(c->chan->name); - send_event(EVENT_PART_CHANNEL, 3, EVENT_START, user->nick, channame); + send_event(EVENT_PART_CHANNEL, 3, EVENT_START, user->nick, + channame); chan_deluser(user, c->chan); - send_event(EVENT_PART_CHANNEL, 3, EVENT_STOP, user->nick, channame); + send_event(EVENT_PART_CHANNEL, 3, EVENT_STOP, user->nick, + channame); free(channame); free(c); c = nextc; @@ -1111,19 +1113,19 @@ void do_cmode(const char *source, int ac, char **av) if (UseTS6 && ircd->ts6) { if (*av[0] == '#' || *av[0] == '&') { - if (debug) { - alog("debug: Before TS6 swap: do_cmode() chan %s : mode %s : extra %s", av[1], av[2], av[3]); - } - av[0] = (ac >= 2 ? sstrdup(av[1]) : NULL); - av[1] = (ac >= 3 ? sstrdup(av[2]) : NULL); - av[2] = (ac >= 4 ? sstrdup(av[3]) : NULL); - if (debug) { - alog("debug: After TS swap: do_cmode() chan %s : mode %s : extra %s", av[0], av[1], av[2]); - } + if (debug) { + alog("debug: Before TS6 swap: do_cmode() chan %s : mode %s : extra %s", av[1], av[2], av[3]); + } + av[0] = (ac >= 2 ? sstrdup(av[1]) : NULL); + av[1] = (ac >= 3 ? sstrdup(av[2]) : NULL); + av[2] = (ac >= 4 ? sstrdup(av[3]) : NULL); + if (debug) { + alog("debug: After TS swap: do_cmode() chan %s : mode %s : extra %s", av[0], av[1], av[2]); + } } else { - if (debug) { - alog("debug: TS swap not needed: do_cmode() chan %s : mode %s : extra %s", av[0], av[1], av[2]); - } + if (debug) { + alog("debug: TS swap not needed: do_cmode() chan %s : mode %s : extra %s", av[0], av[1], av[2]); + } } } diff --git a/src/slist.c b/src/slist.c index a154cc47e..0db856717 100644 --- a/src/slist.c +++ b/src/slist.c @@ -153,21 +153,21 @@ int slist_delete_range(SList * slist, char *range, slist_delcheckcb_t cb, if (!slist->list[i - 1]) continue; - /* copy this off the stack for safety's sake --nenolod */ - VA_COPY(preserve, args); + /* copy this off the stack for safety's sake --nenolod */ + VA_COPY(preserve, args); if (cb && !cb(slist, slist->list[i - 1], preserve)) { - va_end(preserve); + va_end(preserve); return -1; - } + } - /* if it's to be freed, lets free it */ + /* if it's to be freed, lets free it */ if (slist->opts && slist->opts->freeitem) slist->opts->freeitem(slist, slist->list[i - 1]); slist->list[i - 1] = NULL; - /* and release the copied list */ - va_end(preserve); + /* and release the copied list */ + va_end(preserve); count++; } @@ -215,14 +215,14 @@ int slist_enum(SList * slist, char *range, slist_enumcb_t cb, ...) continue; } - /* copy off stack for safety */ - VA_COPY(preserve, args); + /* copy off stack for safety */ + VA_COPY(preserve, args); res = cb(slist, i + 1, slist->list[i], preserve); if (res < 0) { - va_end(preserve); + va_end(preserve); break; - } + } /* and release our copy */ va_end(preserve); @@ -250,8 +250,8 @@ int slist_enum(SList * slist, char *range, slist_enumcb_t cb, ...) continue; } - /* copy off stack for safety */ - VA_COPY(preserve, args); + /* copy off stack for safety */ + VA_COPY(preserve, args); res = cb(slist, i, slist->list[i - 1], preserve); if (res < 0) { diff --git a/src/users.c b/src/users.c index 5d1583b25..228a3fec1 100644 --- a/src/users.c +++ b/src/users.c @@ -656,10 +656,9 @@ User *do_nick(const char *source, char *nick, char *username, char *host, /* An old user changing nicks. */ if (UseTS6) user = find_byuid(source); - if (!user) { - user = finduser(source); - } - else + if (!user) { + user = finduser(source); + } else user = finduser(source); if (!user) { |