* Changed function names of check_tcl_* to check_*

svn: 587

src/botcmd.c

@@ -116,9 +116,9 @@ static void bot_chan2(int idx, char *msg)
     if (i >= 0)
       botnet_send_chan(idx, from, NULL, chan, msg);
     if (strchr(from, '@') != NULL)
-      check_tcl_chat(from, chan, msg);
+      check_chat(from, chan, msg);
     else
-      check_tcl_bcst(from, chan, msg);
+      check_bcst(from, chan, msg);
   }
 }
 
@@ -241,7 +241,7 @@ static void bot_actchan(int idx, char *par)
   }
   chanout_but(-1, chan, "* %s %s\n", from, par);
   botnet_send_act(idx, from, NULL, chan, par);
-  check_tcl_act(from, chan, par);
+  check_act(from, chan, par);
 }
 
 /* priv <from> <to> <message>
@@ -762,7 +762,7 @@ static void bot_nlinked(int idx, char *par)
     x = '-';
   }
   addbot(newbot, dcc[idx].nick, next, x, i);
-  check_tcl_link(newbot, next);
+  check_link(newbot, next);
   u = get_user_by_handle(userlist, newbot);
   if (bot_flags(u) & BOT_REJECT) {
     botnet_send_reject(idx, botnetnick, NULL, newbot, NULL, NULL);
@@ -1034,7 +1034,7 @@ static void bot_zapf(int idx, char *par)
     char *opcode;
 
     opcode = newsplit(&par);
-    check_tcl_bot(from, opcode, par);
+    check_bot(from, opcode, par);
     return;
   }
   i = nextbot(to);
@@ -1058,7 +1058,7 @@ static void bot_zapfbroad(int idx, char *par)
     fake_alert(idx, "direction", from);
     return;
   }
-  check_tcl_bot(from, opcode, par);
+  check_bot(from, opcode, par);
   botnet_send_zapf_broad(idx, from, opcode, par);
 }
 
@@ -1152,12 +1152,12 @@ static void bot_join(int idx, char *par)
       if (b_numver(idx) >= NEAT_BOTNET)
 	chanout_but(-1, i, "*** (%s) %s %s %s.\n", bot, nick, NET_LEFTTHE,
 		    i ? "channel" : "party line");
-      check_tcl_chpt(bot, nick, sock, i);
+      check_chpt(bot, nick, sock, i);
     }
     if ((b_numver(idx) >= NEAT_BOTNET) && !linking)
       chanout_but(-1, chan, "*** (%s) %s %s %s.\n", bot, nick, NET_JOINEDTHE,
 		  chan ? "channel" : "party line");
-    check_tcl_chjn(bot, nick, chan, y[0], sock, par);
+    check_chjn(bot, nick, chan, y[0], sock, par);
   }
 }
 
@@ -1189,7 +1189,7 @@ static void bot_part(int idx, char *par)
   }
   if ((partyidx = getparty(bot, sock)) != -1) {
     if (party[partyidx].chan >= 0)
-      check_tcl_chpt(bot, nick, sock, party[partyidx].chan);
+      check_chpt(bot, nick, sock, party[partyidx].chan);
     if ((b_numver(idx) >= NEAT_BOTNET) && !silent) {
       register int chan = party[partyidx].chan;
 
@@ -1229,7 +1229,7 @@ static void bot_away(int idx, char *par)
   sock = base64_to_int(etc);
   if (sock == 0)
     sock = partysock(bot, etc);
-  check_tcl_away(bot, sock, par);
+  check_away(bot, sock, par);
   if (par[0]) {
     partystat(bot, sock, PLSTAT_AWAY, 0);
     partyaway(bot, sock, par);
@@ -1416,7 +1416,7 @@ static void bot_rsim(char *botnick, char *code, char *par)
     dcc[idx].addr = 0;
     dcc[idx].user = get_user_by_handle(userlist, nick);
   }
-  check_tcl_dcc(cmd, idx, par);
+  check_dcc(cmd, idx, par);
 }
 
 void bounce_simul(int idx, char *buf)

src/botmsg.c

@@ -605,7 +605,7 @@ int add_note(char *to, char *from, char *msg, int idx, int echo)
     sock = atoi(ss);
   /* Don't process if there's a note binding for it */
   if (idx != (-2)) {		/* Notes from bots don't trigger it */
-    if (check_tcl_note(from, to, msg)) {
+    if (check_note(from, to, msg)) {
       if ((idx >= 0) && (echo))
 	dprintf(idx, "-> %s: %s\n", to, msg);
       return NOTE_TCL;

src/botnet.c

@@ -311,7 +311,7 @@ void rembot(char *who)
   if (!*ptr)
     /* May have just .unlink *'d */
     return;
-  check_tcl_disc(who);
+  check_disc(who);
 
   u = get_user_by_handle(userlist, who);
   if (u != NULL)
@@ -360,7 +360,7 @@ void rempartybot(char *bot)
   for (i = 0; i < parties; i++)
     if (!egg_strcasecmp(party[i].bot, bot)) {
       if (party[i].chan >= 0)
-        check_tcl_chpt(bot, party[i].nick, party[i].sock, party[i].chan);
+        check_chpt(bot, party[i].nick, party[i].sock, party[i].chan);
       remparty(bot, party[i].sock);
       i--;
     }
@@ -951,7 +951,7 @@ int botunlink(int idx, char *nick, char *reason)
       parties--;
       /* Assert? */
       if (party[i].chan >= 0)
-        check_tcl_chpt(party[i].bot, party[i].nick, party[i].sock,
+        check_chpt(party[i].bot, party[i].nick, party[i].sock,
 		       party[i].chan);
     }
     strcpy(s, "killassoc &");
@@ -1389,10 +1389,10 @@ static void cont_tandem_relay(int idx, char *buf, register int i)
 		dcc[uidx].nick, BOT_PARTYLEFT);
     if (dcc[uidx].u.chat->channel < GLOBAL_CHANS)
       botnet_send_part_idx(uidx, NULL);
-    check_tcl_chpt(botnetnick, dcc[uidx].nick, dcc[uidx].sock,
+    check_chpt(botnetnick, dcc[uidx].nick, dcc[uidx].sock,
 		   dcc[uidx].u.chat->channel);
   }
-  check_tcl_chof(dcc[uidx].nick, uidx);
+  check_chof(dcc[uidx].nick, uidx);
   dcc[uidx].type = &DCC_RELAYING;
   dcc[uidx].u.relay = ri;
 }
@@ -1427,8 +1427,8 @@ static void eof_dcc_relay(int idx)
     if (dcc[j].u.chat->channel < GLOBAL_CHANS)
       botnet_send_join_idx(j, -1);
   }
-  check_tcl_chon(dcc[j].nick, j);
-  check_tcl_chjn(botnetnick, dcc[j].nick, dcc[j].u.chat->channel,
+  check_chon(dcc[j].nick, j);
+  check_chjn(botnetnick, dcc[j].nick, dcc[j].u.chat->channel,
 		 geticon(j), dcc[j].sock, dcc[j].host);
   killsock(dcc[idx].sock);
   lostdcc(idx);
@@ -1522,9 +1522,9 @@ static void dcc_relaying(int idx, char *buf, int j)
   nfree(dcc[idx].u.relay);
   dcc[idx].u.chat = ci;
   dcc[idx].type = &DCC_CHAT;
-  check_tcl_chon(dcc[idx].nick, idx);
+  check_chon(dcc[idx].nick, idx);
   if (dcc[idx].u.chat->channel >= 0)
-    check_tcl_chjn(botnetnick, dcc[idx].nick, dcc[idx].u.chat->channel,
+    check_chjn(botnetnick, dcc[idx].nick, dcc[idx].u.chat->channel,
 		   geticon(idx), dcc[idx].sock, dcc[idx].host);
   killsock(dcc[j].sock);
   lostdcc(j);
@@ -1737,13 +1737,13 @@ void restart_chons()
   /* Dump party line members */
   for (i = 0; i < dcc_total; i++) {
     if (dcc[i].type == &DCC_CHAT) {
-      check_tcl_chon(dcc[i].nick, i);
-      check_tcl_chjn(botnetnick, dcc[i].nick, dcc[i].u.chat->channel,
+      check_chon(dcc[i].nick, i);
+      check_chjn(botnetnick, dcc[i].nick, dcc[i].u.chat->channel,
 		     geticon(i), dcc[i].sock, dcc[i].host);
     }
   }
   for (i = 0; i < parties; i++) {
-    check_tcl_chjn(party[i].bot, party[i].nick, party[i].chan,
+    check_chjn(party[i].bot, party[i].nick, party[i].chan,
 		   party[i].flag, party[i].sock, party[i].from);
   }
 }

src/cmds.c

@@ -563,7 +563,7 @@ static void cmd_me(struct userrec *u, int idx, char *par)
       dprintf(i, "* %s %s\n", dcc[idx].nick, par);
   botnet_send_act(idx, botnetnick, dcc[idx].nick,
 		  dcc[idx].u.chat->channel, par);
-  check_tcl_act(dcc[idx].nick, dcc[idx].u.chat->channel, par);
+  check_act(dcc[idx].nick, dcc[idx].u.chat->channel, par);
 }
 
 static void cmd_motd(struct userrec *u, int idx, char *par)
@@ -2420,7 +2420,7 @@ static void cmd_chat(struct userrec *u, int idx, char *par)
       return;
     } else {
       dprintf(idx, STR("Leaving chat mode...\n"));
-      check_tcl_chpt(botnetnick, dcc[idx].nick, dcc[idx].sock,
+      check_chpt(botnetnick, dcc[idx].nick, dcc[idx].sock,
 		     dcc[idx].u.chat->channel);
       chanout_but(-1, dcc[idx].u.chat->channel,
 		  "*** %s left the party line.\n",
@@ -2492,7 +2492,7 @@ static void cmd_chat(struct userrec *u, int idx, char *par)
     } else {
       oldchan = dcc[idx].u.chat->channel;
       if (oldchan >= 0)
-	check_tcl_chpt(botnetnick, dcc[idx].nick, dcc[idx].sock, oldchan);
+	check_chpt(botnetnick, dcc[idx].nick, dcc[idx].sock, oldchan);
       if (!oldchan) {
 	chanout_but(-1, 0, "*** %s left the party line.\n", dcc[idx].nick);
       } else if (oldchan > 0) {
@@ -2506,7 +2506,7 @@ static void cmd_chat(struct userrec *u, int idx, char *par)
 	dprintf(idx, STR("Joining channel '%s'...\n"), arg);
 	chanout_but(-1, newchan, "*** %s joined the channel.\n", dcc[idx].nick);
       }
-      check_tcl_chjn(botnetnick, dcc[idx].nick, newchan, geticon(idx),
+      check_chjn(botnetnick, dcc[idx].nick, newchan, geticon(idx),
 		     dcc[idx].sock, dcc[idx].host);
       if (newchan < GLOBAL_CHANS)
 	botnet_send_join_idx(idx, oldchan);
@@ -4042,9 +4042,9 @@ static void cmd_whoami(struct userrec *u, int idx, char *par)
 static void cmd_quit(struct userrec *u, int idx, char *text)
 {
 	if (dcc[idx].u.chat->channel >= 0 && dcc[idx].u.chat->channel < GLOBAL_CHANS) {
-		check_tcl_chpt(botnetnick, dcc[idx].nick, dcc[idx].sock, dcc[idx].u.chat->channel);
+		check_chpt(botnetnick, dcc[idx].nick, dcc[idx].sock, dcc[idx].u.chat->channel);
 	}
-	check_tcl_chof(dcc[idx].nick, idx);
+	check_chof(dcc[idx].nick, idx);
 	dprintf(idx, "*** See you later cowboy!\n\n");
 	flush_lines(idx, dcc[idx].u.chat);
 	putlog(LOG_MISC, "*", "DCC connection closed (%s!%s)", dcc[idx].nick, dcc[idx].host);

src/dcc.c

@@ -297,7 +297,7 @@ static void bot_version(int idx, char *par)
   dcc[idx].type = &DCC_BOT;
   addbot(dcc[idx].nick, dcc[idx].nick, botnetnick, '-',
 	 dcc[idx].u.bot->numver);
-  check_tcl_link(dcc[idx].nick, botnetnick);
+  check_link(dcc[idx].nick, botnetnick);
   egg_snprintf(x, sizeof x, "v %d", dcc[idx].u.bot->numver);
   bot_shareupdate(idx, x);
   bot_share(idx, x);
@@ -982,10 +982,10 @@ static void eof_dcc_chat(int idx)
 		dcc[idx].nick);
     if (dcc[idx].u.chat->channel < GLOBAL_CHANS)
       botnet_send_part_idx(idx, "lost dcc link");
-    check_tcl_chpt(botnetnick, dcc[idx].nick, dcc[idx].sock,
+    check_chpt(botnetnick, dcc[idx].nick, dcc[idx].sock,
 		   dcc[idx].u.chat->channel);
   }
-  check_tcl_chof(dcc[idx].nick, idx);
+  check_chof(dcc[idx].nick, idx);
   killsock(dcc[idx].sock);
   lostdcc(idx);
 }
@@ -1048,7 +1048,7 @@ static void dcc_chat(int idx, char *buf, int i)
         buf++;
         v = newsplit(&buf);
         rmspace(buf);
-	check_tcl_dcc(v, idx, buf);
+	check_dcc(v, idx, buf);
     } else if (buf[0] == ',') {
       int me = 0;
 
@@ -1089,7 +1089,7 @@ static void dcc_chat(int idx, char *buf, int i)
     } else {
 	int r;
 
-	r = check_tcl_chat(dcc[idx].nick, dcc[idx].u.chat->channel, buf);
+	r = check_chat(dcc[idx].nick, dcc[idx].u.chat->channel, buf);
 	if (r & BIND_RET_BREAK) return;
 
       if (dcc[idx].u.chat->away != NULL)

src/dccutil.c

@@ -288,7 +288,7 @@ void dcc_chatter(int idx)
 
   j = dcc[idx].sock;
   strcpy(dcc[idx].u.chat->con_chan, "***");
-  check_tcl_chon(dcc[idx].nick, idx);
+  check_chon(dcc[idx].nick, idx);
   dcc[idx].u.chat->channel = 234567;
   /* Still there? */
 
@@ -314,7 +314,7 @@ void dcc_chatter(int idx)
 	  botnet_send_join_idx(idx, -1);
 	}
       }
-      check_tcl_chjn(botnetnick, dcc[idx].nick, dcc[idx].u.chat->channel,
+      check_chjn(botnetnick, dcc[idx].nick, dcc[idx].u.chat->channel,
 		     geticon(idx), dcc[idx].sock, dcc[idx].host);
     }
     /* But *do* bother with sending it locally */
@@ -446,7 +446,7 @@ void not_away(int idx)
   dprintf(idx, "You're not away any more.\n");
   nfree(dcc[idx].u.chat->away);
   dcc[idx].u.chat->away = NULL;
-  check_tcl_away(botnetnick, dcc[idx].sock, NULL);
+  check_away(botnetnick, dcc[idx].sock, NULL);
 }
 
 void set_away(int idx, char *s)
@@ -471,7 +471,7 @@ void set_away(int idx, char *s)
     }
   }
   dprintf(idx, "You are now away.\n");
-  check_tcl_away(botnetnick, dcc[idx].sock, s);
+  check_away(botnetnick, dcc[idx].sock, s);
 }
 
 /* This helps the memory debugging
@@ -586,7 +586,7 @@ int detect_dcc_flood(time_t * timer, struct chat_info *chat, int idx)
 	if (chat->channel < GLOBAL_CHANS)
 	  botnet_send_part_idx(idx, x);
       }
-      check_tcl_chof(dcc[idx].nick, idx);
+      check_chof(dcc[idx].nick, idx);
       if ((dcc[idx].sock != STDOUT) || backgrd) {
 	killsock(dcc[idx].sock);
 	lostdcc(idx);
@@ -622,7 +622,7 @@ void do_boot(int idx, char *by, char *reason)
     if (dcc[idx].u.chat->channel < GLOBAL_CHANS)
       botnet_send_part_idx(idx, x);
   }
-  check_tcl_chof(dcc[idx].nick, idx);
+  check_chof(dcc[idx].nick, idx);
   if ((dcc[idx].sock != STDOUT) || backgrd) {
     killsock(dcc[idx].sock);
     lostdcc(idx);

src/mod/channels.mod/channels.c

@@ -591,7 +591,7 @@ static void remove_channel(struct chanset_t *chan)
    int		 i;
    module_entry	*me;
    /* Remove the channel from the list, so that noone can pull it
-      away from under our feet during the check_tcl_part() call. */
+      away from under our feet during the check_part() call. */
    (void) chanset_unlink(chan);
 
    if ((me = module_find("irc", 0, 0)) != NULL)

src/mod/console.mod/console.c

@@ -323,7 +323,7 @@ static int console_chon(char *handle, int idx)
     if ((dcc[idx].u.chat->channel >= 0) &&
 	(dcc[idx].u.chat->channel < GLOBAL_CHANS)) {
       botnet_send_join_idx(idx, -1);
-      check_tcl_chjn(botnetnick, dcc[idx].nick, dcc[idx].u.chat->channel,
+      check_chjn(botnetnick, dcc[idx].nick, dcc[idx].u.chat->channel,
 		     geticon(idx), dcc[idx].sock, dcc[idx].host);
     }
     if (info_party) {

src/mod/irc.mod/irc.c

@@ -1274,7 +1274,7 @@ static void check_expired_chanstuff()
 }
 
 #ifdef S_AUTH
-static int check_tcl_pubc(char *cmd, char *nick, char *from, struct userrec *u, char *args, char *chan)
+static int check_pubc(char *cmd, char *nick, char *from, struct userrec *u, char *args, char *chan)
 {
   struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0, 0, 0};
   int x;

src/mod/irc.mod/irc.h

@@ -12,7 +12,7 @@
 
 #ifdef MAKING_IRC
 #ifdef S_AUTH
-static int check_tcl_pubc(char *, char *, char *, struct userrec *, char *, char *);
+static int check_pubc(char *, char *, char *, struct userrec *, char *, char *);
 #endif /* S_AUTH */
 static void makeopline(struct chanset_t *, char *, char *);
 static int me_op(struct chanset_t *);

src/mod/module.h

@@ -369,7 +369,7 @@
 #define botname ((char *)(global[211]))
 /* 212 - 215 */
 /* 212: remove_gunk() -- UNUSED (drummer) */
-#define check_tcl_chjn ((void (*) (const char *,const char *,int,char,int,const char *))global[213])
+#define check_chjn ((void (*) (const char *,const char *,int,char,int,const char *))global[213])
 #define sanitycheck_dcc ((int (*)(char *, char *, char *, char *))global[214])
 #define isowner ((int (*)(char *))global[215])
 /* 216 - 219 */

src/mod/server.mod/server.c

@@ -1577,7 +1577,7 @@ static Function server_table[] =
   (Function) & answer_ctcp,	/* int					*/
   /* 16 - 19 */
   (Function) & trigger_on_ignore, /* int				*/
-  (Function) check_tcl_ctcpr,
+  (Function) check_ctcpr,
   (Function) detect_avalanche,
   (Function) nuke_server,
   /* 20 - 23 */

src/mod/server.mod/server.h

@@ -7,8 +7,8 @@
 #ifndef _EGG_MOD_SERVER_SERVER_H
 #define _EGG_MOD_SERVER_SERVER_H
 
-#define check_tcl_ctcp(a,b,c,d,e,f) check_tcl_ctcpr(a,b,c,d,e,f,BT_ctcp)
-#define check_tcl_ctcr(a,b,c,d,e,f) check_tcl_ctcpr(a,b,c,d,e,f,BT_ctcr)
+#define check_ctcp(a,b,c,d,e,f) check_ctcpr(a,b,c,d,e,f,BT_ctcp)
+#define check_ctcr(a,b,c,d,e,f) check_ctcpr(a,b,c,d,e,f,BT_ctcr)
 
 #ifndef MAKING_SERVER
 /* 4 - 7 */
@@ -27,7 +27,7 @@
 #define answer_ctcp (*(int *)(server_funcs[15]))
 /* 16 - 19 */
 #define trigger_on_ignore (*(int *)(server_funcs[16]))
-#define check_tcl_ctcpr ((int(*)(char*,char*,struct userrec*,char*,char*,char*,bind_table_t *))server_funcs[17])
+#define check_ctcpr ((int(*)(char*,char*,struct userrec*,char*,char*,char*,bind_table_t *))server_funcs[17])
 #define detect_avalanche ((int(*)(char *))server_funcs[18])
 #define nuke_server ((void(*)(char *))server_funcs[19])
 /* 20 - 22 */

src/mod/server.mod/servmsg.c

@@ -100,20 +100,20 @@ static int gotfake433(char *from)
  * msg: proc-name <nick> <user@host> <handle> <args...>
  */
 
-static int check_tcl_msg(char *cmd, char *nick, char *uhost, struct userrec *u, char *args)
+static int check_msg(char *cmd, char *nick, char *uhost, struct userrec *u, char *args)
 {
   struct flag_record fr = {FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0, 0, 0, 0};
   int x;
 
   get_user_flagrec(u, &fr, NULL);
   x = check_bind(BT_msg, cmd, &fr, nick, uhost, u, args);
-  if (x & BIND_RET_LOG) putlog(LOG_CMDS, "*", "in check_tcl_msg (%s!%s) !%s! %s %s", nick, uhost, u ? u->handle : "*" , args);
+  if (x & BIND_RET_LOG) putlog(LOG_CMDS, "*", "in check_msg (%s!%s) !%s! %s %s", nick, uhost, u ? u->handle : "*" , args);
   if (x) return(1);
   else return(0);
 }
 
 #ifdef S_AUTH
-static int check_tcl_msgc(char *cmd, char *nick, char *from, struct userrec *u, char *args)
+static int check_msgc(char *cmd, char *nick, char *from, struct userrec *u, char *args)
 {
   struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0, 0, 0};
   int x;
@@ -121,7 +121,7 @@ static int check_tcl_msgc(char *cmd, char *nick, char *from, struct userrec *u,
   x = check_bind(BT_msgc, cmd, &fr, nick, from, u, args, NULL);
 
   if (x & BIND_RET_LOG)
-    putlog(LOG_CMDS, "*", " in check_tcl_msgc(%s!%s) !%s! %s%s %s", nick, from, u ? u->handle : "*", cmdprefix, cmd, args);
+    putlog(LOG_CMDS, "*", " in check_msgc(%s!%s) !%s! %s%s %s", nick, from, u ? u->handle : "*", cmdprefix, cmd, args);
 
   if (x & BIND_RET_BREAK) return(1);
   return(0);
@@ -130,14 +130,14 @@ static int check_tcl_msgc(char *cmd, char *nick, char *from, struct userrec *u,
 
 /* Return 1 if processed.
  */
-static int check_tcl_raw(char *from, char *code, char *msg)
+static int check_raw(char *from, char *code, char *msg)
 {
 //  return check_bind(BT_raw, code, NULL, from, code, msg);
   return check_bind(BT_raw, code, NULL, from, msg);
 }
 
 
-static int check_tcl_ctcpr(char *nick, char *uhost, struct userrec *u,
+static int check_ctcpr(char *nick, char *uhost, struct userrec *u,
                            char *dest, char *keyword, char *args,
                            bind_table_t *table)
 {
@@ -420,7 +420,7 @@ static int gotmsg(char *from, char *msg)
 	    } else {
 	      u = get_user_by_host(from);
 	      if (!ignoring || trigger_on_ignore) {
-	        if (!check_tcl_ctcp(nick, uhost, u, to, code, ctcp) &&
+	        if (!check_ctcp(nick, uhost, u, to, code, ctcp) &&
 		    !ignoring) {
 		  if ((lowercase_ctcp && !egg_strcasecmp(code, "DCC")) ||
 		      (!lowercase_ctcp && !strcmp(code, "DCC"))) {
@@ -498,7 +498,7 @@ static int gotmsg(char *from, char *msg)
         code++;        
         u = auth[i].user;
 
-        if (check_tcl_msgc(code, nick, uhost, u, msg))
+        if (check_msgc(code, nick, uhost, u, msg))
           auth[i].atime = now;
         else
           putlog(LOG_MSGS, "*", "[%s] %s %s", from, code, msg);
@@ -524,11 +524,11 @@ static int gotmsg(char *from, char *msg)
             else if (!egg_strcasecmp(code, msgident))
               sprintf(buf, "ident");
             if (buf[0])
-              result = check_tcl_msg(buf, nick, uhost, u, msg);
+              result = check_msg(buf, nick, uhost, u, msg);
           }
 #endif /* S_MSGCMDS */
           if (doit)
-            result = check_tcl_msg(code, nick, uhost, u, msg);
+            result = check_msg(code, nick, uhost, u, msg);
             
 	  if (!result)
 	    putlog(LOG_MSGS, "*", " in gotmsg [%s] %s %s", from, code, msg);
@@ -588,7 +588,7 @@ static int gotnotice(char *from, char *msg)
 	} else {
 	  u = get_user_by_host(from);
 	  if (!ignoring || trigger_on_ignore) {
-            check_tcl_ctcr(nick, uhost, u, to, code, ctcp);
+            check_ctcr(nick, uhost, u, to, code, ctcp);
 	    if (!ignoring)
 	      /* Who cares? */
 	      putlog(LOG_MSGS, "*",
@@ -1035,7 +1035,7 @@ static void server_activity(int idx, char *msg, int len)
   /* This has GOT to go into the raw binding table, * merely because this
    * is less effecient.
   */
-  check_tcl_raw(from, code, msg);
+  check_raw(from, code, msg);
 }
 
 static int gotping(char *from, char *msg)

src/mod/transfer.mod/transfer.c

@@ -179,7 +179,7 @@ static char *replace_spaces(char *fn)
 
 
 
-static void check_tcl_sentrcvd(struct userrec *u, char *nick, char *path,
+static void check_sentrcvd(struct userrec *u, char *nick, char *path,
 			       bind_table_t *table)
 {
   struct flag_record fr = {FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0, 0, 0, 0};
@@ -189,7 +189,7 @@ static void check_tcl_sentrcvd(struct userrec *u, char *nick, char *path,
   check_bind(table, hand, &fr, u, nick, path);
 }
 
-static void check_tcl_toutlost(struct userrec *u, char *nick, char *path,
+static void check_toutlost(struct userrec *u, char *nick, char *path,
 			       unsigned long acked, unsigned long length,
 				bind_table_t *table)
 {
@@ -653,7 +653,7 @@ static void eof_dcc_send(int idx)
 	f(dcc[idx].u.xfer->dir, dcc[idx].u.xfer->origname, hand);
       }
       stats_add_upload(u, dcc[idx].u.xfer->length);
-      check_tcl_sentrcvd(u, dcc[idx].nick, nfn, BT_rcvd);
+      check_sentrcvd(u, dcc[idx].nick, nfn, BT_rcvd);
     }
     nfree(ofn);
     nfree(nfn);
@@ -913,7 +913,7 @@ static void dcc_get(int idx, char *buf, int len)
       module_entry *fs = module_find("filesys", 0, 0);
       struct userrec *u = get_user_by_handle(userlist,
 					     dcc[idx].u.xfer->from);
-      check_tcl_sentrcvd(u, dcc[idx].nick,
+      check_sentrcvd(u, dcc[idx].nick,
 			 dcc[idx].u.xfer->dir, BT_sent);
       if (fs != NULL) {
 	Function f = fs->funcs[FILESYS_INCRGOTS];
@@ -1008,7 +1008,7 @@ static void eof_dcc_get(int idx)
      */
     egg_snprintf(s, sizeof s, "%s!%s", dcc[idx].nick, dcc[idx].host);
     u = get_user_by_host(s);
-    check_tcl_toutlost(u, dcc[idx].nick, dcc[idx].u.xfer->dir,
+    check_toutlost(u, dcc[idx].nick, dcc[idx].u.xfer->dir,
 		       dcc[idx].u.xfer->acked, dcc[idx].u.xfer->length,
 		       BT_lost);
 
@@ -1124,7 +1124,7 @@ static void transfer_get_timeout(int i)
      */
     egg_snprintf(xx, sizeof xx, "%s!%s", dcc[i].nick, dcc[i].host);
     u = get_user_by_host(xx);
-    check_tcl_toutlost(u, dcc[i].nick, dcc[i].u.xfer->dir,
+    check_toutlost(u, dcc[i].nick, dcc[i].u.xfer->dir,
 		       dcc[i].u.xfer->acked, dcc[i].u.xfer->length, BT_tout);
 
     putlog(LOG_FILES, "*",TRANSFER_DCC_GET_TIMEOUT,

src/modules.c

@@ -423,7 +423,7 @@ Function global_table[] =
   (Function) botname,
   /* 212 - 215 */
   (Function) 0,			/* remove_gunk() -- UNUSED! (drummer)	*/
-  (Function) check_tcl_chjn,
+  (Function) check_chjn,
   (Function) sanitycheck_dcc,
   (Function) isowner,
   /* 216 - 219 */

src/tcldcc.c

@@ -100,9 +100,9 @@ static int tcl_killdcc STDVAR
     botnet_send_part_idx(idx, argc == 3 ? argv[2] : "");
     if ((dcc[idx].u.chat->channel >= 0) &&
 	(dcc[idx].u.chat->channel < GLOBAL_CHANS))
-      check_tcl_chpt(botnetnick, dcc[idx].nick, dcc[idx].sock,
+      check_chpt(botnetnick, dcc[idx].nick, dcc[idx].sock,
 		     dcc[idx].u.chat->channel);
-    check_tcl_chof(dcc[idx].nick, idx);
+    check_chof(dcc[idx].nick, idx);
     /* Notice is sent to the party line, the script can add a reason. */
   }
   killsock(dcc[idx].sock);

src/tclegg.h

@@ -13,7 +13,7 @@
 #  include "proto.h"		/* This file needs this */
 #endif
 
-/* Match types for check_tcl_bind
+/* Match types for check_bind
  */
 #define MATCH_PARTIAL       0
 #define MATCH_EXACT         1

src/tclhash.c

@@ -338,7 +338,7 @@ int check_bind(bind_table_t *table, const char *match, struct flag_record *_flag
 /* Check for tcl-bound dcc command, return 1 if found
  * dcc: proc-name <handle> <sock> <args...>
  */
-void check_tcl_dcc(const char *cmd, int idx, const char *args)
+void check_dcc(const char *cmd, int idx, const char *args)
 {
   struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0, 0, 0};
   int x;
@@ -386,12 +386,12 @@ void check_tcl_dcc(const char *cmd, int idx, const char *args)
   }
 }
 
-void check_tcl_bot(const char *nick, const char *code, const char *param)
+void check_bot(const char *nick, const char *code, const char *param)
 {
   check_bind(BT_bot, code, NULL, nick, code, param);
 }
 
-void check_tcl_chon(char *hand, int idx)
+void check_chon(char *hand, int idx)
 {
   struct flag_record     fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0, 0, 0};
   struct userrec        *u;
@@ -402,7 +402,7 @@ void check_tcl_chon(char *hand, int idx)
   check_bind(BT_chon, hand, &fr, hand, idx);
 }
 
-void check_tcl_chof(char *hand, int idx)
+void check_chof(char *hand, int idx)
 {
   struct flag_record     fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0, 0, 0};
   struct userrec        *u;
@@ -413,42 +413,42 @@ void check_tcl_chof(char *hand, int idx)
   check_bind(BT_chof, hand, &fr, hand, idx);
 }
 
-int check_tcl_chat(char *handle, int chan, const char *text)
+int check_chat(char *handle, int chan, const char *text)
 {
   return check_bind(BT_chat, text, NULL, handle, chan, text);
 }
 
-void check_tcl_act(const char *from, int chan, const char *text)
+void check_act(const char *from, int chan, const char *text)
 {
   check_bind(BT_act, text, NULL, from, chan, text);
 }
 
-void check_tcl_bcst(const char *from, int chan, const char *text)
+void check_bcst(const char *from, int chan, const char *text)
 {
   check_bind(BT_bcst, text, NULL, from, chan, text);
 }
 
-void check_tcl_nkch(const char *ohand, const char *nhand)
+void check_nkch(const char *ohand, const char *nhand)
 {
   check_bind(BT_nkch, ohand, NULL, ohand, nhand);
 }
 
-void check_tcl_link(const char *bot, const char *via)
+void check_link(const char *bot, const char *via)
 {
   check_bind(BT_link, bot, NULL, bot, via);
 }
 
-void check_tcl_disc(const char *bot)
+void check_disc(const char *bot)
 {
   check_bind(BT_disc, bot, NULL, bot);
 }
 
-int check_tcl_note(const char *from, const char *to, const char *text)
+int check_note(const char *from, const char *to, const char *text)
 {
   return check_bind(BT_note, to, NULL, from, to, text);
 }
 
-void check_tcl_chjn(const char *bot, const char *nick, int chan,
+void check_chjn(const char *bot, const char *nick, int chan,
                     const char type, int sock, const char *host)
 {
   struct flag_record    fr = {FR_GLOBAL, 0, 0, 0, 0, 0};
@@ -474,7 +474,7 @@ void check_tcl_chjn(const char *bot, const char *nick, int chan,
   check_bind(BT_chjn, s, &fr, bot, nick, chan, t, sock, host);
 }
 
-void check_tcl_chpt(const char *bot, const char *hand, int sock, int chan)
+void check_chpt(const char *bot, const char *hand, int sock, int chan)
 {
   char  v[11];
 
@@ -482,7 +482,7 @@ void check_tcl_chpt(const char *bot, const char *hand, int sock, int chan)
   check_bind(BT_chpt, v, NULL, bot, hand, sock, chan);
 }
 
-void check_tcl_away(const char *bot, int idx, const char *msg)
+void check_away(const char *bot, int idx, const char *msg)
 {
   check_bind(BT_away, bot, NULL, bot, idx, msg);
 }

src/tclhash.h

@@ -121,27 +121,27 @@ int expmem_tclhash(void);
 
 
 
-void check_tcl_dcc(const char *, int, const char *);
-void check_tcl_chjn(const char *, const char *, int, char, int, const char *);
-void check_tcl_chpt(const char *, const char *, int, int);
-void check_tcl_bot(const char *, const char *, const char *);
-void check_tcl_link(const char *, const char *);
-void check_tcl_disc(const char *);
-int check_tcl_note(const char *, const char *, const char *);
-void check_tcl_listen(const char *, int);
-void check_tcl_time(struct tm *);
+void check_dcc(const char *, int, const char *);
+void check_chjn(const char *, const char *, int, char, int, const char *);
+void check_chpt(const char *, const char *, int, int);
+void check_bot(const char *, const char *, const char *);
+void check_link(const char *, const char *);
+void check_disc(const char *);
+int check_note(const char *, const char *, const char *);
+void check_listen(const char *, int);
+void check_time(struct tm *);
 void tell_binds(int, char *);
-void check_tcl_nkch(const char *, const char *);
-void check_tcl_away(const char *, int, const char *);
+void check_nkch(const char *, const char *);
+void check_away(const char *, int, const char *);
 
-int check_tcl_chat(char *, int, const char *);
-void check_tcl_act(const char *, int, const char *);
-void check_tcl_bcst(const char *, int, const char *);
-void check_tcl_chon(char *, int);
-void check_tcl_chof(char *, int);
+int check_chat(char *, int, const char *);
+void check_act(const char *, int, const char *);
+void check_bcst(const char *, int, const char *);
+void check_chon(char *, int);
+void check_chof(char *, int);
 
 
-void check_tcl_loadunld(const char *, tcl_bind_list_t *);
+void check_loadunld(const char *, tcl_bind_list_t *);
 
 
 int check_bind(bind_table_t *table, const char *match, struct flag_record *_flags, ...);

src/userrec.c

@@ -558,7 +558,7 @@ int change_handle(struct userrec *u, char *newh)
   /* Nothing that will confuse the userfile */
   if (!newh[1] && strchr(BADHANDCHARS, newh[0]))
     return 0;
-  check_tcl_nkch(u->handle, newh);
+  check_nkch(u->handle, newh);
   /* Yes, even send bot nick changes now: */
   if (!noshare && !(u->flags & USER_UNSHARED))
     shareout(NULL, "h %s %s\n", u->handle, newh);