Inline me_op()

src/mod/irc.mod/irc.c

@@ -1276,21 +1276,6 @@ killmember(struct chanset_t *chan, char *nick)
   return 1;
 }
 
-/* Check if I am a chanop. Returns boolean 1 or 0.
- */
-bool
-me_op(const struct chanset_t *chan)
-{
-  memberlist *mx = ismember(chan, botname);
-
-  if (!mx)
-    return 0;
-  if (chan_hasop(mx))
-    return 1;
-  else
-    return 0;
-}
-
 /* Check whether I'm voice. Returns boolean 1 or 0.
  */
 bool

src/mod/irc.mod/irc.h

@@ -7,6 +7,7 @@
 #define _EGG_MOD_IRC_IRC_H
 
 #include "src/auth.h"
+#include "src/chanprog.h"
 
 enum { BC_NOCOOKIE = 1, BC_SLACK, BC_HASH, BC_COUNTER };
 
@@ -117,7 +118,14 @@ void notice_invite(struct chanset_t *, char *, char *, char *, bool);
 void real_add_mode(struct chanset_t *, const char, const char, const char *, bool);
 #define add_mode(chan, pls, mode, nick) real_add_mode(chan, pls, mode, nick, 0)
 #define add_cookie(chan, nick) real_add_mode(chan, '+', 'o', nick, 1)
-bool me_op(const struct chanset_t *);
+/* Check if I am a chanop. Returns boolean 1 or 0.
+ */
+inline bool me_op(const struct chanset_t *chan)
+{
+  const memberlist *mx = ismember(chan, botname);
+  return mx && chan_hasop(mx);
+}
+
 bool me_voice(const struct chanset_t *);
 
 void check_this_ban(struct chanset_t *, char *, bool);