Merge branch 'maint'

* maint:
  Removing irc_log revealed the wrong params being used here.
  No need to call irc_log as it does nothing.

doc/UPDATES.md

@@ -14,6 +14,7 @@
   * Clear FiSH keys when a client quits.
   * Fix crash when clearing last botset entry for a bot.
   * Bots now share channel key to other bots even if not opped.
+  * Some small performance improvements
 
 # 1.4.9
   * Fix various compile warnings and spam

src/log.cc

@@ -335,6 +335,7 @@ void putlog(int type, const char *chname, const char *format, ...)
   }
 }
 
+#if 0
 void
 irc_log(struct chanset_t *chan, const char *format, ...)
 {
@@ -362,4 +363,5 @@ irc_log(struct chanset_t *chan, const char *format, ...)
 */
 #endif 
 }
+#endif
 /* vim: set sts=2 sw=2 ts=8 et: */

src/log.h

@@ -33,7 +33,11 @@ void putlog (int, const char *, const char *, ...) __attribute__((format(printf,
 int logmodes(const char *);
 char *masktype(int);
 char *maskname(int);
+#if 0
 void irc_log(struct chanset_t *, const char *, ...) __attribute__((format(printf, 2, 3)));
+#else
+#define irc_log(...)
+#endif
 void logfile(int type, const char *msg);
 
 extern int		conmask;

src/mod/irc.mod/chan.cc

@@ -3000,7 +3000,7 @@ static int gotkick(char *from, char *origmsg)
     return 0; /* rejoin if kicked before getting needed info <Wcc[08/08/02]> */
   }
   if (channel_active(chan)) {
-    char *whodid = NULL, s1[UHOSTLEN] = "", buf[UHOSTLEN] = "", *uhost = buf;
+    char *whodid = NULL, buf[UHOSTLEN] = "", *uhost = buf;
     memberlist *m = NULL, *mv = NULL;
     struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0 };
 
@@ -3053,7 +3053,7 @@ static int gotkick(char *from, char *origmsg)
         chan->needs_role_rebalance = 1;
       }
     }
-    irc_log(chan, "%s was kicked by %s (%s)", s1, from, msg);
+    irc_log(chan, "%s!%s was kicked by %s (%s)", mv->nick, mv->userhost, from, msg);
     /* Kicked ME?!? the sods! */
     if (mv->is_me) {
       check_rejoin(chan);