@@ -1040,7 +1040,7 @@ do_take(struct chanset_t *chan)
to_deop = to_deop_ptr = calloc(1, 2048);
for (m = chan->channel.member; m && m->nick[0]; m = m->next) {
- int hasop = chan_hasop(m);
+ int hasop = (m->flags & CHANOP);
if (m && !match_my_nick(m->nick)) {
@@ -42,7 +42,7 @@ enum {
#endif /* _EGG_MOD_SERVER_SERVER_H */
void nuke_server(char *);
-int match_my_nick(char *);
+inline int match_my_nick(char *);
extern bind_table_t *BT_ctcp, *BT_ctcr;
#ifdef S_MSGCMDS
@@ -157,11 +157,9 @@ int check_bind_ctcpr(char *nick, char *uhost, struct userrec *u,
}
-int match_my_nick(char *nick)
+inline int match_my_nick(char *nick)
{
- if (!rfc_casecmp(nick, botname))
- return 1;
- return 0;
+ return (!rfc_casecmp(nick, botname));
/* 001: welcome to IRC (use it to fix the server name)