* Just some cleanups

svn: 797

src/botcmd.c

@@ -708,12 +708,9 @@ static void bot_nlinked(int idx, char *par)
       bogus = 1;
   }
   if (bogus) {
-    putlog(LOG_BOTS, "*", "%s %s!  (%s -> %s)", BOT_BOGUSLINK, dcc[idx].nick,
-	   next, newbot);
-    simple_sprintf(s, "%s: %s %s", BOT_BOGUSLINK, dcc[idx].nick,
-		   MISC_DISCONNECTED);
-    dprintf(idx, "error %s (%s -> %s)\n",
-	    BOT_BOGUSLINK, next, newbot);
+    putlog(LOG_BOTS, "*", "%s %s!  (%s -> %s)", BOT_BOGUSLINK, dcc[idx].nick, next, newbot);
+    simple_sprintf(s, "%s: %s %s", BOT_BOGUSLINK, dcc[idx].nick, MISC_DISCONNECTED);
+    dprintf(idx, "error %s (%s -> %s)\n", BOT_BOGUSLINK, next, newbot);
   }
   if (s[0]) {
     chatout("*** %s\n", s);
@@ -743,8 +740,7 @@ static void bot_nlinked(int idx, char *par)
   u = get_user_by_handle(userlist, newbot);
   if (bot_flags(u) & BOT_REJECT) {
     botnet_send_reject(idx, conf.bot->nick, NULL, newbot, NULL, NULL);
-    putlog(LOG_BOTS, "*", "%s %s %s %s", BOT_REJECTING,
-	   newbot, MISC_FROM, dcc[idx].nick);
+    putlog(LOG_BOTS, "*", "%s %s %s %s", BOT_REJECTING, newbot, MISC_FROM, dcc[idx].nick);
   }
 }
 

src/botmsg.c

@@ -155,7 +155,7 @@ int simple_sprintf (char *buf, ...)
 
 /* Ditto for tandem bots
  */
-void send_tand_but(int x, char *buf, int len)
+static void send_tand_but(int x, char *buf, int len)
 {
   int i, iso = 0;
 
@@ -167,6 +167,7 @@ void send_tand_but(int x, char *buf, int len)
     if ((dcc[i].type == &DCC_BOT) && (i != x) && (!iso || !(bot_flags(dcc[i].user) & BOT_ISOLATE)))
       tputs(dcc[i].sock, buf, len);
 }
+
 #ifdef S_DCCPASS
 void botnet_send_cmdpass(int idx, char *cmd, char *pass)
 {
@@ -406,7 +407,7 @@ void botnet_send_reject(int idx, char *fromp, char *frombot, char *top, char *to
   }
 }
 
-void putallbots(char *par)
+inline void putallbots(char *par)
 { 
   botnet_send_zapf_broad(-1, conf.bot->nick, NULL, par);
 }

src/botmsg.h

@@ -18,7 +18,7 @@
 void botnet_send_cfg(int idx, struct cfg_entry *entry);
 void botnet_send_cfg_broad(int idx, struct cfg_entry *entry);
 void putbot(char *, char *);
-void putallbots(char *);
+inline void putallbots(char *);
 int add_note(char *, char *, char *, int, int);
 int simple_sprintf (char *, ...);
 void tandout_but (int, ...);

src/tandem.h

@@ -43,7 +43,6 @@ typedef struct {
 
 #ifndef MAKING_MODS
 
-void send_tand_but(int, char *, int);
 void botnet_send_chan(int, char *, char *, int, char *);
 void botnet_send_chat(int, char *, char *);
 void botnet_send_act(int, char *, char *, int, char *);