[cvslog] Module eggdrop1.6: Change committed

cvslog cvs at tsss.iavalley.cc.ia.us
Tue Jan 16 11:14:01 CST 2001


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2001-01-16 17:13:34 UTC

Modified files:
     doc/UPDATES1.6 src/botcmd.c src/botmsg.c src/botnet.c src/patch.h
     src/mod/assoc.mod/assoc.c src/mod/blowfish.mod/blowfish.c
     src/mod/channels.mod/channels.c src/mod/channels.mod/cmdschan.c
     src/mod/channels.mod/tclchan.c src/mod/channels.mod/userchan.c
     src/mod/compress.mod/compress.c src/mod/console.mod/console.c
     src/mod/ctcp.mod/ctcp.c src/mod/dns.mod/coredns.c
     src/mod/dns.mod/dns.c src/mod/filesys.mod/dbcompat.c
     src/mod/filesys.mod/filedb3.c src/mod/filesys.mod/filelist.c
     src/mod/filesys.mod/files.c src/mod/filesys.mod/filesys.c
     src/mod/filesys.mod/tclfiles.c src/mod/irc.mod/chan.c
     src/mod/irc.mod/cmdsirc.c src/mod/irc.mod/irc.c
     src/mod/irc.mod/mode.c src/mod/irc.mod/msgcmds.c
     src/mod/irc.mod/tclirc.c src/mod/notes.mod/cmdsnote.c
     src/mod/notes.mod/notes.c src/mod/seen.mod/seen.c
     src/mod/server.mod/server.c src/mod/server.mod/servmsg.c
     src/mod/server.mod/tclserv.c src/mod/share.mod/share.c
     src/mod/share.mod/uf_features.c src/mod/transfer.mod/transfer.c
     src/mod/wire.mod/wire.c

Log message:

Cleanup of Context(); and Assert(); usage in the core and modules is completed
Doing some testing lastnite, the size of the binary and all modules combined with this patch was 22k smaller when compiled (not that big of a deal; however, there should be quite a bit of CPU saved since we aren't doing 15 odd Context(); calls on certain functions/binds

Jeff

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/UPDATES1.6
diff -u eggdrop1.6/doc/UPDATES1.6:1.44 eggdrop1.6/doc/UPDATES1.6:1.45
--- eggdrop1.6/doc/UPDATES1.6:1.44	Sun Jan 14 21:28:10 2001
+++ eggdrop1.6/doc/UPDATES1.6	Tue Jan 16 11:13:20 2001
@@ -4,6 +4,7 @@
 
 1.6.3
 Found by  Fixed by  What...
+          guppy     cleaned up Context and Assert usage in the modules
 
 1.6.2 (January 14, 2001)
 Found by  Fixed by  What...
Index: eggdrop1.6/src/botcmd.c
diff -u eggdrop1.6/src/botcmd.c:1.17 eggdrop1.6/src/botcmd.c:1.18
--- eggdrop1.6/src/botcmd.c:1.17	Sat Sep  9 12:29:07 2000
+++ eggdrop1.6/src/botcmd.c	Tue Jan 16 11:13:20 2001
@@ -3,7 +3,7 @@
  *   commands that comes across the botnet
  *   userfile transfer and update commands from sharebots
  * 
- * $Id: botcmd.c,v 1.17 2000/09/09 17:29:07 fabian Exp $
+ * $Id: botcmd.c,v 1.18 2001/01/16 17:13:20 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -98,7 +98,6 @@
   char *from, *p;
   int i, chan;
 
-  Context;
   if (bot_flags(dcc[idx].user) & BOT_ISOLATE)
     return;
   from = newsplit(&msg);
@@ -153,7 +152,6 @@
   char *from;
   int i;
 
-  Context;
   if (bot_flags(dcc[idx].user) & BOT_ISOLATE)
     return;
   from = newsplit(&par);
@@ -178,7 +176,6 @@
   char *from, *p;
   int i, chan;
 
-  Context;
   if (bot_flags(dcc[idx].user) & BOT_ISOLATE)
     return;
   from = newsplit(&par);
@@ -225,7 +222,6 @@
   char *from, *p, *to = TBUF, *tobot;
   int i;
 
-  Context;
   from = newsplit(&par);
   tobot = newsplit(&par);
   splitc(to, tobot, '@');
@@ -293,7 +289,6 @@
   char s[1024];
   int users, bots;
 
-  Context;
   bots = bots_in_subtree(findbot(dcc[idx].nick));
   users = users_in_subtree(findbot(dcc[idx].nick));
   simple_sprintf(s, "%s %s. %s (lost %d bot%s and %d user%s)",
@@ -314,7 +309,6 @@
   char s[1024];
   struct chanset_t *c;
 
-  Context;
   strcpy(s, "Channels: ");
   for (c = chanset; c; c = c->next)
     if (!channel_secret(c)) {
@@ -428,7 +422,6 @@
   char *from, *to, *p;
   int i, chan;
 
-  Context;
   from = newsplit(&par);
   p = strchr(from, '@');
   if (!p) {
@@ -467,7 +460,6 @@
   time_t now2;
   int hr, min;
 
-  Context;
   chan = chanset;
   now2 = now - online_since;
   s2[0] = 0;
@@ -515,13 +507,11 @@
 
 static void bot_ping(int idx, char *par)
 {
-  Context;
   botnet_send_pong(idx);
 }
 
 static void bot_pong(int idx, char *par)
 {
-  Context;
   dcc[idx].status &= ~STAT_PINGED;
 }
 
@@ -532,7 +522,6 @@
   char *from, *bot, *rfrom;
   int i;
 
-  Context;
   from = newsplit(&par);
   bot = newsplit(&par);
 
@@ -562,7 +551,6 @@
   char *from, *bot, *rfrom, *p, *undes;
   int i;
 
-  Context;
   from = newsplit(&par);
   bot = newsplit(&par);
   undes = newsplit(&par);
@@ -620,7 +608,6 @@
   char *bot, x;
   int vnum;
 
-  Context;
   bot = newsplit(&par);
   x = par[0];
   if (x)
@@ -643,7 +630,6 @@
   int bogus = 0, i;
   struct userrec *u;
 
-  Context;
   newbot = newsplit(&par);
   next = newsplit(&par);
   s[0] = 0;
@@ -726,7 +712,6 @@
   char s[1024];
   int bots, users;
 
-  Context;
   bots = bots_in_subtree(findbot(dcc[idx].nick));
   users = users_in_subtree(findbot(dcc[idx].nick));
   putlog(LOG_BOTS, "*", "%s", BOT_OLDBOT);
@@ -746,7 +731,6 @@
   int i;
   char *bot;
 
-  Context;
   bot = newsplit(&par);
   i = nextbot(bot);
   if ((i >= 0) && (i != idx))	/* Bot is NOT downstream along idx, so
@@ -769,7 +753,6 @@
   char *from, *dest;
   int i;
 
-  Context;
   from = newsplit(&par);
   dest = newsplit(&par);
   simple_sprintf(TBUF, "%s:%s", par, botnetnick);
@@ -785,7 +768,6 @@
   char *to, *p;
   int i, sock;
 
-  Context;
   to = newsplit(&par);
   p = strchr(to, '@');
   if (p == NULL)
@@ -837,7 +819,6 @@
   struct userrec *u;
   int i;
 
-  Context;
   if (bot_flags(dcc[idx].user) & BOT_ISOLATE)
     return;
   from = newsplit(&par);
@@ -920,7 +901,6 @@
 
 static void bot_thisbot(int idx, char *par)
 {
-  Context;
   if (egg_strcasecmp(par, dcc[idx].nick)) {
     char s[1024];
 
@@ -948,7 +928,6 @@
 {
   struct userrec *u = get_user_by_handle(userlist, dcc[idx].nick);
 
-  Context;
   /* We *don't* want botnet passwords migrating */
   noshare = 1;		
   set_user(&USERENTRY_PASS, u, par);
@@ -963,7 +942,6 @@
   char *from, *to;
   int i;
 
-  Context;
   from = newsplit(&par);
   to = newsplit(&par);
   i = nextbot(from);
@@ -992,7 +970,6 @@
   char *from, *opcode;
   int i;
 
-  Context;
   from = newsplit(&par);
   opcode = newsplit(&par);
 
@@ -1014,8 +991,6 @@
   int i;
   struct flag_record fr = {USER_BOT, 0, 0, 0, 0, 0};
 
-  Context;
-
   who = newsplit(&par);
   if (!par[0] || !egg_strcasecmp(par, botnetnick)) {
     int irc = 0;
@@ -1073,7 +1048,6 @@
   char *path, *to, *tobot, *p;
   int i;
 
-  Context;
   path = newsplit(&par);
   to = newsplit(&par);
   if ((tobot = strchr(to, '@')))
@@ -1106,7 +1080,6 @@
   char *from, *path;
   int i;
 
-  Context;
   from = newsplit(&tobot);
   if ((path = strchr(tobot, ':'))) {
     *path++ = 0;
@@ -1138,7 +1111,6 @@
   int i;
   char *nfn;
 
-  Context;
   botpath = newsplit(&par);
   to = newsplit(&par);
   if ((tobot = strchr(to, '@'))) {
@@ -1174,7 +1146,6 @@
 
 static void bot_error(int idx, char *par)
 {
-  Context;
   putlog(LOG_MISC | LOG_BOTS, "*", "%s: %s", dcc[idx].nick, par);
 }
 
@@ -1185,7 +1156,6 @@
   char *bot, *ssock, *newnick;
   int sock, i;
 
-  Context;
   if (bot_flags(dcc[idx].user) & BOT_ISOLATE)
     return;
   bot = newsplit(&par);
@@ -1221,7 +1191,6 @@
   struct userrec *u;
   int i, sock, chan, i2, linking = 0;
 
-  Context;
   if (bot_flags(dcc[idx].user) & BOT_ISOLATE)
     return;
   bot = newsplit(&par);
@@ -1278,9 +1247,7 @@
     touch_laston(u, TBUF, now);
   }
   i = addparty(bot, nick, chan, y[0], sock, par, &i2);
-  Context;
   botnet_send_join_party(idx, linking, i2, i);
-  Context;
   if (i != chan) {
     if (i >= 0) {
       if (b_numver(idx) >= NEAT_BOTNET)
@@ -1293,7 +1260,6 @@
 		  chan ? "channel" : "party line");
     check_tcl_chjn(bot, nick, chan, y[0], sock, par);
   }
-  Context;
 }
 
 /* part <bot> <nick> <sock> [etc..]
@@ -1305,7 +1271,6 @@
   int sock, partyidx;
   int silent = 0;
 
-  Context;
   if (bot_flags(dcc[idx].user) & BOT_ISOLATE)
     return;
   bot = newsplit(&par);
@@ -1347,7 +1312,6 @@
     botnet_send_part_party(idx, partyidx, par, silent);
     remparty(bot, sock);
   }
-  Context;
 }
 
 /* away <bot> <sock> <message>
@@ -1358,7 +1322,6 @@
   char *bot, *etc;
   int sock, partyidx, linking = 0;
 
-  Context;
   if (bot_flags(dcc[idx].user) & BOT_ISOLATE)
     return;
   bot = newsplit(&par);
@@ -1410,7 +1373,6 @@
   char *bot, *work;
   int sock, idle;
 
-  Context;
   if (bot_flags(dcc[idx].user) & BOT_ISOLATE)
     return;
   bot = newsplit(&par);
@@ -1442,7 +1404,6 @@
 
 static void bot_ufno(int idx, char *par)
 {
-  Context;
   putlog(LOG_BOTS, "*", "%s %s: %s", USERF_REJECTED, dcc[idx].nick, par);
   dcc[idx].status &= ~STAT_OFFERED;
   if (!(dcc[idx].status & STAT_GETTING))
@@ -1451,7 +1412,6 @@
 
 static void bot_old_userfile(int idx, char *par)
 {
-  Context;
   putlog(LOG_BOTS, "*", "%s %s", USERF_OLDSHARE, dcc[idx].nick);
   dprintf(idx, "uf-no %s\n", USERF_ANTIQUESHARE);
 }
@@ -1460,7 +1420,6 @@
 
 void bot_share(int idx, char *par)
 {
-  Context;
   sharein(idx, par);
 }
 
Index: eggdrop1.6/src/botmsg.c
diff -u eggdrop1.6/src/botmsg.c:1.17 eggdrop1.6/src/botmsg.c:1.18
--- eggdrop1.6/src/botmsg.c:1.17	Wed Sep 13 15:49:39 2000
+++ eggdrop1.6/src/botmsg.c	Tue Jan 16 11:13:20 2001
@@ -5,7 +5,7 @@
  * 
  * by Darrin Smith (beldin at light.iinet.net.au)
  * 
- * $Id: botmsg.c,v 1.17 2000/09/13 20:49:39 fabian Exp $
+ * $Id: botmsg.c,v 1.18 2001/01/16 17:13:20 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -373,8 +373,6 @@
 {
   int l;
 
-  Context;
-
   if (tands > 0) {
     l = simple_sprintf(OBUF, "un %s %s\n", bot, args ? args : "");
     send_tand_but(idx, OBUF, l);
@@ -552,7 +550,6 @@
 {
   int l;
 
-  Context;
   if (tands > 0) {
     l = simple_sprintf(OBUF, "i %s %D %D %s\n", bot, sock, idle,
 		       away ? away : "");
@@ -641,7 +638,6 @@
 {
   int l;
 
-  Context;
   if (tands > 0) {
     l = simple_sprintf(OBUF, "j %s%s %s %D %c%D %s\n", linking ? "!" : "",
 		       party[useridx].bot, party[useridx].nick,
Index: eggdrop1.6/src/botnet.c
diff -u eggdrop1.6/src/botnet.c:1.31 eggdrop1.6/src/botnet.c:1.32
--- eggdrop1.6/src/botnet.c:1.31	Fri Oct 27 14:34:54 2000
+++ eggdrop1.6/src/botnet.c	Tue Jan 16 11:13:20 2001
@@ -7,7 +7,7 @@
  *   linking, unlinking, and relaying to another bot
  *   pinging the bots periodically and checking leaf status
  * 
- * $Id: botnet.c,v 1.31 2000/10/27 19:34:54 fabian Exp $
+ * $Id: botnet.c,v 1.32 2001/01/16 17:13:20 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -58,7 +58,6 @@
 
   for (bot = tandbot; bot; bot = bot->next)
     size += sizeof(tand_t);
-  Context;
   size += (maxparty * sizeof(party_t));
   for (i = 0; i < parties; i++) {
     if (party[i].away)
@@ -95,7 +94,6 @@
 {
   tand_t **ptr = &tandbot, *ptr2;
 
-  Context;
   while (*ptr) {
     if (!egg_strcasecmp((*ptr)->bot, who))
       putlog(LOG_BOTS, "*", "!!! Duplicate botnet bot entry!!");
@@ -121,7 +119,6 @@
 {
   tand_t *ptr = findbot(who);
 
-  Context;
   if (ptr) {
     if (share)
       ptr->share = share;
@@ -153,7 +150,6 @@
 {
   int i;
 
-  Context;
   for (i = 0; i < parties; i++) {
     /* Just changing the channel of someone already on? */
     if (!egg_strcasecmp(party[i].bot, bot) &&
@@ -310,7 +306,6 @@
 {
   tand_t **ptr = &tandbot, *ptr2;
 
-  Context;
   while (*ptr) {
     if (!egg_strcasecmp((*ptr)->bot, who))
       break;
@@ -333,7 +328,6 @@
 {
   int i;
 
-  Context;
   for (i = 0; i < parties; i++)
     if ((!egg_strcasecmp(party[i].bot, bot)) &&
 	(party[i].sock == sock)) {
@@ -436,7 +430,6 @@
   char c, idle[40], spaces2[33] = "                               ";
   int i, len, len2;
 
-  Context;
   if (chan == (-1))
     dprintf(idx, "%s (+: %s, *: %s)\n", BOT_BOTNETUSERS, BOT_PARTYLINE,
 	    BOT_LOCALCHAN);
@@ -723,7 +716,6 @@
   char x[1024];
   tand_t *bot;
 
-  Context;
   for (bot = tandbot; bot; bot = bot->next) {
     char *p;
 
@@ -741,7 +733,6 @@
 			 bot->share, bot->ver);
     tputs(dcc[z].sock, x, l);
   }
-  Context;
   if (!(bot_flags(dcc[z].user) & BOT_ISOLATE)) {
     /* Dump party line members */
     for (i = 0; i < dcc_total; i++) {
@@ -779,7 +770,6 @@
 	}
       }
     }
-    Context;
     for (i = 0; i < parties; i++) {
 #ifndef NO_OLD_BOTNET
       if (b_numver(z) < NEAT_BOTNET)
@@ -813,7 +803,6 @@
       }
     }
   }
-  Context;
 }
 
 int in_chain(char *who)
@@ -830,16 +819,13 @@
   int nr = 1;
   tand_t *b;
 
-  Context;
   if (!bot)
     return 0;
   for (b = tandbot; b; b = b->next) {
-    Context;
     if (b->bot && (b->uplink == bot)) {
       nr += bots_in_subtree(b);
     }
   }
-  Context;
   return nr;
 }
 
@@ -848,7 +834,6 @@
   int i, nr;
   tand_t *b;
 
-  Context;
   nr = 0;
   if (!bot)
     return 0;
@@ -858,7 +843,6 @@
   for (b = tandbot; b; b = b->next)
     if (b->bot && (b->uplink == bot))
       nr += users_in_subtree(b);
-  Context;
   return nr;
 }
 
@@ -871,7 +855,6 @@
   int bots, users;
   tand_t *bot;
 
-  Context;
   if (nick[0] == '*')
     dprintf(idx, "%s\n", BOT_UNLINKALL);
   for (i = 0; i < dcc_total; i++) {
@@ -901,8 +884,6 @@
       } else if (dcc[i].type == &DCC_BOT) {
 	char s[1024];
 
-	Context;
-
 	if (idx >= 0)
 	  dprintf(idx, "%s %s.\n", BOT_BREAKLINK, dcc[i].nick);
 	else if ((idx == -3) && (b_status(i) & STAT_SHARE) && !share_unlinks)
@@ -931,7 +912,6 @@
       }
     }
   }
-  Context;
   if (idx >= 0 && nick[0] != '*')
     dprintf(idx, "%s\n", BOT_NOTCONNECTED);
   if (nick[0] != '*') {
@@ -983,7 +963,6 @@
   struct userrec *u;
   register int i;
 
-  Context;
   u = get_user_by_handle(userlist, nick);
   if (!u || !(u->flags & USER_BOT)) {
     if (idx >= 0)
@@ -1015,7 +994,6 @@
       if (idx >= 0)
 	dprintf(idx, "%s\n", DCC_TOOMANYDCCS1);
     } else {
-      Context;
       correct_handle(nick);
 
       if (idx > -2)
@@ -1076,7 +1054,6 @@
 {
   int uidx = (-1), i;
 
-  Context;
   for (i = 0; i < dcc_total; i++)
     if ((dcc[i].type == &DCC_PRE_RELAY) &&
 	(dcc[i].u.relay->sock == dcc[idx].sock))
@@ -1124,7 +1101,6 @@
   struct bot_addr *bi;
   struct chat_info *ci;
 
-  Context;
   u = get_user_by_handle(userlist, nick);
   if (!u || !(u->flags & USER_BOT)) {
     dprintf(idx, "%s %s\n", nick, BOT_BOTUNKNOWN);
@@ -1186,7 +1162,6 @@
   struct chat_info *ci;
   register int uidx = (-1), i;
 
-  Context;
   for (i = 0; i < dcc_total; i++)
     if ((dcc[i].type == &DCC_PRE_RELAY) &&
 	(dcc[i].u.relay->sock == dcc[idx].sock)) {
@@ -1208,14 +1183,12 @@
   dcc[uidx].type = &DCC_CHAT;
   killsock(dcc[idx].sock);
   lostdcc(idx);
-  Context;
 }
 
 static void tandem_relay_resolve_success(int i)
 {
   int sock = dcc[i].u.dns->ibuf;
 
-  Context;
   dcc[i].addr = dcc[i].u.dns->ip;
   changeover_dcc(i, &DCC_FORK_RELAY, sizeof(struct relay_info));
   dcc[i].u.relay->chat = get_data_ptr(sizeof(struct chat_info));
@@ -1241,7 +1214,6 @@
 {
   register int tidx = (-1);
 
-  Context;
   for (i = 0; i < dcc_total; i++)
     if ((dcc[i].type == &DCC_FORK_RELAY) &&
 	(dcc[i].u.relay->sock == dcc[idx].sock)) {
@@ -1264,7 +1236,6 @@
     lostdcc(idx);
     return;
   }
-  Context;
   if (!egg_strcasecmp(buf, "*bye*")) {
     /* Disconnect */
     struct chat_info *ci = dcc[idx].u.relay->chat;
@@ -1281,7 +1252,6 @@
     lostdcc(tidx);
     return;
   }
-  Context;
 }
 
 /* User disconnected before her relay had finished connecting
@@ -1290,7 +1260,6 @@
 {
   register int tidx = (-1), i;
 
-  Context;
   for (i = 0; i < dcc_total; i++)
     if ((dcc[i].type == &DCC_FORK_RELAY) &&
 	(dcc[i].u.relay->sock == dcc[idx].sock)) {
@@ -1337,7 +1306,6 @@
   register int uidx = (-1);
   struct relay_info *ri;
 
-  Context;
   for (i = 0; i < dcc_total; i++)
     if ((dcc[i].type == &DCC_PRE_RELAY) &&
 	(dcc[i].u.relay->sock == dcc[idx].sock))
@@ -1399,7 +1367,6 @@
   if (dcc[j].u.chat->channel >= 0) {
     chanout_but(-1, dcc[j].u.chat->channel, "*** %s %s.\n",
 		dcc[j].nick, BOT_PARTYREJOINED);
-    Context;
     if (dcc[j].u.chat->channel < 100000)
       botnet_send_join_idx(j, -1);
   }
@@ -1491,7 +1458,6 @@
   if (dcc[idx].u.relay->chat->channel >= 0) {
     chanout_but(-1, dcc[idx].u.relay->chat->channel,
 		"*** %s joined the party line.\n", dcc[idx].nick);
-    Context;
     if (dcc[idx].u.relay->chat->channel < 100000)
       botnet_send_join_idx(idx, -1);
   }
@@ -1620,7 +1586,6 @@
   int bots, users;
   tand_t *bot;
 
-  Context;
   for (i = 0; i < dcc_total; i++)
     if (dcc[i].type == &DCC_BOT)
       if (dcc[i].status & STAT_PINGED) {
@@ -1638,13 +1603,11 @@
 	killsock(dcc[i].sock);
 	lostdcc(i);
       }
-  Context;
   for (i = 0; i < dcc_total; i++)
     if (dcc[i].type == &DCC_BOT) {
       botnet_send_ping(i);
       dcc[i].status |= STAT_PINGED;
     }
-  Context;
   for (i = 0; i < dcc_total; i++)
     if ((dcc[i].type == &DCC_BOT) && (dcc[i].status & STAT_LEAF)) {
       tand_t *bot, *via = findbot(dcc[i].nick);
@@ -1678,7 +1641,6 @@
 	  dcc[i].status &= ~STAT_WARNED;
       }
     }
-  Context;
 }
 
 void zapfbot(int idx)
@@ -1704,7 +1666,6 @@
   int i;
 
   /* Dump party line members */
-  Context;
   for (i = 0; i < dcc_total; i++) {
     if (dcc[i].type == &DCC_CHAT) {
       check_tcl_chon(dcc[i].nick, dcc[i].sock);
@@ -1716,5 +1677,4 @@
     check_tcl_chjn(party[i].bot, party[i].nick, party[i].chan,
 		   party[i].flag, party[i].sock, party[i].from);
   }
-  Context;
 }
Index: eggdrop1.6/src/mod/assoc.mod/assoc.c
diff -u eggdrop1.6/src/mod/assoc.mod/assoc.c:1.11 eggdrop1.6/src/mod/assoc.mod/assoc.c:1.12
--- eggdrop1.6/src/mod/assoc.mod/assoc.c:1.11	Sun Nov  5 22:06:42 2000
+++ eggdrop1.6/src/mod/assoc.mod/assoc.c	Tue Jan 16 11:13:21 2001
@@ -2,7 +2,7 @@
  * assoc.c -- part of assoc.mod
  *   the assoc code, moved here mainly from botnet.c for module work
  * 
- * $Id: assoc.c,v 1.11 2000/11/06 04:06:42 guppy Exp $
+ * $Id: assoc.c,v 1.12 2001/01/16 17:13:21 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -62,7 +62,6 @@
   assoc_t *a = assoc;
   int size = 0;
 
-  Context;
   while (a != NULL) {
     size += sizeof(assoc_t);
     a = a->next;
@@ -79,7 +78,6 @@
     assoc_t *a = assoc;
 
     if (!(bot_flags(dcc[idx].user) & BOT_ISOLATE)) {
-      Context;
       while (a != NULL) {
 	if (a->name[0]) {
           simple_sprintf(x, "assoc %D %s %s", (int) a->channel, botnetnick,
@@ -96,7 +94,6 @@
 {
   assoc_t *a = assoc, *last = NULL;
 
-  Context;
   while (a != NULL) {
     if (a->channel == chan) {
       if (last != NULL)
@@ -116,7 +113,6 @@
 {
   assoc_t *a = assoc, *x;
 
-  Context;
   while (a != NULL) {
     x = a;
     a = a->next;
@@ -129,7 +125,6 @@
 {
   assoc_t *a = assoc, *b, *old = NULL;
 
-  Context;
   while (a != NULL) {
     if (name[0] != 0 && !egg_strcasecmp(a->name, name)) {
       kill_assoc(a->channel);
@@ -177,7 +172,6 @@
 {
   assoc_t *a = assoc;
 
-  Context;
   while (a != NULL) {
     if (!egg_strcasecmp(a->name, name))
       return a->channel;
@@ -190,7 +184,6 @@
 {
   assoc_t *a = assoc;
 
-  Context;
   while (a != NULL) {
     if (a->channel == chan)
       return a->name;
@@ -203,7 +196,6 @@
 {
   assoc_t *a = assoc;
 
-  Context;
   if (a == NULL) {
     dprintf(idx, "%s\n", ASSOC_NOCHNAMES);
     return;
@@ -223,7 +215,6 @@
   char *num;
   int chan;
 
-  Context;
   if (!par[0]) {
     putlog(LOG_CMDS, "*", "#%s# assoc", dcc[idx].nick);
     dump_assoc(idx);
@@ -286,7 +277,6 @@
 static int tcl_killassoc STDVAR {
   int chan;
 
-  Context;
   BADARGS(2, 2, " chan");
   if (argv[1][0] == '&')
     kill_all_assoc();
@@ -306,7 +296,6 @@
   int chan;
   char name[21], *p;
 
-  Context;
   BADARGS(2, 3, " chan ?name?");
   if ((argc == 2) && ((argv[1][0] < '0') || (argv[1][0] > '9'))) {
     chan = get_assoc(argv[1]);
@@ -344,7 +333,6 @@
   char *s, *s1, *nick;
   int linking = 0, chan;
 
-  Context;
   if ((idx >= 0) && !(bot_flags(dcc[idx].user) & BOT_ISOLATE)) {
     if (!egg_strcasecmp(dcc[idx].nick, botnick))
       linking = b_status(idx) & STAT_LINKING;
@@ -379,7 +367,6 @@
   assoc_t *a = assoc;
   int size = 0, count = 0;;
 
-  Context;
   if (details) {
     while (a != NULL) {
       count++;
@@ -417,7 +404,6 @@
 
 static char *assoc_close()
 {
-  Context;
   kill_all_assoc();
   rem_builtins(H_dcc, mydcc);
   rem_builtins(H_bot, mybot);
@@ -443,7 +429,6 @@
 {
   global = global_funcs;
 
-  Context;
   module_register(MODULE_NAME, assoc_table, 2, 0);
   if (!module_depend(MODULE_NAME, "eggdrop", 106, 0)) {
     module_undepend(MODULE_NAME);
Index: eggdrop1.6/src/mod/blowfish.mod/blowfish.c
diff -u eggdrop1.6/src/mod/blowfish.mod/blowfish.c:1.14 eggdrop1.6/src/mod/blowfish.mod/blowfish.c:1.15
--- eggdrop1.6/src/mod/blowfish.mod/blowfish.c:1.14	Sun Nov  5 22:06:42 2000
+++ eggdrop1.6/src/mod/blowfish.mod/blowfish.c	Tue Jan 16 11:13:21 2001
@@ -2,7 +2,7 @@
  * blowfish.c -- part of blowfish.mod
  *   encryption and decryption of passwords
  * 
- * $Id: blowfish.c,v 1.14 2000/11/06 04:06:42 guppy Exp $
+ * $Id: blowfish.c,v 1.15 2001/01/16 17:13:21 guppy Exp $
  */
 /* 
  * Copyright (C) 1999  Eggheads
@@ -63,7 +63,6 @@
 {
   int i, tot = 0;
 
-  Context;
   for (i = 0; i < BOXES; i++)
     if (box[i].P != NULL) {
       tot += ((bf_N + 2) * sizeof(u_32bit_t));
@@ -470,7 +469,6 @@
       box[i].key[0] = 0;
       box[i].lastuse = 0L;
     }
-    Context;
     module_register(MODULE_NAME, blowfish_table, 2, 0);
     if (!module_depend(MODULE_NAME, "eggdrop", 106, 0)) {
       module_undepend(MODULE_NAME);
Index: eggdrop1.6/src/mod/channels.mod/channels.c
diff -u eggdrop1.6/src/mod/channels.mod/channels.c:1.45 eggdrop1.6/src/mod/channels.mod/channels.c:1.46
--- eggdrop1.6/src/mod/channels.mod/channels.c:1.45	Sun Dec 17 15:37:46 2000
+++ eggdrop1.6/src/mod/channels.mod/channels.c	Tue Jan 16 11:13:21 2001
@@ -2,7 +2,7 @@
  * channels.c -- part of channels.mod
  *   support for channels within the bot
  * 
- * $Id: channels.c,v 1.45 2000/12/17 21:37:46 guppy Exp $
+ * $Id: channels.c,v 1.46 2001/01/16 17:13:21 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -374,7 +374,6 @@
   struct chanset_t *chan;
   struct udef_struct *ul;
 
-  Context;
   if (!chanfile[0])
     return;
   sprintf(s, "%s~new", chanfile);
@@ -687,7 +686,6 @@
   int tot = 0, i;
   struct chanset_t *chan = chanset;
 
-  Context;
   while (chan != NULL) {
     tot += sizeof(struct chanset_t);
 
@@ -722,7 +720,6 @@
   int items;
   char **item;
 
-  Context;
   if (flags & (TCL_TRACE_READS | TCL_TRACE_UNSETS)) {
     Tcl_SetVar2(interp, name1, name2, glob_chanset, TCL_GLOBAL_ONLY);
     if (flags & TCL_TRACE_UNSETS)
@@ -732,13 +729,11 @@
   } else { /* Write */
     s = Tcl_GetVar2(interp, name1, name2, TCL_GLOBAL_ONLY);
     Tcl_SplitList(interp, s, &items, &item);
-    Context;
     for (i = 0; i<items; i++) {
       if (!(item[i]) || (strlen(item[i]) < 2)) continue;
       s = glob_chanset;
       while (s[0]) {
 	t = strchr(s, ' '); /* Can't be NULL coz of the extra space */
-	Context;
 	t[0] = 0;
 	if (!strcmp(s + 1, item[i] + 1)) {
 	  s[0] = item[i][0]; /* +- */
@@ -791,7 +786,6 @@
 
 static char *channels_close()
 {
-  Context;
   write_channels();
   free_udef(udef);
   rem_builtins(H_chon, my_chon);
@@ -913,7 +907,6 @@
 +dontkickops -inactive -protectfriends +shared -seen \
 +userexempts +dynamicexempts +userinvites +dynamicinvites -revengebot \
 -nodesynch" /* Do not remove this extra space: */ " ");
-  Context;
   module_register(MODULE_NAME, channels_table, 1, 0);
   if (!module_depend(MODULE_NAME, "eggdrop", 106, 0)) {
     module_undepend(MODULE_NAME);
Index: eggdrop1.6/src/mod/channels.mod/cmdschan.c
diff -u eggdrop1.6/src/mod/channels.mod/cmdschan.c:1.39 eggdrop1.6/src/mod/channels.mod/cmdschan.c:1.40
--- eggdrop1.6/src/mod/channels.mod/cmdschan.c:1.39	Tue Dec  5 20:45:37 2000
+++ eggdrop1.6/src/mod/channels.mod/cmdschan.c	Tue Jan 16 11:13:21 2001
@@ -2,7 +2,7 @@
  * cmdschan.c -- part of channels.mod
  *   commands from a user via dcc that cause server interaction
  *
- * $Id: cmdschan.c,v 1.39 2000/12/06 02:45:37 guppy Exp $
+ * $Id: cmdschan.c,v 1.40 2001/01/16 17:13:21 guppy Exp $
  */
 /*
  * Copyright (C) 1997  Robey Pointer
@@ -991,7 +991,6 @@
   struct userrec *u1;
   struct chanuserrec *chanrec;
 
-  Context;
   if (!par[0]) {
     dprintf(idx, "Usage: +chrec <user> [channel]\n");
     return;
@@ -1038,7 +1037,6 @@
   struct userrec *u1;
   struct chanuserrec *chanrec;
 
-  Context;
   if (!par[0]) {
     dprintf(idx, "Usage: -chrec <user> [channel]\n");
     return;
Index: eggdrop1.6/src/mod/channels.mod/tclchan.c
diff -u eggdrop1.6/src/mod/channels.mod/tclchan.c:1.41 eggdrop1.6/src/mod/channels.mod/tclchan.c:1.42
--- eggdrop1.6/src/mod/channels.mod/tclchan.c:1.41	Tue Dec 19 15:56:40 2000
+++ eggdrop1.6/src/mod/channels.mod/tclchan.c	Tue Jan 16 11:13:21 2001
@@ -1,7 +1,7 @@
 /* 
  * tclchan.c -- part of channels.mod
  * 
- * $Id: tclchan.c,v 1.41 2000/12/19 21:56:40 guppy Exp $
+ * $Id: tclchan.c,v 1.42 2001/01/16 17:13:21 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -1328,7 +1328,6 @@
 
 static int tcl_savechannels STDVAR
 {
-  Context;
   BADARGS(1, 1, "");
   if (!chanfile[0]) {
     Tcl_AppendResult(irp, "no channel file");
@@ -1340,7 +1339,6 @@
 
 static int tcl_loadchannels STDVAR
 {
-  Context;
   BADARGS(1, 1, "");
   if (!chanfile[0]) {
     Tcl_AppendResult(irp, "no channel file");
@@ -1437,7 +1435,6 @@
 {
   struct userrec *u;
 
-  Context;
   BADARGS(3, 3, " handle channel");
   u = get_user_by_handle(userlist, argv[1]);
   if (!u) {
@@ -1461,7 +1458,6 @@
 {
   struct userrec *u;
 
-  Context;
   BADARGS(3, 3, " handle channel");
   u = get_user_by_handle(userlist, argv[1]);
   if (!u) {
@@ -1566,7 +1562,6 @@
 
   if (!newname || !newname[0] || !strchr(CHANMETA, newname[0]))
     return TCL_ERROR;
-  Context;
   convert_element(glob_chanmode, buf2);
   simple_sprintf(buf, "chanmode %s ", buf2);
   strncat(buf, glob_chanset, 2047 - strlen(buf));
@@ -1574,7 +1569,6 @@
   buf[2047] = 0;
   if (Tcl_SplitList(NULL, buf, &items, &item) != TCL_OK)
     return TCL_ERROR;
-  Context;
   if ((chan = findchan_by_dname(newname))) {
     /* Already existing channel, maybe a reload of the channel file */
     chan->status &= ~CHAN_FLAGGED;	/* don't delete me! :) */
@@ -1637,7 +1631,6 @@
 {
   int type;
   
-  Context;
   BADARGS(3, 3, " type name");
   if (!egg_strcasecmp(argv[1], "flag"))
     type = UDEF_FLAG;
@@ -1656,7 +1649,6 @@
   struct udef_struct *ul;
   int type, found = 0;
   
-  Context;
   BADARGS(4, 4, " type oldname newname");
   if (!egg_strcasecmp(argv[1], "flag"))
     type = UDEF_FLAG;
@@ -1686,7 +1678,6 @@
   struct udef_struct *ul, *ull;
   int type, found = 0;
   
-  Context;
   BADARGS(3, 3, " type name");
   if (!egg_strcasecmp(argv[1], "flag"))
     type = UDEF_FLAG;
@@ -1720,7 +1711,6 @@
       found = 1;
     }
   }
-  Context;
   if (!found) {
     Tcl_AppendResult(irp, "not found", NULL);
     return TCL_ERROR;
Index: eggdrop1.6/src/mod/channels.mod/userchan.c
diff -u eggdrop1.6/src/mod/channels.mod/userchan.c:1.21 eggdrop1.6/src/mod/channels.mod/userchan.c:1.22
--- eggdrop1.6/src/mod/channels.mod/userchan.c:1.21	Tue Dec  5 20:35:18 2000
+++ eggdrop1.6/src/mod/channels.mod/userchan.c	Tue Jan 16 11:13:21 2001
@@ -1,7 +1,7 @@
 /* 
  * userchan.c -- part of channels.mod
  * 
- * $Id: userchan.c,v 1.21 2000/12/06 02:35:18 guppy Exp $
+ * $Id: userchan.c,v 1.22 2001/01/16 17:13:21 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -762,7 +762,6 @@
   maskrec *u;
 
   /* Was a channel given? */
-  Context;
   if (match[0]) {
     chname = newsplit(&match);
     if (chname[0] && (strchr(CHANMETA, chname[0]) != NULL)) {
@@ -782,7 +781,6 @@
 	    MODES_NOTACTIVE, chan->dname);
   else
     dprintf(idx, "%s:\n", BANS_GLOBAL);
-  Context;
   for (u = global_bans; u; u = u->next) {
     if (match[0]) {
       if ((wild_match(match, u->mask)) ||
@@ -855,7 +853,6 @@
   maskrec *u;
   
   /* Was a channel given? */
-  Context;
   if (match[0]) {
     chname = newsplit(&match);
     if (chname[0] && strchr(CHANMETA, chname[0])) {
@@ -875,7 +872,6 @@
 	    MODES_NOTACTIVE, chan->dname);
   else
     dprintf(idx, "%s:\n", EXEMPTS_GLOBAL);
-  Context;
   for (u = global_exempts; u; u = u->next) {
     if (match[0]) {
       if ((wild_match(match, u->mask)) ||
@@ -949,7 +945,6 @@
   maskrec *u;
   
   /* Was a channel given? */
-  Context;
   if (match[0]) {
     chname = newsplit(&match);
     if (chname[0] && strchr(CHANMETA, chname[0])) {
@@ -969,7 +964,6 @@
 	    MODES_NOTACTIVE, chan->dname);
   else
     dprintf(idx, "%s:\n", INVITES_GLOBAL);
-  Context;
   for (u = global_invites; u; u = u->next) {
     if (match[0]) {
       if ((wild_match(match, u->mask)) ||
Index: eggdrop1.6/src/mod/compress.mod/compress.c
diff -u eggdrop1.6/src/mod/compress.mod/compress.c:1.7 eggdrop1.6/src/mod/compress.mod/compress.c:1.8
--- eggdrop1.6/src/mod/compress.mod/compress.c:1.7	Sun Nov  5 22:06:42 2000
+++ eggdrop1.6/src/mod/compress.mod/compress.c	Tue Jan 16 11:13:21 2001
@@ -6,7 +6,7 @@
  * Written by Fabian Knittel <fknittel at gmx.de>. Based on zlib examples
  * by Jean-loup Gailly and Miguel Albrecht.
  * 
- * $Id: compress.c,v 1.7 2000/11/06 04:06:42 guppy Exp $
+ * $Id: compress.c,v 1.8 2001/01/16 17:13:21 guppy Exp $
  */
 /* 
  * Copyright (C) 2000  Eggheads
@@ -75,7 +75,6 @@
   FILE		 *fin;
   register int    len1, len2, i;
 
-  Context;
   egg_memset(buf1, 0, 50);
   egg_memset(buf2, 0, 50);
   if (!is_file(filename))
@@ -125,7 +124,6 @@
   int len;
   FILE *fin, *fout;
 
-  Context;
   if (!is_file(f_src)) {
     putlog(LOG_MISC, "*", "Failed to uncompress file `%s': not a file.",
 	   f_src);
@@ -193,7 +191,6 @@
     char	 *buf;
     struct stat	  st;
 
-    Context;
     /* Find out size of file */
     if (fstat(ifd, &st) < 0)
       return COMPF_ERROR;
@@ -226,7 +223,6 @@
   FILE *fin, *fout;
   int   len;
 
-  Context;
   adjust_mode_num(&mode_num);
   egg_snprintf(mode, sizeof mode, "wb%d", mode_num);
 
@@ -294,7 +290,6 @@
   char *temp_fn, randstr[5];
   int   ret;
 
-  Context;
   /* Create temporary filename. */
   temp_fn = nmalloc(strlen(filename) + 5);
   make_rand_str(randstr, 4);
@@ -321,7 +316,6 @@
   char *temp_fn, randstr[5];
   int   ret;
 
-  Context;
   /* Create temporary filename. */
   temp_fn = nmalloc(strlen(filename) + 5);
   make_rand_str(randstr, 4);
@@ -396,15 +390,12 @@
 
 static char *compress_close()
 {
-  Context;
   rem_help_reference("compress.help");
   rem_tcl_commands(my_tcl_cmds);
   rem_tcl_ints(my_tcl_ints);
   uff_deltable(compress_uff_table);
 
-  Context;
   module_undepend(MODULE_NAME);
-  Context;
   return NULL;
 }
 
@@ -429,13 +420,11 @@
 char *compress_start(Function *global_funcs)
 {
   global = global_funcs;
-  Context;
   compressed_files	= 0;
   uncompressed_files	= 0;
   share_compressed	= 0;
   compress_level	= 9;
 
-  Context;
   module_register(MODULE_NAME, compress_table, 1, 1);
   if (!module_depend(MODULE_NAME, "eggdrop", 106, 0)) {
     module_undepend(MODULE_NAME);
@@ -447,12 +436,9 @@
     return "You need share module version 2.3 to use the compress module.";
   }
 
-  Context;
   uff_addtable(compress_uff_table);
   add_tcl_ints(my_tcl_ints);
   add_tcl_commands(my_tcl_cmds);
   add_help_reference("compress.help");
-
-  Context;
   return NULL;
 }
Index: eggdrop1.6/src/mod/console.mod/console.c
diff -u eggdrop1.6/src/mod/console.mod/console.c:1.17 eggdrop1.6/src/mod/console.mod/console.c:1.18
--- eggdrop1.6/src/mod/console.mod/console.c:1.17	Sun Nov  5 22:06:43 2000
+++ eggdrop1.6/src/mod/console.mod/console.c	Tue Jan 16 11:13:22 2001
@@ -3,7 +3,7 @@
  *   saved console settings based on console.tcl
  *   by cmwagner/billyjoe/D. Senso
  * 
- * $Id: console.c,v 1.17 2000/11/06 04:06:43 guppy Exp $
+ * $Id: console.c,v 1.18 2001/01/16 17:13:22 guppy Exp $
  */
 /* 
  * Copyright (C) 1999, 2000  Eggheads
@@ -51,9 +51,6 @@
   struct console_info *ci = user_malloc(sizeof(struct console_info));
   char *par, *arg;
 
-  Context;
-  Assert(e);
-  Assert(e->name);
   par = e->u.list->extra;
   arg = newsplit(&par);
   ci->channel = user_malloc(strlen(arg) + 1);
@@ -79,10 +76,6 @@
   struct console_info *ci;
   int l;
 
-  Assert(e);
-  Assert(e->u.extra);
-  Assert(!e->name);
-
   ci = (struct console_info *) e->u.extra;
 
   l = simple_sprintf(work, "%s %s %s %d %d %d",
@@ -104,7 +97,6 @@
 {
   struct console_info *i = e->u.extra;
 
-  Context;
   nfree(i->channel);
   nfree(i);
   nfree(e);
@@ -116,7 +108,6 @@
 {
   struct console_info *i = e->u.extra;
 
-  Context;
   if (fprintf(f, "--CONSOLE %s %s %s %d %d %d\n",
 	      i->channel, masktype(i->conflags),
 	      stripmasktype(i->stripflags), i->echoflags,
@@ -134,12 +125,9 @@
 
   if (ci != buf) {
     if (ci) {
-      Assert(ci->channel);
       nfree(ci->channel);
       nfree(ci);
     }
-    Context;
-
     ci = e->u.extra = buf;
   }
 
@@ -202,7 +190,6 @@
 {
   struct console_info *i = e->u.extra;
 
-  Context;
   return sizeof(struct console_info) + strlen(i->channel) + 1;
 }
 
@@ -210,7 +197,6 @@
 {
   struct console_info *i = e->u.extra;
 
-  Context;
   if (dcc[idx].user && (dcc[idx].user->flags & USER_MASTER)) {
     dprintf(idx, "  %s\n", CONSOLE_SAVED_SETTINGS);
     dprintf(idx, "    %s %s\n", CONSOLE_CHANNEL, i->channel);
@@ -367,7 +353,6 @@
 
 static char *console_close()
 {
-  Context;
   rem_builtins(H_chon, mychon);
   rem_builtins(H_dcc, mydcc);
   rem_tcl_ints(myints);
@@ -393,7 +378,6 @@
 {
   global = global_funcs;
 
-  Context;
   module_register(MODULE_NAME, console_table, 1, 1);
   if (!module_depend(MODULE_NAME, "eggdrop", 106, 0)) {
     module_undepend(MODULE_NAME);
Index: eggdrop1.6/src/mod/ctcp.mod/ctcp.c
diff -u eggdrop1.6/src/mod/ctcp.mod/ctcp.c:1.10 eggdrop1.6/src/mod/ctcp.mod/ctcp.c:1.11
--- eggdrop1.6/src/mod/ctcp.mod/ctcp.c:1.10	Sun Nov  5 22:06:43 2000
+++ eggdrop1.6/src/mod/ctcp.mod/ctcp.c	Tue Jan 16 11:13:22 2001
@@ -2,7 +2,7 @@
  * ctcp.c -- part of ctcp.mod
  *   all the ctcp handling (except DCC, it's special ;)
  * 
- * $Id: ctcp.c,v 1.10 2000/11/06 04:06:43 guppy Exp $
+ * $Id: ctcp.c,v 1.11 2001/01/16 17:13:22 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -217,7 +217,6 @@
 {
   global = global_funcs;
 
-  Context;
   module_register(MODULE_NAME, ctcp_table, 1, 0);
   if (!module_depend(MODULE_NAME, "eggdrop", 106, 0)) {
     module_undepend(MODULE_NAME);
Index: eggdrop1.6/src/mod/dns.mod/coredns.c
diff -u eggdrop1.6/src/mod/dns.mod/coredns.c:1.17 eggdrop1.6/src/mod/dns.mod/coredns.c:1.18
--- eggdrop1.6/src/mod/dns.mod/coredns.c:1.17	Sun Nov  5 04:31:10 2000
+++ eggdrop1.6/src/mod/dns.mod/coredns.c	Tue Jan 16 11:13:22 2001
@@ -5,7 +5,7 @@
  * 
  * Modified/written by Fabian Knittel <fknittel at gmx.de>
  * 
- * $Id: coredns.c,v 1.17 2000/11/05 10:31:10 fabian Exp $
+ * $Id: coredns.c,v 1.18 2001/01/16 17:13:22 guppy Exp $
  */
 /* 
  * Portions copyright (C) 1999, 2000  Eggheads
@@ -199,7 +199,6 @@
     u_32bit_t seconds, minutes, hours;
     long day;
 
-    Context;
     if ((diff = labs(signeddiff))) {
 	seconds = diff % 60;
 	diff /= 60;
@@ -273,7 +272,6 @@
     struct resolve *rp;
     u_32bit_t bashnum;
 
-    Context;
     bashnum = getidbash(addrp->id);
     rp = idbash[bashnum];
     if (rp) {
@@ -306,7 +304,6 @@
 {
     u_32bit_t bashnum;
 
-    Context;
     bashnum = getidbash(rp->id);
     if (idbash[bashnum] == rp) {
 	if (rp->previousid)
@@ -328,7 +325,6 @@
     u_32bit_t bashnum;
     int ret;
 
-    Context;
     bashnum = gethostbash(addrp->hostn);
     rp = hostbash[bashnum];
     if (rp) {
@@ -364,7 +360,6 @@
 {
     u_32bit_t bashnum;
 
-    Context;
     bashnum = gethostbash(rp->hostn);
     if (hostbash[bashnum] == rp) {
 	if (rp->previoushost)
@@ -386,7 +381,6 @@
     struct resolve *rp;
     u_32bit_t bashnum;
 
-    Context;
     bashnum = getipbash(addrp->ip);
     rp = ipbash[bashnum];
     if (rp) {
@@ -419,7 +413,6 @@
 {
     u_32bit_t bashnum;
 
-    Context;
     bashnum = getipbash(rp->ip);
     if (ipbash[bashnum] == rp) {
 	if (rp->previousip)
@@ -440,7 +433,6 @@
 {
     struct resolve *irp;
 
-    Context;
     if (expireresolves) {
 	irp = expireresolves;
 	while ((irp->next) && (rp->expiretime >= irp->expiretime))
@@ -469,7 +461,6 @@
  */
 static void untieresolve(struct resolve *rp)
 {
-    Context;
     if (rp->previous)
 	rp->previous->next = rp->next;
     else
@@ -483,7 +474,7 @@
  */
 static void unlinkresolve(struct resolve *rp)
 {
-    Context;
+
     untieresolve(rp);		/* Not really needed. Left in to be on the
 				   safe side. */
     unlinkresolveid(rp);
@@ -491,7 +482,6 @@
     if (rp->hostn)
 	unlinkresolvehost(rp);
     nfree(rp);
-    Context;
 }
 
 /* Find request structure using the id.
@@ -501,7 +491,6 @@
     struct resolve *rp;
     int bashnum;
 
-    Context;
     bashnum = getidbash(id);
     rp = idbash[bashnum];
     if (rp) {
@@ -525,7 +514,6 @@
     struct resolve *rp;
     int bashnum;
 
-    Context;
     bashnum = gethostbash(hostn);
     rp = hostbash[bashnum];
     if (rp) {
@@ -552,7 +540,6 @@
     struct resolve *rp;
     u_32bit_t bashnum;
 
-    Context;
     bashnum = getipbash(ip);
     rp = ipbash[bashnum];
     if (rp) {
@@ -582,7 +569,6 @@
     int r, i;
     u_8bit_t buf[(MAX_PACKETSIZE / sizeof(char)) + 1];
 
-    Context;
     r = res_mkquery(QUERY, s, C_IN, type, NULL, 0, NULL, buf,
 		    MAX_PACKETSIZE);
     if (r == -1) {
@@ -601,7 +587,6 @@
  */
 static void resendrequest(struct resolve *rp, int type)
 {
-    Context;
     rp->sends++;
     /* Update expire time */
     rp->expiretime = now + (RES_RETRYDELAY * rp->sends);
@@ -627,7 +612,6 @@
  */
 static void sendrequest(struct resolve *rp, int type)
 {
-    Context;
     /* Create unique id */
     do {
 	idseed = (((idseed + idseed) | (long) time(NULL))
@@ -644,7 +628,6 @@
  */
 static void failrp(struct resolve *rp, int type)
 {
-    Context;
     if (rp->state == STATE_FINISHED)
 	return;
     rp->expiretime = now + RES_FAILEDDELAY;
@@ -663,7 +646,6 @@
  */
 static void passrp(struct resolve *rp, long ttl, int type)
 {
-    Context;
     rp->state = STATE_FINISHED;
 
     /* Do not cache entries for too long. */
@@ -693,7 +675,6 @@
     u_16bit_t rr, datatype, class, qdatatype, qclass;
     u_8bit_t rdatalength;
 
-    Context;
     if (l < sizeof(packetheader)) {
 	debug0(RES_ERR "Packet smaller than standard header size.");
 	return;
@@ -731,10 +712,8 @@
     }
     eob = s + l;
     c = s + HFIXEDSZ;
-    Context;
     switch (getheader_rcode(hp)) {
     case NOERROR:
-	Context;
 	if (hp->ancount) {
 	    ddebug4(RES_MSG
 		    "Received nameserver reply. (qd:%u an:%u ns:%u ar:%u)",
@@ -804,7 +783,6 @@
 				resourcetypes[RESOURCETYPES_COUNT]);
 	    }
 	    for (rr = hp->ancount + hp->nscount + hp->arcount; rr; rr--) {
-		Context;
 		if (c > eob) {
 		    ddebug0(RES_ERR "Packet does not contain all specified resouce records.");
 		    return;
@@ -851,7 +829,6 @@
 		    ddebug0(RES_ERR "Specified rdata length exceeds packet size.");
 		    return;
 		}
-		Context;
 		if (datatype == qdatatype) {
 		    ddebug1(RES_MSG "TTL: %s", strtdiff(sendstring, ttl));
 		    ddebug1(RES_MSG "TYPE: %s", datatype < RESOURCETYPES_COUNT ?
@@ -923,7 +900,6 @@
 	    ddebug0(RES_ERR "No error returned but no answers given.");
 	break;
     case NXDOMAIN:
-	Context;
 	ddebug0(RES_MSG "Host not found.");
 	switch (rp->state) {
 	case STATE_PTRREQ:
@@ -938,14 +914,12 @@
 	}
 	break;
     default:
-	Context;
 	ddebug2(RES_MSG "Received error response %u. (%s)",
 		getheader_rcode(hp),
 		getheader_rcode(hp) < RESPONSECODES_COUNT ?
 			responsecodes[getheader_rcode(hp)] :
 			responsecodes[RESPONSECODES_COUNT]);
     }
-    Context;
 }
 
 /* Read data received on our dns socket. This function is called
@@ -957,7 +931,6 @@
     unsigned int fromlen = sizeof(struct sockaddr_in);
     int r, i;
 
-    Context;
     r =	recvfrom(resfd, (u_8bit_t *) resrecvbuf, MAX_PACKETSIZE, 0,
 		 (struct sockaddr *) &from, &fromlen);
     if (r <= 0) {
@@ -981,7 +954,6 @@
 	       iptostr(from.sin_addr.s_addr));
     } else
         parserespacket((u_8bit_t *) resrecvbuf, r);
-    Context;
 }
 
 /* Remove or resend expired requests. Called once a second.
@@ -990,7 +962,6 @@
 {
     struct resolve *rp, *nextrp;
 
-    Context;
     /* Walk through sorted list ... */
     for (rp = expireresolves; (rp) && (now >= rp->expiretime);
 	 rp = nextrp) {
@@ -999,14 +970,12 @@
 	switch (rp->state) {
 	case STATE_FINISHED:	/* TTL has expired */
 	case STATE_FAILED:	/* Fake TTL has expired */
-	    Context;
 	    ddebug4(RES_MSG "Cache record for \"%s\" (%s) has expired. (state: %u)  Marked for expire at: %ld.",
 		   nonull(rp->hostn), iptostr(rp->ip), rp->state,
 		   rp->expiretime);
 	    unlinkresolve(rp);
 	    break;
 	case STATE_PTRREQ:	/* T_PTR send timed out */
-	    Context;
 	    if (rp->sends <= RES_MAXSENDS) {
 	      ddebug1(RES_MSG "Resend #%d for \"PTR\" query...", rp->sends - 1);
 	      resendrequest(rp, T_PTR);
@@ -1016,7 +985,6 @@
 	    }
 	    break;
 	case STATE_AREQ:	/* T_A send timed out */
-	    Context;
 	    if (rp->sends <= RES_MAXSENDS) {
 	      ddebug1(RES_MSG "Resend #%d for \"A\" query...", rp->sends - 1);
 	      resendrequest(rp, T_A);
@@ -1031,7 +999,6 @@
 	    failrp(rp, 0);
 	}
     }
-    Context;
 }
 
 /* Start searching for a host-name, using it's ip-address.
@@ -1040,7 +1007,6 @@
 {
     struct resolve *rp;
     
-    Context;
     ip = htonl(ip);
     if ((rp = findip(ip))) {
 	if (rp->state == STATE_FINISHED || rp->state == STATE_FAILED) {
@@ -1056,7 +1022,6 @@
 	return;
     }
 
-    Context;
     ddebug0(RES_MSG "Creating new record");
     rp = allocresolve();
     rp->state = STATE_PTRREQ;
@@ -1064,7 +1029,6 @@
     rp->ip = ip;
     linkresolveip(rp);
     sendrequest(rp, T_PTR);
-    Context;
 }
 
 /* Start searching for an ip-address, using it's host-name.
@@ -1074,7 +1038,6 @@
     struct resolve *rp;
     struct in_addr inaddr;
 
-    Context;
     /* Check if someone passed us an IP address as hostname 
      * and return it straight away.
      */
@@ -1082,7 +1045,6 @@
       call_ipbyhost(hostn, ntohl(inaddr.s_addr), 1);
       return;
     }
-    Context;
     if ((rp = findhost(hostn))) {
 	if (rp->state == STATE_FINISHED || rp->state == STATE_FAILED) {
 	    if (rp->state == STATE_FINISHED && rp->ip) {
@@ -1096,8 +1058,6 @@
 	}
 	return;
     }
-
-    Context;
     ddebug0(RES_MSG "Creating new record");
     rp = allocresolve();
     rp->state = STATE_AREQ;
@@ -1106,7 +1066,6 @@
     strcpy(rp->hostn, hostn);
     linkresolvehost(rp);
     sendrequest(rp, T_A);
-    Context;
 }
 
 /* Initialise the network.
@@ -1116,7 +1075,6 @@
     int option;
     struct in_addr inaddr;
 
-    Context;
     resfd = socket(AF_INET, SOCK_DGRAM, 0);
     if (resfd == -1) {
 	putlog(LOG_MISC, "*",
@@ -1146,7 +1104,6 @@
 {
     int i;
 
-    Context;
     /* Initialise the resolv library. */
     res_init();
     if (!_res.nscount) {
@@ -1168,6 +1125,5 @@
 	hostbash[i] = NULL;
     }
     expireresolves = NULL;
-    Context;
     return 1;
 }
Index: eggdrop1.6/src/mod/dns.mod/dns.c
diff -u eggdrop1.6/src/mod/dns.mod/dns.c:1.20 eggdrop1.6/src/mod/dns.mod/dns.c:1.21
--- eggdrop1.6/src/mod/dns.mod/dns.c:1.20	Sun Nov  5 22:06:43 2000
+++ eggdrop1.6/src/mod/dns.mod/dns.c	Tue Jan 16 11:13:22 2001
@@ -4,7 +4,7 @@
  * 
  * Written by Fabian Knittel <fknittel at gmx.de>
  * 
- * $Id: dns.c,v 1.20 2000/11/06 04:06:43 guppy Exp $
+ * $Id: dns.c,v 1.21 2001/01/16 17:13:22 guppy Exp $
  */
 /* 
  * Copyright (C) 1999, 2000  Eggheads
@@ -47,7 +47,6 @@
   if (!rp)
     return;
 
-  Context;
   if (type == T_PTR) {
     debug2("DNS resolved %s to %s", iptostr(rp->ip), rp->hostn);
     call_hostbyip(ntohl(rp->ip), rp->hostn, 1);
@@ -62,7 +61,6 @@
   if (!rp)
     return;
 
-  Context;
   if (type == T_PTR) {
     static char s[UHOSTLEN];
 
@@ -85,7 +83,6 @@
 
 static void eof_dns_socket(int idx)
 {
-  Context;
   putlog(LOG_MISC, "*", "DNS Error: socket closed.");
   killsock(dcc[idx].sock);
   /* Try to reopen socket */
@@ -130,7 +127,6 @@
 {
   struct resolve *rp, *rpnext;
 
-  Context;
   for (rp = expireresolves; rp; rp = rpnext) {
     rpnext = rp->next;
     if (rp->hostn)
@@ -170,7 +166,6 @@
 {
   int i;
 
-  Context;
   del_hook(HOOK_DNS_HOSTBYIP, (Function) dns_lookup);
   del_hook(HOOK_DNS_IPBYHOST, (Function) dns_forward);
   del_hook(HOOK_SECONDLY, (Function) dns_check_expires);
@@ -186,7 +181,6 @@
 
   dns_free_cache();
   module_undepend(MODULE_NAME);
-  Context;
   return NULL;
 }
 
@@ -207,7 +201,6 @@
   int idx;
   
   global = global_funcs;
-  Context;
   module_register(MODULE_NAME, dns_table, 1, 0);
   if (!module_depend(MODULE_NAME, "eggdrop", 106, 0)) {
     module_undepend(MODULE_NAME);
@@ -228,6 +221,5 @@
   add_hook(HOOK_SECONDLY, (Function) dns_check_expires);
   add_hook(HOOK_DNS_HOSTBYIP, (Function) dns_lookup);
   add_hook(HOOK_DNS_IPBYHOST, (Function) dns_forward);
-  Context;
   return NULL;
 }
Index: eggdrop1.6/src/mod/filesys.mod/dbcompat.c
diff -u eggdrop1.6/src/mod/filesys.mod/dbcompat.c:1.8 eggdrop1.6/src/mod/filesys.mod/dbcompat.c:1.9
--- eggdrop1.6/src/mod/filesys.mod/dbcompat.c:1.8	Fri Oct 27 14:39:30 2000
+++ eggdrop1.6/src/mod/filesys.mod/dbcompat.c	Tue Jan 16 11:13:22 2001
@@ -4,7 +4,7 @@
  * 
  * Written for filedb3 by Fabian Knittel <fknittel at gmx.de>
  * 
- * $Id: dbcompat.c,v 1.8 2000/10/27 19:39:30 fabian Exp $
+ * $Id: dbcompat.c,v 1.9 2001/01/16 17:13:22 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -43,7 +43,6 @@
   int in_file = 0, i;
   struct stat st;
 
-  Context;
   s = nmalloc(strlen(path) + 8);
   sprintf(s, "%s/.files", path);
   f = fopen(s, "r");
@@ -51,7 +50,6 @@
   if (f == NULL)
     return 0;
 
-  Context;
   fdb = fopen(newfiledb, "w+b");
   if (!fdb) {
     putlog(LOG_MISC, "(!) Can't create filedb in %s", newfiledb);
@@ -90,7 +88,6 @@
 	} else {
 	  if (fdbe) {
 	    /* File pending. Write to DB */
-	    Context;
 	    filedb_addfile(fdb, fdbe);
 	    free_fdbe(&fdbe);
 	  }
@@ -134,7 +131,6 @@
   }
   if (fdbe) {
     /* File pending. Write to DB */
-    Context;
     filedb_addfile(fdb, fdbe);
     free_fdbe(&fdbe);
   }
@@ -143,7 +139,6 @@
   unlockfile(fdb);
   fclose(fdb);
   fclose(f);
-  Context;
   return 1;
 }
 
@@ -241,13 +236,11 @@
   FILE *fdb_t;
   int ret = 0;					/* Default to 'failure'	*/
 
-  Context;
   filedb_readtop(*fdb_s, &fdbt);
   /* Old DB version? */
   if (fdbt.version > 0 && fdbt.version < FILEDB_VERSION3) {
     char *tempdb;
 
-    Context;
     putlog(LOG_MISC, "*", "Converting old filedb %s to newest format.",
 	   filedb);
     /* Create temp DB name */
@@ -287,14 +280,11 @@
         putlog(LOG_MISC, "*", "(!) Reopening db %s failed.", filedb);
     }
     my_free(tempdb);
-    Context;
   /* Database already at the newest version? */
   } else if (fdbt.version == FILEDB_VERSION3) {
-    Context;
     ret = 1;					/* Always successfull	*/
   /* Unknown version? */
   } else {
-    Context;
     putlog(LOG_MISC, "*", "(!) Unknown db version: %d", fdbt.version);
   }
   if (!ret)
Index: eggdrop1.6/src/mod/filesys.mod/filedb3.c
diff -u eggdrop1.6/src/mod/filesys.mod/filedb3.c:1.16 eggdrop1.6/src/mod/filesys.mod/filedb3.c:1.17
--- eggdrop1.6/src/mod/filesys.mod/filedb3.c:1.16	Fri Oct 27 14:39:30 2000
+++ eggdrop1.6/src/mod/filesys.mod/filedb3.c	Tue Jan 16 11:13:22 2001
@@ -4,7 +4,7 @@
  * 
  * Rewritten by Fabian Knittel <fknittel at gmx.de>
  * 
- * $Id: filedb3.c,v 1.16 2000/10/27 19:39:30 fabian Exp $
+ * $Id: filedb3.c,v 1.17 2001/01/16 17:13:22 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -80,7 +80,6 @@
 {
   if (!fdbe || !*fdbe)
     return;
-  Context;
   if ((*fdbe)->filename)
     my_free((*fdbe)->filename);
   if ((*fdbe)->desc)
@@ -94,7 +93,6 @@
   if ((*fdbe)->flags_req)
     my_free((*fdbe)->flags_req);
   my_free(*fdbe);
-  Context;
 }
 
 /* Allocates and initialises a filedb entry
@@ -160,7 +158,6 @@
  */
 static int filedb_readtop(FILE *fdb, filedb_top *fdbt)
 {
-  Context;
   if (fdbt) {
     /* Read header */
     fseek(fdb, 0L, SEEK_SET);
@@ -176,7 +173,6 @@
  */
 static int filedb_writetop(FILE *fdb, filedb_top *fdbt)
 {
-  Context;
   fseek(fdb, 0L, SEEK_SET);
   fwrite(fdbt, 1, sizeof(filedb_top), fdb);
   return 1;
@@ -190,8 +186,6 @@
 {
   filedb_header fdh;
 
-  Context;
-  Assert(pos > 0);
   fseek(fdb, pos, SEEK_SET);			/* Go to start of entry	*/
   if (feof(fdb))
     return 0;
@@ -206,7 +200,6 @@
 
   fseek(fdb, pos, SEEK_SET);			/* Go back to start	*/
   fwrite(&fdh, 1, sizeof(filedb_header), fdb);	/* Write new header	*/
-  Context;
   return 1;
 }
 
@@ -226,7 +219,6 @@
 {
   filedb_entry *fdbe;
 
-  Context;
   filedb_readtop(fdb, NULL);
   fdbe = filedb_getfile(fdb, ftell(fdb), GET_HEADER);
   while (fdbe) {
@@ -252,7 +244,6 @@
 	 */
 	fdbe->buf_len = tot;
       } 
-      Context;
       return fdbe;		
     }
     free_fdbe(&fdbe);
@@ -263,7 +254,6 @@
   fdbe = malloc_fdbe();
   fseek(fdb, 0L, SEEK_END);
   fdbe->pos = ftell(fdb);
-  Context;
   return fdbe;
 }
 
@@ -288,8 +278,6 @@
   int reposition = 0;
   int ndyntot, odyntot, nbuftot, obuftot;
 
-  Context;
-  Assert(fdbe);
   egg_bzero(&fdh, sizeof(filedb_header));
   fdh.uploaded = fdbe->uploaded;
   fdh.size = fdbe->size;
@@ -319,7 +307,6 @@
   nbuftot = obuftot;
 
   if (fdbe->_type == TYPE_EXIST) {
-    Assert(pos != POS_NEW);		/* We NEED a position		*/
     /* If we only update the header, we don't need to worry about
      * sizes and just use the old place (i.e. the place pointed
      * to by pos).
@@ -352,7 +339,6 @@
       }
     }
   } else {
-    Assert(pos == POS_NEW);		/* We NEED to reposition	*/
     fdbe->_type = TYPE_EXIST;		/* Update type			*/
     reposition = 1;
   }
@@ -400,7 +386,6 @@
   } else
     fseek(fdb, ndyntot, SEEK_CUR);	/* Skip over dynamic data */
   fseek(fdb, nbuftot, SEEK_CUR);	/* Skip over buffer	  */
-  Context;
   return 0;
 }
 
@@ -409,7 +394,6 @@
 static int _filedb_movefile(FILE *fdb, long pos, filedb_entry *fdbe,
 			    char *file, int line)
 {
-  Context;
   fdbe->_type = TYPE_EXIST;
   _filedb_updatefile(fdb, pos, fdbe, UPDATE_ALL, file, line);
   return 0;
@@ -419,7 +403,6 @@
  */
 static int _filedb_addfile(FILE *fdb, filedb_entry *fdbe, char *file, int line)
 {
-  Context;
   fdbe->_type = TYPE_NEW;
   _filedb_updatefile(fdb, POS_NEW, fdbe, UPDATE_ALL, file, line);
   return 0;
@@ -447,7 +430,6 @@
   filedb_entry *fdbe;
   filedb_header fdh;
 
-  Context;
   /* Read header */
   fseek(fdb, pos, SEEK_SET);
   fread(&fdh, 1, sizeof(filedb_header), fdb);
@@ -491,7 +473,6 @@
     filedb_read(fdb, fdbe->sharelink, fdh.sharelink_len);
   }
   fseek(fdb, fdh.buffer_len, SEEK_CUR);	/* Skip buffer			*/
-  Context;
   return fdbe;				/* Return the ready structure	*/
 }
 
@@ -503,7 +484,6 @@
 {
   filedb_entry *fdbe = NULL;
 
-  Context;
   fseek(fdb, pos, SEEK_SET);
   while (!feof(fdb))
   {
@@ -515,13 +495,11 @@
         free_fdbe(&fdbe);
         fdbe = _filedb_getfile(fdb, pos, GET_FULL,
 			       file, line);	    /* Save all data now   */
-	Context;
         return fdbe;
       }
       free_fdbe(&fdbe);
     }
   }
-  Context;
   return NULL;
 }
 
@@ -533,7 +511,6 @@
   long oldpos, newpos, temppos;
   filedb_entry *fdbe = NULL;
 
-  Context;
   filedb_readtop(fdb, NULL);				/* Skip DB header  */
   newpos = temppos = oldpos = ftell(fdb);
   fseek(fdb, oldpos, SEEK_SET);				/* Go to beginning */
@@ -563,7 +540,6 @@
     }
   }
   ftruncate(fileno(fdb), oldpos);			/* Shorten file	   */
-  Context;
 }
 
 /* Merges empty entries to one big entry, if they directly
@@ -576,7 +552,6 @@
   filedb_entry *fdbe_t, *fdbe_i;
   int modified;
 
-  Context;
   filedb_readtop(fdb, NULL);
   while (!feof(fdb))
   {
@@ -611,14 +586,12 @@
 	  /* Truncate trailing empty entries and exit. */
 	  ftruncate(fileno(fdb), fdbe_t->pos);
 	  free_fdbe(&fdbe_t);
-	  Context;
 	  return;
 	}
       }
       free_fdbe(&fdbe_t);
     }
   }
-  Context;
 }
 
 /* Returns the filedb entry matching the filename 'fn' in
@@ -629,7 +602,6 @@
   FILE *fdb;
   filedb_entry *fdbe = NULL;
 
-  Context;
   fdb = filedb_open(dir, 0);
   if (fdb) {
     filedb_readtop(fdb, NULL);
@@ -677,7 +649,6 @@
   /* 
    * FIRST: make sure every real file is in the database
    */
-  Context;
   dir = opendir(path);
   if (dir == NULL) {
     putlog(LOG_MISC, "*", FILES_NOUPDATE);
@@ -719,7 +690,6 @@
   /* 
    * SECOND: make sure every db file is real
    */
-  Context;
   filedb_readtop(fdb, NULL);
   fdbe = filedb_getfile(fdb, ftell(fdb), GET_FILENAME);
   while (fdbe) {
@@ -743,11 +713,9 @@
    * Instead of sorting, we only clean up the db, because sorting is now
    * done on-the-fly when we display the file list.
    */
-  Context;
   if (sort)
     filedb_cleanup(fdb);			/* Cleanup DB		*/
   filedb_timestamp(fdb);			/* Write new timestamp	*/
-  Context;
 }
 
 /* Converts all slashes to dots. Returns an allocated buffer, so
@@ -776,7 +744,6 @@
   filedb_top fdbt;
   struct stat st;
 
-  Context;
   if (count >= 2)
     putlog(LOG_MISC, "*", "(@) warning: %d open filedb's", count);
   npath = nmalloc(strlen(dccdir) + strlen(path) + 1);
@@ -801,7 +768,6 @@
 	putlog(LOG_MISC, "*", FILES_NOCONVERT, npath);
 	my_free(s);
 	my_free(npath);
-	Context;
         return NULL;
       }
       lockfile(fdb);
@@ -809,7 +775,6 @@
       count++;
       my_free(s);
       my_free(npath);
-      Context;
       return fdb;
     } else {
       filedb_top fdbt;
@@ -819,7 +784,6 @@
       if (!fdb) {
 	my_free(s);
 	my_free(npath);
-	Context;
 	return NULL;
       }
       lockfile(fdb);
@@ -830,7 +794,6 @@
       count++;
       my_free(s);
       my_free(npath);
-      Context;
       return fdb;
     }
   }
@@ -847,7 +810,6 @@
         unlockfile(fdb);
       my_free(npath);
       my_free(s);
-      Context;
       return NULL;
     }
     filedb_update(npath, fdb, sort);
@@ -869,7 +831,6 @@
   count++;
   my_free(npath);
   my_free(s);
-  Context;
   return fdb;
 }
 
@@ -878,7 +839,6 @@
  */
 static void filedb_close(FILE * fdb)
 {
-  Context;
   filedb_timestamp(fdb);
   fseek(fdb, 0L, SEEK_END);
   count--;
@@ -894,7 +854,6 @@
 {
   filedb_entry *fdbe = NULL;
 
-  Context;
   filedb_readtop(fdb, NULL);
   /* When the filedb was opened, a record was already created. */
   fdbe = filedb_matchfile(fdb, ftell(fdb), filename);
@@ -918,7 +877,6 @@
   filedb_entry *fdbe  = NULL;
   filelist_t   *flist = NULL;
 
-  Context;
   flist = filelist_new();
   filedb_readtop(fdb, NULL);
   fdbe = filedb_getfile(fdb, ftell(fdb), GET_FULL);
@@ -952,7 +910,6 @@
       if (fdbe->stat & FILE_DIR) {
 	char *s2 = NULL, *s3 = NULL;
 
-	Context;
 	/* Too long? */
 	if (strlen(fdbe->filename) > 45) {
 	  /* Display the filename on its own line. */
@@ -988,7 +945,6 @@
       } else {
 	char s2[41], t[50], *s3 = NULL, *s4;
 
-	Context;
 	s2[0] = 0;
 	if (showall) {
 	  if (fdbe->stat & FILE_SHARE)
@@ -1066,7 +1022,6 @@
     dprintf(idx, "--- %d file%s.\n", cnt, cnt > 1 ? "s" : "");
   }
   filelist_free(flist);
-  Context;
 }
 
 static void remote_filereq(int idx, char *from, char *file)
@@ -1077,7 +1032,6 @@
   int	i   = 0;
   filedb_entry *fdbe = NULL;
 
-  Context;
   malloc_strcpy(what, file);
   p = strrchr(what, '/');
   if (p) {
@@ -1129,7 +1083,6 @@
     my_free(s1);
     my_free(what);
     my_free(dir);
-    Context;
     return;
   }
   /* Grab info from dcc struct and bounce real request across net */
@@ -1143,7 +1096,6 @@
   my_free(s);
   my_free(what);
   my_free(dir);
-  Context;
 }
 
 
@@ -1155,7 +1107,6 @@
 {
   filedb_entry *fdbe = NULL;
 
-  Assert(desc);
   fdbe = filedb_getentry(dir, fn);
   if (fdbe) {
     *desc = nmalloc(strlen(fdbe->desc) + 1);
@@ -1169,7 +1120,6 @@
 {
   filedb_entry *fdbe = NULL;
 
-  Assert(owner);
   fdbe = filedb_getentry(dir, fn);
   if (fdbe) {
     *owner = nmalloc(strlen(fdbe->uploader) + 1);
@@ -1269,7 +1219,6 @@
 {
   filedb_entry *fdbe = NULL;
 
-  Assert(link);
   fdbe = filedb_getentry(dir, fn);
   if (fdbe && (!(fdbe->stat & FILE_DIR))) {
     malloc_strcpy(*link, fdbe->sharelink);
Index: eggdrop1.6/src/mod/filesys.mod/filelist.c
diff -u eggdrop1.6/src/mod/filesys.mod/filelist.c:1.7 eggdrop1.6/src/mod/filesys.mod/filelist.c:1.8
--- eggdrop1.6/src/mod/filesys.mod/filelist.c:1.7	Mon Jan 17 16:36:08 2000
+++ eggdrop1.6/src/mod/filesys.mod/filelist.c	Tue Jan 16 11:13:22 2001
@@ -4,7 +4,7 @@
  * 
  * Written by Fabian Knittel <fknittel at gmx.de>
  * 
- * $Id: filelist.c,v 1.7 2000/01/17 22:36:08 fabian Exp $
+ * $Id: filelist.c,v 1.8 2001/01/16 17:13:22 guppy Exp $
  */
 /* 
  * Copyright (C) 1999, 2000  Eggheads
@@ -122,7 +122,6 @@
  */
 static void filelist_sort(filelist_t *flist)
 {
-  Assert(flist);
   if (flist->tot < 2)
     return;
   filelist_qsort(flist, 0, (flist->tot - 1));
Index: eggdrop1.6/src/mod/filesys.mod/files.c
diff -u eggdrop1.6/src/mod/filesys.mod/files.c:1.26 eggdrop1.6/src/mod/filesys.mod/files.c:1.27
--- eggdrop1.6/src/mod/filesys.mod/files.c:1.26	Fri Oct 27 14:39:30 2000
+++ eggdrop1.6/src/mod/filesys.mod/files.c	Tue Jan 16 11:13:22 2001
@@ -2,7 +2,7 @@
  * files.c - part of filesys.mod
  *   handles all file system commands
  * 
- * $Id: files.c,v 1.26 2000/10/27 19:39:30 fabian Exp $
+ * $Id: files.c,v 1.27 2001/01/16 17:13:22 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -156,7 +156,6 @@
   struct flag_record user = {FR_GLOBAL | FR_CHAN, 0, 0, 0, 0, 0},
 		     req  = {FR_GLOBAL | FR_CHAN, 0, 0, 0, 0, 0};
 
-  Context;
   *real = NULL;
   malloc_strcpy(*real, current);
   if (!change[0])
@@ -261,7 +260,6 @@
   if (!dir)
     return 0;
   closedir(dir);
-  Context;
   return 1;
 }
 
@@ -351,7 +349,6 @@
   putlog(LOG_FILES, "*", "files: #%s# cd /%s", dcc[idx].nick,
 	 dcc[idx].u.file->dir);
   dprintf(idx, "%s: /%s\n", FILES_NEWCURDIR, dcc[idx].u.file->dir);
-  Context;
 }
 
 static void files_ls(int idx, char *par, int showall)
@@ -359,7 +356,6 @@
   char *p, *s = NULL, *destdir = NULL, *mask = NULL;
   FILE *fdb;
 
-  Context;
   if (par[0]) {
     putlog(LOG_FILES, "*", "files: #%s# ls %s", dcc[idx].nick, par);
     p = strrchr(par, '/');
@@ -406,7 +402,6 @@
     } else
       dprintf(idx, FILES_ILLDIR);
   }
-  Context;
 }
 
 static void cmd_ls(int idx, char *par)
@@ -1295,7 +1290,6 @@
   char *nick;
   struct userrec *u;
 
-  Context;
   if (!par[0]) {
     dprintf(idx, "Usage: filestats <user>\n");
     return 0;
Index: eggdrop1.6/src/mod/filesys.mod/filesys.c
diff -u eggdrop1.6/src/mod/filesys.mod/filesys.c:1.38 eggdrop1.6/src/mod/filesys.mod/filesys.c:1.39
--- eggdrop1.6/src/mod/filesys.mod/filesys.c:1.38	Sun Nov  5 22:06:43 2000
+++ eggdrop1.6/src/mod/filesys.mod/filesys.c	Tue Jan 16 11:13:22 2001
@@ -2,7 +2,7 @@
  * filesys.c -- part of filesys.mod
  *   main file of the filesys eggdrop module
  * 
- * $Id: filesys.c,v 1.38 2000/11/06 04:06:43 guppy Exp $
+ * $Id: filesys.c,v 1.39 2001/01/16 17:13:22 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -141,7 +141,6 @@
   char s[5];
   struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0, 0, 0};
 
-  Context;
   get_user_flagrec(dcc[idx].user, &fr, dcc[idx].u.file->chat->con_chan);
   sprintf(s, "%ld", dcc[idx].sock);
   Tcl_SetVar(interp, "_fil1", dcc[idx].nick, 0);
@@ -209,7 +208,6 @@
 {
   char *code;
 
-  Context;
   strcpy(msg, check_tcl_filt(idx, msg));
   if (!msg[0])
     return 1;
@@ -221,7 +219,6 @@
 
 static void dcc_files(int idx, char *buf, int i)
 {
-  Context;
   if (buf[0] &&
       detect_dcc_flood(&dcc[idx].timeval, dcc[idx].u.file->chat, idx))
     return;
@@ -306,7 +303,6 @@
   int atr = u ? u->flags : 0;
   static struct chat_info *ci;
 
-  Context;
   if (dccdir[0] == 0)
     dprintf(idx, "There is no file transfer area.\n");
   else if (too_many_filers()) {
@@ -360,7 +356,6 @@
   int x;
   char *nfn, *buf = NULL;
 
-  Context;
   if (strlen(nick) > NICKMAX)
     nick[NICKMAX] = 0;
   if (resend)
@@ -427,7 +422,6 @@
   FILE *f;
   int x;
 
-  Context;
   if (nick && strlen(nick) > NICKMAX)
     nick[NICKMAX] = 0;
   if (dccdir[0] == 0) {
@@ -507,7 +501,6 @@
   int idx;
   Function F = (Function) cd;
 
-  Context;
   BADARGS(4, 4, " hand idx param");
   idx = findanyidx(atoi(argv[2]));
   if (idx < 0 && dcc[idx].type != &DCC_FILES) {
@@ -525,7 +518,6 @@
 
 static void tout_dcc_files_pass(int i)
 {
-  Context;
   dprintf(i, "Timeout.\n");
   putlog(LOG_MISC, "*", "Password timeout on dcc chat: [%s]%s", dcc[i].nick,
 	 dcc[i].host);
@@ -633,7 +625,6 @@
   char *param, *ip, *prt, *buf = NULL, *msg;
   int atr = u ? u->flags : 0, i;
 
-  Context;
   buf = nmalloc(strlen(text) + 1);
   msg = buf;
   strcpy(buf, text);
@@ -777,7 +768,6 @@
   s1 = nmalloc(strlen(dcc[i].u.xfer->dir) +
 	       strlen(dcc[i].u.xfer->origname) + 1);
   sprintf(s1, "%s%s", dcc[i].u.xfer->dir, dcc[i].u.xfer->origname);
-  Context;      
   f = fopen(s1, "r");
   my_free(s1);
   if (f) {
@@ -828,7 +818,6 @@
   struct userrec *u = get_user_by_handle(userlist, handle);
   struct flag_record fr = {FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0, 0, 0, 0};
 
-  Context;
   if (egg_strcasecmp(object, botname))
     return 0;
   if (!egg_strncasecmp(text, "SEND ", 5)) {
@@ -943,7 +932,6 @@
   int i;
   p_tcl_bind_list H_ctcp;
 
-  Context;
   putlog(LOG_MISC, "*", "Unloading filesystem, killing all filesystem connections..");
   for (i = 0; i < dcc_total; i++)
     if (dcc[i].type == &DCC_FILES) {
@@ -994,7 +982,6 @@
 {
   global = global_funcs;
 
-  Context;
   module_register(MODULE_NAME, filesys_table, 2, 0);
   if (!module_depend(MODULE_NAME, "eggdrop", 106, 0)) {
     module_undepend(MODULE_NAME);
Index: eggdrop1.6/src/mod/filesys.mod/tclfiles.c
diff -u eggdrop1.6/src/mod/filesys.mod/tclfiles.c:1.10 eggdrop1.6/src/mod/filesys.mod/tclfiles.c:1.11
--- eggdrop1.6/src/mod/filesys.mod/tclfiles.c:1.10	Thu Aug 31 13:11:40 2000
+++ eggdrop1.6/src/mod/filesys.mod/tclfiles.c	Tue Jan 16 11:13:22 2001
@@ -2,7 +2,7 @@
  * tclfiles.c -- part of filesys.mod
  *   Tcl stubs for file system commands moved here to support modules
  * 
- * $Id: tclfiles.c,v 1.10 2000/08/31 18:11:40 fabian Exp $
+ * $Id: tclfiles.c,v 1.11 2001/01/16 17:13:22 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -425,7 +425,6 @@
   long where;
 
   BADARGS(3, 3, " oldfilepath newfilepath");
-  Context;
   malloc_strcpy(fn, argv[1]);
   p = strrchr(fn, '/');
   if (p != NULL) {
Index: eggdrop1.6/src/mod/irc.mod/chan.c
diff -u eggdrop1.6/src/mod/irc.mod/chan.c:1.62 eggdrop1.6/src/mod/irc.mod/chan.c:1.63
--- eggdrop1.6/src/mod/irc.mod/chan.c:1.62	Sun Dec 17 15:37:46 2000
+++ eggdrop1.6/src/mod/irc.mod/chan.c	Tue Jan 16 11:13:22 2001
@@ -6,7 +6,7 @@
  *   user kickban, kick, op, deop
  *   idle kicking
  * 
- * $Id: chan.c,v 1.62 2000/12/17 21:37:46 guppy Exp $
+ * $Id: chan.c,v 1.63 2001/01/16 17:13:22 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -166,7 +166,6 @@
     return 0;
 
   get_user_flagrec(get_user_by_host(from), &fr, chan->dname);
-  Context;
   if (glob_bot(fr) ||
       ((which == FLOOD_DEOP) && (glob_master(fr) || chan_master(fr))) ||
       ((which != FLOOD_DEOP) && (glob_friend(fr) || chan_friend(fr))) ||
@@ -240,7 +239,6 @@
     return 0;
   }
   /* Deop'n the same person, sillyness ;) - so just ignore it */
-  Context;
   if (which == FLOOD_DEOP) {
     if (!rfc_casecmp(chan->deopd, victim))
       return 0;
@@ -248,7 +246,6 @@
       strcpy(chan->deopd, victim);
   }
   chan->floodnum[which]++;
-  Context;
   if (chan->floodnum[which] >= thr) {	/* FLOOD */
     /* Reset counters */
     chan->floodnum[which] = 0;
@@ -291,7 +288,6 @@
 	putlog(LOG_MISC | LOG_JOIN, chan->dname, IRC_FLOODIGNORE4, p);
       strcpy(ftype + 4, " flood");
       u_addban(chan, h, origbotname, ftype, now + (60 * ban_time), 0);
-      Context;
       if (!channel_enforcebans(chan) && me_op(chan)) {
 	  char s[UHOSTLEN];
 	  m = chan->channel.member;
@@ -332,7 +328,6 @@
       return 1;
     }
   }
-  Context;
   return 0;
 }
 
@@ -359,7 +354,6 @@
   struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0, 0, 0};
   int k, l, flushed;
 
-  Context;
   if (!me_op(chan))
     return;
   k = 0;
@@ -380,7 +374,6 @@
 	  (chan_op(fr) || (glob_op(fr) && !chan_deop(fr))))) {	/* arthur2 */
       if (!flushed) {
 	/* We need to kick someone, flush eventual bans first */
-	Context;
 	flush_mode(chan, QUICK);
 	flushed += 1;
       }
@@ -400,7 +393,6 @@
   }
   if (k > 0)
     dprintf(DP_SERVER, "KICK %s %s :%s\n", chan->name, kicknick, comment);
-  Context;
 }
 
 /* If any bans match this wildcard expression, refresh them on the channel.
@@ -693,7 +685,6 @@
     return;                     /* ... it's better not to deop everybody */
   stacking++;
   /* Okay, sort through who needs to be deopped. */
-  Context;
   m = chan->channel.member;
   while (m && m->nick[0]) {
     sprintf(s, "%s!%s", m->nick, m->userhost);
@@ -932,7 +923,6 @@
   char *nick, *user, *host, *chname, *flags;
   struct chanset_t *chan;
 
-  Context;
   newsplit(&msg);		/* Skip my nick - effeciently */
   chname = newsplit(&msg);	/* Grab the channel */
   chan = findchan(chname);	/* See if I'm on channel */
@@ -954,7 +944,6 @@
   char *nick, *user, *host, *chname, *flags;
   struct chanset_t *chan;
 
-  Context;
   if (use_354) {
     newsplit(&msg);		/* Skip my nick - effeciently */
     if (msg[0] && (strchr(CHANMETA, msg[0]) != NULL)) {
@@ -1482,7 +1471,6 @@
   struct userrec *u;
   struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0, 0, 0};
 
-  Context;
   fixcolon(chname);
   chan = findchan(chname);
   if (!chan && chname[0] == '!') {
Index: eggdrop1.6/src/mod/irc.mod/cmdsirc.c
diff -u eggdrop1.6/src/mod/irc.mod/cmdsirc.c:1.22 eggdrop1.6/src/mod/irc.mod/cmdsirc.c:1.23
--- eggdrop1.6/src/mod/irc.mod/cmdsirc.c:1.22	Fri Nov  3 11:17:16 2000
+++ eggdrop1.6/src/mod/irc.mod/cmdsirc.c	Tue Jan 16 11:13:22 2001
@@ -2,7 +2,7 @@
  * chancmds.c -- part of irc.mod
  *   handles commands direclty relating to channel interaction
  * 
- * $Id: cmdsirc.c,v 1.22 2000/11/03 17:17:16 fabian Exp $
+ * $Id: cmdsirc.c,v 1.23 2001/01/16 17:13:22 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -29,7 +29,6 @@
 {
   struct chanset_t *chan;
 
-  Context;
   if (chname && chname[0]) {
     chan = findchan_by_dname(chname);
     if (!chan) {
@@ -790,7 +789,6 @@
   int statichost = 0;
   char *p1 = s1;
 
-  Context;
   if ((!par[0]) || ((par[0]=='!') && (!par[1]))) {
     dprintf(idx, "Usage: adduser <nick> [handle]\n");
     return;
@@ -822,7 +820,6 @@
     hand = par;
   }
 
-  Context;
   for (chan = chanset; chan; chan = chan->next) {
     m = ismember(chan, nick);
     if (m)
Index: eggdrop1.6/src/mod/irc.mod/irc.c
diff -u eggdrop1.6/src/mod/irc.mod/irc.c:1.46 eggdrop1.6/src/mod/irc.mod/irc.c:1.47
--- eggdrop1.6/src/mod/irc.mod/irc.c:1.46	Tue Dec  5 20:32:18 2000
+++ eggdrop1.6/src/mod/irc.mod/irc.c	Tue Jan 16 11:13:22 2001
@@ -2,7 +2,7 @@
  * irc.c -- part of irc.mod
  *   support for channels within the bot 
  * 
- * $Id: irc.c,v 1.46 2000/12/06 02:32:18 guppy Exp $
+ * $Id: irc.c,v 1.47 2001/01/16 17:13:22 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -88,7 +88,6 @@
   struct flag_record fr = { FR_GLOBAL | FR_CHAN, 0, 0, 0, 0, 0 };
   struct flag_record fr2 = { FR_GLOBAL | FR_CHAN, 0, 0, 0, 0, 0 };
 
-  Context;
   get_user_flagrec(u, &fr, chan->dname);
   get_user_flagrec(u2, &fr2, chan->dname);
 
@@ -137,7 +136,6 @@
     return;
   get_user_flagrec(u, &fr, chan->dname);
 
-  Context;
   /* Get current time into a string */
   egg_strftime(ct, 7, "%d %b", localtime(&now));
 
@@ -157,7 +155,6 @@
   }
   putlog(LOG_MISC, chan->dname, "Punishing %s (%s)", badnick, reason);
  
-  Context;
   /* Set the offender +d */
   if ((chan->revenge_mode > 0) &&
       /* ... unless there's no more to do */
@@ -188,7 +185,6 @@
     }
     /* ... or creating new user and setting that to deop */
     else {
-      Context;
       strcpy(s1, whobad);
       maskhost(s1, s);
       strcpy(s1, badnick);
@@ -225,7 +221,6 @@
   if (chan->revenge_mode > 2) {
     char s[UHOSTLEN], s1[UHOSTLEN];
 
-    Context;
     splitnick(&whobad);
     maskhost(whobad, s1);
     simple_sprintf(s, "(%s) %s", ct, reason);
@@ -247,7 +242,6 @@
     dprintf(DP_MODE, "KICK %s %s :%s\n", chan->name, badnick, kick_msg);
     m->flags |= SENTKICK;
   }
-  Context;
 }
 
 /* Punishes bad guys under certain circumstances using methods as defined
@@ -260,7 +254,6 @@
   int mevictim;
   struct userrec *u, *u2;
 
-  Context;
   if (!chan || (type < 0))
     return;
 
@@ -423,7 +416,6 @@
 static void reset_chan_info(struct chanset_t *chan)
 {
   /* Don't reset the channel if we're already resetting it */
-  Context;
   if (channel_inactive(chan)) {
     dprintf(DP_MODE,"PART %s\n", chan->name);
     return;
@@ -530,7 +522,6 @@
   int i = 0;
   static int whined = 0;
 
-  Context;
   if (channel_pending(chan) || !channel_active(chan) || me_op(chan) ||
       channel_inactive(chan) || (chan->channel.mode & CHANANON))
     return;
@@ -748,17 +739,14 @@
   struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0, 0, 0};
   char args[1024];
 
-  Context;
   simple_sprintf(args, "%s %s!%s", chname, nick, uhost);
   get_user_flagrec(u, &fr, chname);
   Tcl_SetVar(interp, "_jp1", nick, 0);
   Tcl_SetVar(interp, "_jp2", uhost, 0);
   Tcl_SetVar(interp, "_jp3", u ? u->handle : "*", 0);
   Tcl_SetVar(interp, "_jp4", chname, 0);
-  Context;
   check_tcl_bind(table, args, &fr, " $_jp1 $_jp2 $_jp3 $_jp4",
 		 MATCH_MASK | BIND_USE_ATTR | BIND_STACKABLE);
-  Context;
 }
 
 /* we handle part messages now *sigh* (guppy 27Jan2000) */
@@ -769,7 +757,6 @@
   struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0, 0, 0};
   char args[1024];
 
-  Context;
   simple_sprintf(args, "%s %s!%s", chname, nick, uhost);
   get_user_flagrec(u, &fr, chname);
   Tcl_SetVar(interp, "_p1", nick, 0);
@@ -777,10 +764,8 @@
   Tcl_SetVar(interp, "_p3", u ? u->handle : "*", 0);
   Tcl_SetVar(interp, "_p4", chname, 0);
   Tcl_SetVar(interp, "_p5", text ? text : "", 0);
-  Context;
   check_tcl_bind(H_part, args, &fr, " $_p1 $_p2 $_p3 $_p4 $_p5",
 		 MATCH_MASK | BIND_USE_ATTR | BIND_STACKABLE);
-  Context;
 }
 
 static void check_tcl_signtopcnick(char *nick, char *uhost, struct userrec *u,
@@ -790,7 +775,6 @@
   struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0, 0, 0};
   char args[1024];
 
-  Context;
   if (table == H_sign)
     simple_sprintf(args, "%s %s!%s", chname, nick, uhost);
   else
@@ -801,10 +785,8 @@
   Tcl_SetVar(interp, "_stnm3", u ? u->handle : "*", 0);
   Tcl_SetVar(interp, "_stnm4", chname, 0);
   Tcl_SetVar(interp, "_stnm5", reason, 0);
-  Context;
   check_tcl_bind(table, args, &fr, " $_stnm1 $_stnm2 $_stnm3 $_stnm4 $_stnm5",
 		 MATCH_MASK | BIND_USE_ATTR | BIND_STACKABLE);
-  Context;
 }
 
 static void check_tcl_kickmode(char *nick, char *uhost, struct userrec *u,
@@ -814,7 +796,6 @@
   struct flag_record fr = {FR_GLOBAL | FR_CHAN, 0, 0, 0, 0, 0};
   char args[512];
 
-  Context;
   get_user_flagrec(u, &fr, chname);
   if (table == H_mode)
     simple_sprintf(args, "%s %s", chname, dest);
@@ -826,10 +807,8 @@
   Tcl_SetVar(interp, "_kick4", chname, 0);
   Tcl_SetVar(interp, "_kick5", dest, 0);
   Tcl_SetVar(interp, "_kick6", reason, 0);
-  Context;
   check_tcl_bind(table, args, &fr, " $_kick1 $_kick2 $_kick3 $_kick4 $_kick5 $_kick6",
 		 MATCH_MASK | BIND_USE_ATTR | BIND_STACKABLE);
-  Context;
 }
 
 static int check_tcl_pub(char *nick, char *from, char *chname, char *msg)
@@ -839,7 +818,6 @@
   char buf[512], *args = buf, *cmd, host[161], *hand;
   struct userrec *u;
 
-  Context;
   strcpy(args, msg);
   cmd = newsplit(&args);
   simple_sprintf(host, "%s!%s", nick, from);
@@ -851,10 +829,8 @@
   Tcl_SetVar(interp, "_pub3", hand, 0);
   Tcl_SetVar(interp, "_pub4", chname, 0);
   Tcl_SetVar(interp, "_pub5", args, 0);
-  Context;
   x = check_tcl_bind(H_pub, cmd, &fr, " $_pub1 $_pub2 $_pub3 $_pub4 $_pub5",
 		     MATCH_EXACT | BIND_USE_ATTR | BIND_HAS_BUILTINS);
-  Context;
   if (x == BIND_NOMATCH)
     return 0;
   if (x == BIND_EXEC_LOG)
@@ -868,7 +844,6 @@
   char buf[1024], host[161];
   struct userrec *u;
 
-  Context;
   simple_sprintf(buf, "%s %s", chname, msg);
   simple_sprintf(host, "%s!%s", nick, from);
   u = get_user_by_host(host);
@@ -878,10 +853,8 @@
   Tcl_SetVar(interp, "_pubm3", u ? u->handle : "*", 0);
   Tcl_SetVar(interp, "_pubm4", chname, 0);
   Tcl_SetVar(interp, "_pubm5", msg, 0);
-  Context;
   check_tcl_bind(H_pubm, buf, &fr, " $_pubm1 $_pubm2 $_pubm3 $_pubm4 $_pubm5",
 		 MATCH_MASK | BIND_USE_ATTR | BIND_STACKABLE);
-  Context;
 }
 
 static void check_tcl_need(char *chname, char *type)
@@ -1077,11 +1050,9 @@
 {
   struct chanset_t *chan;
 
-  Context;
   dprintf(DP_MODE, "JOIN 0\n");
   for (chan = chanset; chan; chan = chan->next)
     clear_channel(chan, 1);
-  Context;
   del_bind_table(H_topc);
   del_bind_table(H_splt);
   del_bind_table(H_sign);
@@ -1094,14 +1065,12 @@
   del_bind_table(H_pubm);
   del_bind_table(H_pub);
   del_bind_table(H_need);
-  Context;
   rem_tcl_ints(myints);
   rem_builtins(H_dcc, irc_dcc);
   rem_builtins(H_msg, C_msg);
   rem_builtins(H_raw, irc_raw);
   rem_tcl_commands(tclchan_cmds);
   rem_help_reference("irc.help");
-  Context;
   del_hook(HOOK_MINUTELY, (Function) check_expired_chanstuff);
   del_hook(HOOK_5MINUTELY, (Function) status_log);
   del_hook(HOOK_ADD_MODE, (Function) real_add_mode);
@@ -1112,9 +1081,7 @@
   Tcl_UntraceVar(interp, "net-type",
 		 TCL_TRACE_READS | TCL_TRACE_WRITES | TCL_TRACE_UNSETS,
 		 traced_nettype, NULL);
-  Context;
   module_undepend(MODULE_NAME);
-  Context;
   return NULL;
 }
 
@@ -1156,7 +1123,6 @@
 
   global = global_funcs;
 
-  Context;
   module_register(MODULE_NAME, irc_table, 1, 3);
   if (!module_depend(MODULE_NAME, "eggdrop", 106, 0)) {
     module_undepend(MODULE_NAME);
@@ -1170,7 +1136,6 @@
     module_undepend(MODULE_NAME);
     return "You need the channels module to use the irc module.";
   }
-  Context;
   for (chan = chanset; chan; chan = chan->next) {
     if (!channel_inactive(chan))
       dprintf(DP_MODE, "JOIN %s %s\n",
@@ -1178,7 +1143,6 @@
     chan->status &= ~(CHAN_ACTIVE | CHAN_PEND | CHAN_ASKEDBANS);
     chan->ircnet_status &= ~(CHAN_ASKED_INVITED | CHAN_ASKED_EXEMPTS);
   }
-  Context;
   add_hook(HOOK_MINUTELY, (Function) check_expired_chanstuff);
   add_hook(HOOK_5MINUTELY, (Function) status_log);
   add_hook(HOOK_ADD_MODE, (Function) real_add_mode);
@@ -1189,14 +1153,12 @@
   Tcl_TraceVar(interp, "rfc-compliant",
 	       TCL_TRACE_READS | TCL_TRACE_WRITES | TCL_TRACE_UNSETS,
 	       traced_rfccompliant, NULL);
-  Context;
   add_tcl_ints(myints);
   add_builtins(H_dcc, irc_dcc);
   add_builtins(H_msg, C_msg);
   add_builtins(H_raw, irc_raw);
   add_tcl_commands(tclchan_cmds);
   add_help_reference("irc.help");
-  Context;
   H_topc = add_bind_table("topc", HT_STACKABLE, channels_5char);
   H_splt = add_bind_table("splt", HT_STACKABLE, channels_4char);
   H_sign = add_bind_table("sign", HT_STACKABLE, channels_5char);
@@ -1209,8 +1171,6 @@
   H_pubm = add_bind_table("pubm", HT_STACKABLE, channels_5char);
   H_pub = add_bind_table("pub", 0, channels_5char);
   H_need = add_bind_table("need", HT_STACKABLE, channels_2char);
-  Context;
   do_nettype();
-  Context;
   return NULL;
 }
Index: eggdrop1.6/src/mod/irc.mod/mode.c
diff -u eggdrop1.6/src/mod/irc.mod/mode.c:1.39 eggdrop1.6/src/mod/irc.mod/mode.c:1.40
--- eggdrop1.6/src/mod/irc.mod/mode.c:1.39	Sun Dec 17 15:37:46 2000
+++ eggdrop1.6/src/mod/irc.mod/mode.c	Tue Jan 16 11:13:23 2001
@@ -4,7 +4,7 @@
  *   channel mode changes and the bot's reaction to them
  *   setting and getting the current wanted channel modes
  * 
- * $Id: mode.c,v 1.39 2000/12/17 21:37:46 guppy Exp $
+ * $Id: mode.c,v 1.40 2001/01/16 17:13:23 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -177,7 +177,6 @@
   memberlist *mx;
   char s[21];
   
-  Context;
   if (!me_op(chan))
     return;			/* No point in queueing the mode */
 
@@ -699,7 +698,6 @@
 {
   char s[UHOSTLEN];
 
-  Context;
   simple_sprintf(s, "%s!%s", nick, from);
   newexempt(chan, who, s);
 
@@ -729,7 +727,6 @@
   masklist *b ;
   int match = 0;
 
-  Context;
   e = chan->channel.exempt;
   old = NULL;
   while (e && e->mask[0] && rfc_casecmp(e->mask, who)) {
Index: eggdrop1.6/src/mod/irc.mod/msgcmds.c
diff -u eggdrop1.6/src/mod/irc.mod/msgcmds.c:1.18 eggdrop1.6/src/mod/irc.mod/msgcmds.c:1.19
--- eggdrop1.6/src/mod/irc.mod/msgcmds.c:1.18	Thu Oct 19 11:31:30 2000
+++ eggdrop1.6/src/mod/irc.mod/msgcmds.c	Tue Jan 16 11:13:23 2001
@@ -2,7 +2,7 @@
  * msgcmds.c -- part of irc.mod
  *   all commands entered via /MSG
  * 
- * $Id: msgcmds.c,v 1.18 2000/10/19 16:31:30 fabian Exp $
+ * $Id: msgcmds.c,v 1.19 2001/01/16 17:13:23 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -404,7 +404,6 @@
     dprintf(DP_HELP, "NOTICE %s :%s\n", nick, IRC_CHANHIDDEN);
     return 1;
   }
-  Context;
   putlog(LOG_CMDS, "*", "(%s!%s) !%s! WHO", nick, host, u->handle);
   also[0] = 0;
   i = 0;
@@ -458,7 +457,6 @@
   if (i) {
     dprintf(DP_HELP, "NOTICE %s :No info: %s\n", nick, also);
   }
-  Context;
   return 1;
 }
 
@@ -802,7 +800,6 @@
   /* Fixed previous lame code. Well it's still lame, will overflow the
    * buffer with a long channel-name. <cybah>
    */
-  Context;
   strcpy(s, "Channels: ");
   l = 10;
   for (chan = chanset; chan; chan = chan->next) {
@@ -826,7 +823,6 @@
     s[l] = 0;
     dprintf(DP_HELP, "NOTICE %s :%s\n", nick, s);
   }
-  Context;
   i = count_users(userlist);
   dprintf(DP_HELP, "NOTICE %s :%d user%s  (mem: %uk)\n", nick, i,
 	  i == 1 ? "" : "s", (int) (expected_memory() / 1024));
Index: eggdrop1.6/src/mod/irc.mod/tclirc.c
diff -u eggdrop1.6/src/mod/irc.mod/tclirc.c:1.16 eggdrop1.6/src/mod/irc.mod/tclirc.c:1.17
--- eggdrop1.6/src/mod/irc.mod/tclirc.c:1.16	Sat Sep  9 06:37:53 2000
+++ eggdrop1.6/src/mod/irc.mod/tclirc.c	Tue Jan 16 11:13:23 2001
@@ -1,7 +1,7 @@
 /* 
  * tclirc.c -- part of irc.mod
  * 
- * $Id: tclirc.c,v 1.16 2000/09/09 11:37:53 fabian Exp $
+ * $Id: tclirc.c,v 1.17 2001/01/16 17:13:23 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -36,13 +36,11 @@
 		     user = {FR_CHAN | FR_GLOBAL | FR_BOT, 0, 0, 0, 0, 0};
 
   BADARGS(2, 3, " channel ?flags?");
-  Context;
   chan = findchan_by_dname(argv[1]);
   if (!chan) {
     Tcl_AppendResult(irp, "invalid channel: ", argv[1], NULL);
     return TCL_ERROR;
   }
-  Context;
   m = chan->channel.member;
   if (argc == 2) {
     /* No flag restrictions so just whiz it thru quick */
@@ -292,7 +290,6 @@
   struct chanset_t *thechan = NULL;
   memberlist *m;
 
-  Context;
   BADARGS(2, 3, " nickname ?channel?");	/* drummer */
   if (argv[2]) {
     thechan = findchan_by_dname(argv[2]);
@@ -301,7 +298,6 @@
       return TCL_ERROR;
     }
   }
-  Context;
   chan = chanset;
   while (chan != NULL) {
     m = ismember(chan, argv[1]);
@@ -460,7 +456,6 @@
 {
   struct chanset_t *chan;
 
-  Context;
   BADARGS(2, 2, " channel-name");
   chan = findchan(argv[1]);
   if (chan) {
@@ -476,7 +471,6 @@
 {
   struct chanset_t *chan;
 
-  Context;
   BADARGS(2, 2, " channel-dname");
   chan = findchan_by_dname(argv[1]);
   if (chan) {
@@ -586,7 +580,6 @@
 {
   struct chanset_t *chan;
 
-  Context;
   BADARGS(2, 2, " channel");
   chan = findchan_by_dname(argv[1]);
   if (chan == NULL) {
@@ -601,7 +594,6 @@
 {
   struct chanset_t *chan;
 
-  Context;
   BADARGS(2, 2, " channel");
   chan = findchan_by_dname(argv[1]);
   if (chan == NULL) {
@@ -620,7 +612,6 @@
   struct chanset_t *thechan = NULL;
   struct userrec *u;
 
-  Context;
   BADARGS(2, 3, " handle ?channel?");	/* drummer */
   if (argv[2]) {
     chan = findchan_by_dname(argv[2]);
@@ -632,7 +623,6 @@
   } else {
     chan = chanset;
   }
-  Context;
   while ((chan != NULL) && ((thechan == NULL) || (thechan == chan))) {
     m = chan->channel.member;
     while (m && m->nick[0]) {
@@ -657,7 +647,6 @@
   struct chanset_t *thechan = NULL;
   struct userrec *u;
 
-  Context;
   BADARGS(2, 3, " nick ?channel?");	/* drummer */
   if (argv[2]) {
     chan = findchan_by_dname(argv[2]);
@@ -669,7 +658,6 @@
   } else {
     chan = chanset;
   }
-  Context;
   while ((chan != NULL) && ((thechan == NULL) || (thechan == chan))) {
     m = ismember(chan, argv[1]);
     if (m) {
@@ -680,7 +668,6 @@
     }
     chan = chan->next;
   }
-  Context;
   return TCL_OK;		/* blank */
 }
 
@@ -694,7 +681,6 @@
   char kicknick[512], *nick, *p, *comment = NULL;
   memberlist *m;
 
-  Context;
   BADARGS(3, 4, " channel nick?s? ?comment?");
   chan = findchan_by_dname(argv[1]);
   if (chan == NULL) { 
@@ -741,7 +727,6 @@
   /* Clear out all pending kicks in our local kick queue */
   if (k > 0)
     dprintf(DP_SERVER, "KICK %s %s :%s\n", chan->name, kicknick, comment);
-  Context;
   return TCL_OK;
 }
 
Index: eggdrop1.6/src/mod/notes.mod/cmdsnote.c
diff -u eggdrop1.6/src/mod/notes.mod/cmdsnote.c:1.8 eggdrop1.6/src/mod/notes.mod/cmdsnote.c:1.9
--- eggdrop1.6/src/mod/notes.mod/cmdsnote.c:1.8	Sat Sep 23 12:40:18 2000
+++ eggdrop1.6/src/mod/notes.mod/cmdsnote.c	Tue Jan 16 11:13:23 2001
@@ -2,7 +2,7 @@
  * cmdsnote.c -- part of notes.mod
  *   handles all notes interaction over the party line
  * 
- * $Id: cmdsnote.c,v 1.8 2000/09/23 17:40:18 fabian Exp $
+ * $Id: cmdsnote.c,v 1.9 2001/01/16 17:13:23 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -113,7 +113,6 @@
   char **ignores;
   int ignoresn, i;
 
-  Context;
   if (par[0]) {
     u2 = get_user_by_handle(userlist, par);
     if (u != u2) {
@@ -141,7 +140,6 @@
   for (i = 0; i < ignoresn; i++)
     dprintf(idx, " %s", ignores[i]);
   dprintf(idx, "\n");
-  Context;
   nfree(ignores[0]);		/* Free the string buffer	*/
   nfree(ignores);		/* Free the ptr array		*/
 }
Index: eggdrop1.6/src/mod/notes.mod/notes.c
diff -u eggdrop1.6/src/mod/notes.mod/notes.c:1.26 eggdrop1.6/src/mod/notes.mod/notes.c:1.27
--- eggdrop1.6/src/mod/notes.mod/notes.c:1.26	Sun Nov  5 22:06:44 2000
+++ eggdrop1.6/src/mod/notes.mod/notes.c	Tue Jan 16 11:13:23 2001
@@ -5,7 +5,7 @@
  *   note cmds
  *   note ignores
  * 
- * $Id: notes.c,v 1.26 2000/11/06 04:06:44 guppy Exp $
+ * $Id: notes.c,v 1.27 2001/01/16 17:13:23 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -68,7 +68,6 @@
 
 static void fwd_display(int idx, struct user_entry *e)
 {
-  Context;
   if (dcc[idx].user && (dcc[idx].user->flags & USER_BOTMAST))
     dprintf(idx, NOTES_FORWARD_TO, e->u.string);
 }
@@ -377,7 +376,6 @@
   int read, erased;
   int nl[128];			/* Is it enough ? */
 
-  Context;
   BADARGS(3, 3, " handle noteslist#");
   if (!get_user_by_handle(userlist, argv[1])) {
     Tcl_AppendResult(irp, "-1", NULL);
@@ -441,7 +439,6 @@
   int ln[128];			/* Is it enough? */
   char s[8];
 
-  Context;
   BADARGS(3, 3, " handle noteslist#");
   if (!get_user_by_handle(userlist, argv[1])) {
     Tcl_AppendResult(irp, "-1", NULL);
@@ -669,7 +666,6 @@
   int count, read, nl[128];	/* Is it enough? */
   char *list[3], *p;
 
-  Context;
   BADARGS(2, 3, " handle ?noteslist#?");
   if (!get_user_by_handle(userlist, argv[1])) {
     Tcl_AppendResult(irp, "-1", NULL);
@@ -872,7 +868,6 @@
 {
   int idx = findanyidx(sock);
 
-  Context;
   if (egg_strcasecmp(bot, botnetnick))
     return;
   if (msg && msg[0])
@@ -883,7 +878,6 @@
 
 static int chon_notes(char *nick, int idx)
 {
-  Context;
   if (dcc[idx].type == &DCC_CHAT)
     notes_read(nick, 0, "+", idx);
   return 0;
@@ -925,7 +919,6 @@
   struct user_entry *ue = find_user_entry(&USERENTRY_XTRA, u);
   struct xtra_key *xk, *nxk = NULL;
 
-  Context;
   if (!ue)
     return NULL;
   /* Search for the notes ignore list entry */
@@ -948,7 +941,6 @@
   char *buf, *p;
   int ignoresn;
 
-  Context;
   /* Hullo? sanity? */
   if (!u)
     return 0;
@@ -981,7 +973,6 @@
   char **ignores;
   int ignoresn, i;
 
-  Context;
   ignoresn = get_note_ignores(u, &ignores);
   if (ignoresn > 0) {
     /* Search for existing mask */
@@ -1025,7 +1016,6 @@
   char **ignores, *buf = NULL;
   int ignoresn, i, size = 0, foundit = 0;
 
-  Context;
   ignoresn = get_note_ignores(u, &ignores);
   if (!ignoresn)
     return 0;
@@ -1077,7 +1067,6 @@
   char **ignores;
   int ignoresn, i;
 
-  Context;
   ignoresn = get_note_ignores(u, &ignores);
   if (!ignoresn)
     return 0;
@@ -1229,7 +1218,6 @@
 
   global = global_funcs;
 
-  Context;
   notefile[0] = 0;
   module_register(MODULE_NAME, notes_table, 2, 1);
   if (!module_depend(MODULE_NAME, "eggdrop", 106, 0)) {
@@ -1252,7 +1240,6 @@
   notes_irc_setup(0);
   my_memcpy(&USERENTRY_FWD, &USERENTRY_INFO, sizeof(void *) * 12);
   add_entry_type(&USERENTRY_FWD);
-  Context;
   return NULL;
 }
 
Index: eggdrop1.6/src/mod/seen.mod/seen.c
diff -u eggdrop1.6/src/mod/seen.mod/seen.c:1.19 eggdrop1.6/src/mod/seen.mod/seen.c:1.20
--- eggdrop1.6/src/mod/seen.mod/seen.c:1.19	Mon Nov 20 23:18:05 2000
+++ eggdrop1.6/src/mod/seen.mod/seen.c	Tue Jan 16 11:13:23 2001
@@ -10,7 +10,7 @@
  * 1.2     1997-08-20      Minor fixes. [BB]
  * 1.2a    1997-08-24      Minor fixes. [BB]
  * 
- * $Id: seen.c,v 1.19 2000/11/21 05:18:05 guppy Exp $
+ * $Id: seen.c,v 1.20 2001/01/16 17:13:23 guppy Exp $
  */
 /* 
  * Copyright (C) 1999, 2000  Eggheads
@@ -117,7 +117,6 @@
   char prefix[50];
   struct chanset_t *chan = findchan_by_dname(channel);
 
-  Context;
   if ((chan != NULL) && channel_seen(chan)) {
     sprintf(prefix, "PRIVMSG %s :", chan->name);
     do_seen(DP_HELP, prefix, nick, hand, chan->dname, text);
@@ -129,7 +128,6 @@
 {
   char prefix[50];
 
-  Context;
   if (!u) {
     putlog(LOG_CMDS, "*", "[%s!%s] seen %s", nick, host, text);
     return 0;
@@ -142,7 +140,6 @@
 
 static int dcc_seen(struct userrec *u, int idx, char *par)
 {
-  Context;
   putlog(LOG_CMDS, "*", "#%s# seen %s", dcc[idx].nick, par);
   do_seen(idx, "", dcc[idx].nick, dcc[idx].nick, "", par);
   return 0;
@@ -182,7 +179,6 @@
   /* Have we got a NICK's target? */
   if (oix == word1)
     return;			/* Skip anything starting with ' */
-  Context;
   if (oix && *oix &&
       ((oix[1] && (oix[1] == 's' || oix[1] == 'S') && !oix[2]) ||
        (!oix[1] &&
@@ -391,7 +387,6 @@
     }
   }
   /* Check if the target was on the channel, but is netsplit */
-  Context;
   chan = findchan_by_dname(channel);
   if (chan) {
     m = ismember(chan, whotarget);
@@ -661,7 +656,6 @@
 {
   global = egg_func_table;
 
-  Context;
   module_register(MODULE_NAME, seen_table, 2, 0);
   if (!module_depend(MODULE_NAME, "eggdrop", 106, 0)) {
     module_undepend(MODULE_NAME);
Index: eggdrop1.6/src/mod/server.mod/server.c
diff -u eggdrop1.6/src/mod/server.mod/server.c:1.59 eggdrop1.6/src/mod/server.mod/server.c:1.60
--- eggdrop1.6/src/mod/server.mod/server.c:1.59	Sun Nov  5 22:06:44 2000
+++ eggdrop1.6/src/mod/server.mod/server.c	Tue Jan 16 11:13:23 2001
@@ -2,7 +2,7 @@
  * server.c -- part of server.mod
  *   basic irc server support
  * 
- * $Id: server.c,v 1.59 2000/11/06 04:06:44 guppy Exp $
+ * $Id: server.c,v 1.60 2001/01/16 17:13:23 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -240,7 +240,6 @@
   char *cmd, *par1, *par2, *par3;
   register int penalty, i, ii;
 
-  Context;
   if (!use_penalties &&
       net_type != NETT_UNDERNET && net_type != NETT_HYBRID_EFNET)
     return 0;
@@ -395,7 +394,6 @@
        *msg, *nextmsg, *cmd, *nextcmd, *to, *nextto, *stckbl;
   int len, doit = 0, found = 0, who_count =0;
 
-  Context;
   if (!use_fastdeq)
     return 0;
   switch (which) {
@@ -494,13 +492,11 @@
     last_time += calc_penalty(tosend);
     return 1;
   }
-  Context;
   return 0;
 }
 
 static void check_queues(char *oldnick, char *newnick)
 {
-  Context;
   if (optimize_kicks == 2) {
     if (modeq.head)
       parse_q(&modeq, oldnick, newnick);
@@ -509,7 +505,6 @@
     if (hq.head)
       parse_q(&hq, oldnick, newnick);
   }
-  Context;
 }
 
 static void parse_q(struct msgq_head *q, char *oldnick, char *newnick)
@@ -518,7 +513,6 @@
   char buf[511], *msg, *nicks, *nick, *chan, newnicks[511], newmsg[511];
   int changed;
 
-  Context;
   for (m = q->head; m;) {
     changed = 0;
     if (optimize_kicks == 2 && !egg_strncasecmp(m->msg, "KICK ", 5)) {
@@ -569,7 +563,6 @@
     else
       m = q->head;
   }
-  Context;
 }
 
 static void purge_kicks(struct msgq_head *q)
@@ -580,7 +573,6 @@
   int changed, found;
   struct chanset_t *cs;
 
-  Context;
   for (m = q->head; m;) {
     if (!egg_strncasecmp(m->msg, "KICK", 4)) {
       newnicks[0] = 0;
@@ -641,7 +633,6 @@
     else
       m = q->head;
   }
-  Context;
 }
 
 static int deq_kick(int which)
@@ -652,7 +643,6 @@
        newnicks[511], newnicks2[511], newmsg[511];
   int changed = 0, nr = 0;
 
-  Context;
   if (!optimize_kicks)
     return 0;
   newnicks[0] = 0;
@@ -915,7 +905,6 @@
   struct server_list *x, *z = serverlist;
   char *p, *q;
 
-  Context;
   while (z && z->next)
     z = z->next;
   while (ss) {
@@ -1138,7 +1127,6 @@
  */
 static char *get_altbotnick(void)
 {
-  Context;
   /* A random-number nick? */
   if (strchr(altnick, '?')) {
     if (!raltnick[0]) {
@@ -1153,7 +1141,6 @@
 static char *altnick_change(ClientData cdata, Tcl_Interp *irp, char *name1,
 			    char *name2, int flags)
 {
-  Context;
   /* Always unset raltnick. Will be regenerated when needed. */
   raltnick[0] = 0;
   return NULL;
@@ -1319,7 +1306,6 @@
   struct server_list *q;
   int lc, code, i;
 
-  Context;
   if (flags & (TCL_TRACE_READS | TCL_TRACE_UNSETS)) {
     /* Create server list */
     Tcl_DStringInit(&ds);
@@ -1357,7 +1343,6 @@
       Tcl_Free((char *) list);
     }
   }
-  Context;
   return NULL;
 }
 
@@ -1392,7 +1377,6 @@
   param = newsplit(&msg);
   ip = newsplit(&msg);
   prt = newsplit(&msg);
-  Context;
   if (egg_strcasecmp(action, "CHAT") || egg_strcasecmp(object, botname) || !u)
     return 0;
   get_user_flagrec(u, &fr, 0);
@@ -1621,7 +1605,6 @@
   int			 tot = 0;
   struct server_list	*s = serverlist;
 
-  Context;
   for (; s; s = s->next) {
     if (s->name)
       tot += strlen(s->name) + 1;
@@ -1679,18 +1662,14 @@
   };
   C_t[0].func = (Function) cmd_die;
 
-  Context;
   cycle_time = 100;
-  nuke_server("Connection reset by phear");
+  nuke_server("Connection reset by peer");
   clearq(serverlist);
-  Context;
   rem_builtins(H_dcc, C_dcc_serv);
   rem_builtins(H_raw, my_raw_binds);
   rem_builtins(H_ctcp, my_ctcps);
-  Context;
   /* Restore original commands. */
   add_builtins(H_dcc, C_t);
-  Context;
   del_bind_table(H_wall);
   del_bind_table(H_raw);
   del_bind_table(H_notc);
@@ -1699,13 +1678,11 @@
   del_bind_table(H_flud);
   del_bind_table(H_ctcr);
   del_bind_table(H_ctcp);
-  Context;
   rem_tcl_coups(my_tcl_coups);
   rem_tcl_strings(my_tcl_strings);
   rem_tcl_ints(my_tcl_ints);
   rem_help_reference("server.help");
   rem_tcl_commands(my_tcl_cmds);
-  Context;
   Tcl_UntraceVar(interp, "nick",
 		 TCL_TRACE_READS | TCL_TRACE_WRITES | TCL_TRACE_UNSETS,
 		 nick_change, NULL);
@@ -1724,16 +1701,13 @@
 		 TCL_TRACE_READS | TCL_TRACE_WRITES | TCL_TRACE_UNSETS,
 		 traced_nicklen, NULL);
   tcl_untraceserver("servers", NULL);
-  Context;
   empty_msgq();
-  Context;
   del_hook(HOOK_SECONDLY, (Function) server_secondly);
   del_hook(HOOK_5MINUTELY, (Function) server_5minutely);
   del_hook(HOOK_QSERV, (Function) queue_server);
   del_hook(HOOK_MINUTELY, (Function) minutely_checks);
   del_hook(HOOK_PRE_REHASH, (Function) server_prerehash);
   del_hook(HOOK_REHASH, (Function) server_postrehash);
-  Context;
   module_undepend(MODULE_NAME);
   return NULL;
 }
@@ -1855,7 +1829,6 @@
   kick_method = 1;
   optimize_kicks = 0;
 
-  Context;
   server_table[4] = (Function) botname;
   module_register(MODULE_NAME, server_table, 1, 1);
   if (!module_depend(MODULE_NAME, "eggdrop", 106, 0)) {
@@ -1863,7 +1836,6 @@
     return "This module requires eggdrop1.6.0 or later";
   }
 
-  Context;
   /* Fool bot in reading the values. */
   tcl_eggserver(NULL, interp, "servers", NULL, 0);
   tcl_traceserver("servers", NULL);
@@ -1888,7 +1860,6 @@
 	       TCL_TRACE_READS | TCL_TRACE_WRITES | TCL_TRACE_UNSETS,
 	       traced_nicklen, NULL);
 
-  Context;
   H_wall = add_bind_table("wall", HT_STACKABLE, server_2char);
   H_raw = add_bind_table("raw", HT_STACKABLE, server_raw);
   H_notc = add_bind_table("notc", HT_STACKABLE, server_6char);
@@ -1897,36 +1868,30 @@
   H_flud = add_bind_table("flud", HT_STACKABLE, server_5char);
   H_ctcr = add_bind_table("ctcr", HT_STACKABLE, server_6char);
   H_ctcp = add_bind_table("ctcp", HT_STACKABLE, server_6char);
-  Context;
   add_builtins(H_raw, my_raw_binds);
   add_builtins(H_dcc, C_dcc_serv);
   add_builtins(H_ctcp, my_ctcps);
   add_help_reference("server.help");
-  Context;
   my_tcl_strings[0].buf = botname;
   add_tcl_strings(my_tcl_strings);
   my_tcl_ints[0].val = &use_console_r;
   add_tcl_ints(my_tcl_ints);
   add_tcl_commands(my_tcl_cmds);
   add_tcl_coups(my_tcl_coups);
-  Context;
   add_hook(HOOK_SECONDLY, (Function) server_secondly);
   add_hook(HOOK_5MINUTELY, (Function) server_5minutely);
   add_hook(HOOK_MINUTELY, (Function) minutely_checks);
   add_hook(HOOK_QSERV, (Function) queue_server);
   add_hook(HOOK_PRE_REHASH, (Function) server_prerehash);
   add_hook(HOOK_REHASH, (Function) server_postrehash);
-  Context;
   mq.head = hq.head = modeq.head = NULL;
   mq.last = hq.last = modeq.last = NULL;
   mq.tot = hq.tot = modeq.tot = 0;
   mq.warned = hq.warned = modeq.warned = 0;
   double_warned = 0;
-  Context;
   newserver[0] = 0;
   newserverport = 0;
   getmyhostname(bothost);
-  Context;
   /* Wishful thinking ... */
   egg_snprintf(botuserhost, sizeof botuserhost, "%s@%s", botuser, bothost);
   curserv = 999;
Index: eggdrop1.6/src/mod/server.mod/servmsg.c
diff -u eggdrop1.6/src/mod/server.mod/servmsg.c:1.50 eggdrop1.6/src/mod/server.mod/servmsg.c:1.51
--- eggdrop1.6/src/mod/server.mod/servmsg.c:1.50	Sun Jan  7 21:43:06 2001
+++ eggdrop1.6/src/mod/server.mod/servmsg.c	Tue Jan 16 11:13:23 2001
@@ -1,7 +1,7 @@
 /* 
  * servmsg.c -- part of server.mod
  * 
- * $Id: servmsg.c,v 1.50 2001/01/08 03:43:06 guppy Exp $
+ * $Id: servmsg.c,v 1.51 2001/01/16 17:13:23 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -46,7 +46,6 @@
 {
   int l = strlen(botname) - 1;
 
-  Context;
   /* First run? */
   if (altnick_char == 0) {
     char *alt = get_altbotnick();
@@ -101,16 +100,13 @@
   char *hand = u ? u->handle : "*";
   int x;
 
-  Context;
   get_user_flagrec(u, &fr, NULL);
   Tcl_SetVar(interp, "_msg1", nick, 0);
   Tcl_SetVar(interp, "_msg2", uhost, 0);
   Tcl_SetVar(interp, "_msg3", hand, 0);
   Tcl_SetVar(interp, "_msg4", args, 0);
-  Context;
   x = check_tcl_bind(H_msg, cmd, &fr, " $_msg1 $_msg2 $_msg3 $_msg4",
 		     MATCH_EXACT | BIND_HAS_BUILTINS | BIND_USE_ATTR);
-  Context;
   if (x == BIND_EXEC_LOG)
     putlog(LOG_CMDS, "*", "(%s!%s) !%s! %s %s", nick, uhost, hand,
 	   cmd, args);
@@ -122,17 +118,14 @@
 {
   struct flag_record fr = {FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0, 0, 0, 0};
 
-  Context;
   get_user_flagrec(u, &fr, NULL);
   Tcl_SetVar(interp, "_notc1", nick, 0);
   Tcl_SetVar(interp, "_notc2", uhost, 0);
   Tcl_SetVar(interp, "_notc3", u ? u->handle : "*", 0);
   Tcl_SetVar(interp, "_notc4", arg, 0);
   Tcl_SetVar(interp, "_notc5", dest, 0);
-  Context;
   check_tcl_bind(H_notc, arg, &fr, " $_notc1 $_notc2 $_notc3 $_notc4 $_notc5",
 		 MATCH_MASK | BIND_USE_ATTR | BIND_STACKABLE);
-  Context;
 }
 
 static void check_tcl_msgm(char *cmd, char *nick, char *uhost,
@@ -141,7 +134,6 @@
   struct flag_record fr = {FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0, 0, 0, 0};
   char args[1024];
 
-  Context;
   if (arg[0])
     simple_sprintf(args, "%s %s", cmd, arg);
   else
@@ -151,10 +143,8 @@
   Tcl_SetVar(interp, "_msgm2", uhost, 0);
   Tcl_SetVar(interp, "_msgm3", u ? u->handle : "*", 0);
   Tcl_SetVar(interp, "_msgm4", args, 0);
-  Context;
   check_tcl_bind(H_msgm, args, &fr, " $_msgm1 $_msgm2 $_msgm3 $_msgm4",
 		 MATCH_MASK | BIND_USE_ATTR | BIND_STACKABLE);
-  Context;
 }
 
 /* Return 1 if processed.
@@ -163,14 +153,11 @@
 {
   int x;
 
-  Context;
   Tcl_SetVar(interp, "_raw1", from, 0);
   Tcl_SetVar(interp, "_raw2", code, 0);
   Tcl_SetVar(interp, "_raw3", msg, 0);
-  Context;
   x = check_tcl_bind(H_raw, code, 0, " $_raw1 $_raw2 $_raw3",
 		     MATCH_EXACT | BIND_STACKABLE | BIND_WANTRET);
-  Context;
   return (x == BIND_EXEC_LOG);
 }
 
@@ -181,7 +168,6 @@
   struct flag_record fr = {FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0, 0, 0, 0};
   int x;
 
-  Context;
   get_user_flagrec(u, &fr, NULL);
   Tcl_SetVar(interp, "_ctcpr1", nick, 0);
   Tcl_SetVar(interp, "_ctcpr2", uhost, 0);
@@ -194,7 +180,6 @@
 		     (lowercase_ctcp ? MATCH_EXACT : MATCH_CASE)
 		     | BIND_USE_ATTR | BIND_STACKABLE |
 		     ((table == H_ctcp) ? BIND_WANTRET : 0));
-  Context;
   return (x == BIND_EXEC_LOG) || (table == H_ctcr);
 }
 
@@ -202,13 +187,10 @@
 {
   int x;
 
-  Context;
   Tcl_SetVar(interp, "_wall1", from, 0);
   Tcl_SetVar(interp, "_wall2", msg, 0);
-  Context;
   x = check_tcl_bind(H_wall, msg, 0, " $_wall1 $_wall2",
 		     MATCH_MASK | BIND_STACKABLE);
-  Context;
   if (x == BIND_EXEC_LOG) {
     putlog(LOG_WALL, "*", "!%s! %s", from, msg);
     return 1;
@@ -221,17 +203,14 @@
 {
   int x;
 
-  Context;
   Tcl_SetVar(interp, "_flud1", nick, 0);
   Tcl_SetVar(interp, "_flud2", uhost, 0);
   Tcl_SetVar(interp, "_flud3", u ? u->handle : "*", 0);
   Tcl_SetVar(interp, "_flud4", ftype, 0);
   Tcl_SetVar(interp, "_flud5", chname, 0);
-  Context;
   x = check_tcl_bind(H_flud, ftype, 0,
 		     " $_flud1 $_flud2 $_flud3 $_flud4 $_flud5",
 		     MATCH_MASK | BIND_STACKABLE | BIND_WANTRET);
-  Context;
   return (x == BIND_EXEC_LOG);
 }
 
@@ -357,7 +336,6 @@
   struct userrec *u;
   int thr = 0, lapse = 0, atr;
 
-  Context;
   u = get_user_by_host(from);
   atr = u ? u->flags : 0;
   if (atr & (USER_BOT | USER_FRIEND))
@@ -695,7 +673,6 @@
   char *p;
   int r;
 
-  Context;
   fixcolon(msg);
   p = strchr(from, '!');
   if (p && (p == strrchr(from, '!'))) {
@@ -1094,7 +1071,6 @@
     } else
       putlog(LOG_RAW, "*", "[@] %s %s %s", from, code, msg);
   }
-  Context;
   /* This has GOT to go into the raw binding table, * merely because this
    * is less effecient.
   */
Index: eggdrop1.6/src/mod/server.mod/tclserv.c
diff -u eggdrop1.6/src/mod/server.mod/tclserv.c:1.6 eggdrop1.6/src/mod/server.mod/tclserv.c:1.7
--- eggdrop1.6/src/mod/server.mod/tclserv.c:1.6	Thu Mar 23 17:17:58 2000
+++ eggdrop1.6/src/mod/server.mod/tclserv.c	Tue Jan 16 11:13:23 2001
@@ -1,7 +1,7 @@
 /* 
  * tclserv.c -- part of server.mod
  * 
- * $Id: tclserv.c,v 1.6 2000/03/23 23:17:58 fabian Exp $
+ * $Id: tclserv.c,v 1.7 2001/01/16 17:13:23 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -36,7 +36,6 @@
 {
   char s[511], *p;
 
-  Context;
   BADARGS(2, 3, " text ?options?");
   if ((argc == 3) &&
       egg_strcasecmp(argv[2], "-next") && egg_strcasecmp(argv[2], "-normal")) {
@@ -63,7 +62,6 @@
 {
   char s[511], *p;
 
-  Context;
   BADARGS(2, 3, " text ?options?");
   if ((argc == 3) &&
     egg_strcasecmp(argv[2], "-next") && egg_strcasecmp(argv[2], "-normal")) {
@@ -90,7 +88,6 @@
 {
   char s[511], *p;
 
-  Context;
   BADARGS(2, 3, " text ?options?");
   if ((argc == 3) &&
     egg_strcasecmp(argv[2], "-next") && egg_strcasecmp(argv[2], "-normal")) {
Index: eggdrop1.6/src/mod/share.mod/share.c
diff -u eggdrop1.6/src/mod/share.mod/share.c:1.46 eggdrop1.6/src/mod/share.mod/share.c:1.47
--- eggdrop1.6/src/mod/share.mod/share.c:1.46	Thu Dec 21 14:12:43 2000
+++ eggdrop1.6/src/mod/share.mod/share.c	Tue Jan 16 11:13:24 2001
@@ -1,7 +1,7 @@
 /* 
  * share.c -- part of share.mod
  * 
- * $Id: share.c,v 1.46 2000/12/21 20:12:43 guppy Exp $
+ * $Id: share.c,v 1.47 2001/01/16 17:13:24 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -449,7 +449,6 @@
   char *hand, p[32];
   struct userrec *u;
 
-  Context;
   if ((dcc[idx].status & STAT_SHARE) && !private_user) {
     hand = newsplit(&par);
     if (!(u = get_user_by_handle(userlist, hand)) ||
@@ -476,7 +475,6 @@
   char *hand;
   struct userrec *u;
 
-  Context;
   if ((dcc[idx].status & STAT_SHARE) && !private_user) {
     hand = newsplit(&par);
     if ((u = get_user_by_handle(userlist, hand)) &&
@@ -953,7 +951,6 @@
 
 static void share_ufyes(int idx, char *par)
 {
-  Context;
   if (dcc[idx].status & STAT_OFFERED) {
     dcc[idx].status &= ~STAT_OFFERED;
     dcc[idx].status |= STAT_SHARE;
@@ -1011,7 +1008,6 @@
   int i, sock;
   FILE *f;
 
-  Context;
   egg_snprintf(s, sizeof s, ".share.%s.%lu.users", botnetnick, now);
   if (!(b_status(idx) & STAT_SHARE)) {
     dprintf(idx, "s e You didn't ask; you just started sending.\n");
@@ -1202,7 +1198,6 @@
   char *code;
   int f, i;
 
-  Context;
   code = newsplit(&msg);
   for (f = 0, i = 0; C_share[i].name && !f; i++) {
     int y = egg_strcasecmp(code, C_share[i].name);
@@ -1447,7 +1442,6 @@
   int i;
   struct share_msgq *q;
 
-  Context;
   for (i = 0; i < 5; i++)
     if (!egg_strcasecmp(dcc[idx].nick, tbuf[i].bot)) {
       while (tbuf[i].q) {
@@ -1539,7 +1533,6 @@
   char *p;
 
   nu = retu = NULL;
-  Context;
   noshare = 1;
   for (u = userlist; u; u = u->next)
     /* Only copying non-bot entries? */
@@ -1568,42 +1561,32 @@
 	}
       }
       for (ue = u->entries; ue; ue = ue->next) {
-	Context;
 	if (ue->name) {
 	  struct list_type *lt;
 	  struct user_entry *nue;
 
-	  Context;
 	  nue = user_malloc(sizeof(struct user_entry));
-
 	  nue->name = user_malloc(strlen(ue->name) + 1);
 	  nue->type = NULL;
 	  nue->u.list = NULL;
 	  strcpy(nue->name, ue->name);
 	  list_insert((&nu->entries), nue);
-	  Context;
 	  for (lt = ue->u.list; lt; lt = lt->next) {
 	    struct list_type *list;
 
-	    Context;
 	    list = user_malloc(sizeof(struct list_type));
-
 	    list->next = NULL;
 	    list->extra = user_malloc(strlen(lt->extra) + 1);
 	    strcpy(list->extra, lt->extra);
 	    list_append((&nue->u.list), list);
-	    Context;
 	  }
 	} else {
-	  Context;		/* arthur2: SEGV with sharing bug track */
 	  if (ue->type->dup_user && (t || ue->type->got_share))
 	    ue->type->dup_user(nu, u, ue);
-	  Context;
 	}
       }
     }
   noshare = 0;
-  Context;
   return retu;
 }
 
@@ -1628,7 +1611,6 @@
     return;
   }
   
-  Context;
   if (dcc[j].u.bot->uff_flags & UFF_OVERRIDE)
     debug1("NOTE: Sharing passively with %s, overriding local bots.",
 	   dcc[j].nick);
@@ -1641,7 +1623,6 @@
    * ignores since they will be replaced by what our hub gives us.
    */
 
-  Context;
   noshare = 1;
   fr.match = (FR_CHAN | FR_BOT);
   while (global_bans)
@@ -1668,7 +1649,6 @@
   ou = userlist;		/* Save old user list			*/
   userlist = (void *) -1;	/* Do this to prevent .user messups	*/
 
-  Context;
   /* Bot user pointers are updated to point to the new list, all others
    * are set to NULL. If our userfile will be overriden, just set _all_
    * to NULL directly.
@@ -1694,7 +1674,6 @@
     lastuser = NULL;		/* Reset last accessed user ptr.	*/
     return;
   }
-  Context;
   putlog(LOG_BOTS, "*", "%s.", USERF_XFERDONE);
 
   clear_chanlist();		/* Remove all user references from the
@@ -1726,7 +1705,6 @@
       struct chanuserrec *cr, *cr_next, *cr_old = NULL;
       struct user_entry *ue;
 
-      Context;
       if (private_global) {
 	u->flags = u2->flags;
 	u->flags_udef = u2->flags_udef;
@@ -1759,7 +1737,6 @@
 	    u->chanrec = cr;
 	  } else {
 	    /* Shared channel, still keep old laston time */
-	    Context;
 	    for (cr_old = u->chanrec; cr_old; cr_old = cr_old->next)
 	      if (!rfc_casecmp(cr_old->channel, cr->channel)) {
 		cr_old->laston = cr->laston;
@@ -1770,7 +1747,6 @@
 	}
       }
       /* Any unshared user entries need copying over */
-      Context;
       for (ue = u2->entries; ue; ue = ue->next)
 	if (ue->type && !ue->type->got_share && ue->type->dup_user)
 	  ue->type->dup_user(u, u2, ue);
@@ -1780,12 +1756,10 @@
     } else
       u->flags = (u->flags & ~private_globals_bitmask());
   }
-  Context;
   clear_userlist(ou);
   unlink(dcc[idx].u.xfer->filename);	/* Done with you!		*/
   reaffirm_owners();			/* Make sure my owners are +n	*/
   updatebot(-1, dcc[j].nick, '+', 0);
-  Context;
 }
 
 /* Begin the user transfer process.
@@ -1798,7 +1772,6 @@
   struct chanuserrec *ch;
   struct chanset_t *cst;
 
-  Context;
   egg_snprintf(share_file, sizeof share_file, ".share.%s.%lu", dcc[idx].nick,
 	       now);
   if (dcc[idx].u.bot->uff_flags & UFF_OVERRIDE) {
@@ -1815,7 +1788,6 @@
     dprintf(idx, "s e %s\n", "uff parsing failed");
     putlog(LOG_BOTS, "*", "uff parsing failed");
     dcc[idx].status &= ~(STAT_SHARE | STAT_SENDING | STAT_AGGRESSIVE);
-    Context;
     return;
   }
 
@@ -1893,7 +1865,6 @@
      */
     unlink(share_file);
   }
-  Context;
 }
 
 static void (*def_dcc_bot_kill) (int, void *) = 0;
@@ -1902,7 +1873,6 @@
 {
   int i, j, k = 0;
 
-  Context;
   if (idx < 0) {
     idx = -idx;
     k = 1;
@@ -1942,10 +1912,8 @@
 	(!(dcc[idx].status & STAT_SENDING)))
       new_tbuf(dcc[idx].nick);
   }
-  Context;
   if (!k)
     def_dcc_bot_kill(idx, x);
-  Context;
 }
 
 static tcl_ints my_ints[] =
@@ -1984,9 +1952,7 @@
 {
   int i;
 
-  Context;
   module_undepend(MODULE_NAME);
-  Context;
   putlog(LOG_MISC | LOG_BOTS, "*", "Unloaded sharing module, flushing tbuf's...");
   for (i = 0; i < 5; i++)
     if (tbuf[i].bot[0])
@@ -2107,7 +2073,6 @@
 
   global = global_funcs;
 
-  Context;
   module_register(MODULE_NAME, share_table, 2, 3);
   if (!module_depend(MODULE_NAME, "eggdrop", 106, 0)) {
     module_undepend(MODULE_NAME);
@@ -2137,8 +2102,6 @@
   add_builtins(H_dcc, my_cmds);
   uff_init();
   uff_addtable(internal_uff_table);
-
-  Context;
   return NULL;
 }
 
Index: eggdrop1.6/src/mod/share.mod/uf_features.c
diff -u eggdrop1.6/src/mod/share.mod/uf_features.c:1.5 eggdrop1.6/src/mod/share.mod/uf_features.c:1.6
--- eggdrop1.6/src/mod/share.mod/uf_features.c:1.5	Wed Dec 13 22:11:54 2000
+++ eggdrop1.6/src/mod/share.mod/uf_features.c	Tue Jan 16 11:13:24 2001
@@ -1,7 +1,7 @@
 /* 
  * uf_features.c -- part of share.mod
  * 
- * $Id: uf_features.c,v 1.5 2000/12/14 04:11:54 guppy Exp $
+ * $Id: uf_features.c,v 1.6 2001/01/16 17:13:24 guppy Exp $
  */
 /* 
  * Copyright (C) 2000  Eggheads
@@ -92,7 +92,6 @@
   uff_list_t *ul;
   int tot = 0;
 
-  Context;
   for (ul = uff_list.start; ul; ul = ul->next)
     tot += sizeof(uff_list_t);
   return tot;
@@ -106,7 +105,6 @@
 {
   uff_list_t *ul;
 
-  Context;
   for (ul = uff_list.start; ul; ul = ul->next)
     if (ul->entry->flag & flag)
       return ul;
@@ -120,7 +118,6 @@
 {
   uff_list_t *ul;
 
-  Context;
   for (ul = uff_list.start; ul; ul = ul->next)
     if (!strcmp(ul->entry->feature, feature))
       return ul;
@@ -133,7 +130,6 @@
 {
   uff_list_t	*ul, *lul = NULL;
 
-  Context;
   ul = uff_list.start;
   while (ul && ul->entry->priority < nul->entry->priority) {
     lul = ul;
@@ -154,14 +150,12 @@
     uff_list.start = nul;
   if (!nul->next)
     uff_list.end = nul;
-  Context;
 }
 
 /* Remove entry from sorted list.
  */
 static void uff_remove_entry(uff_list_t *ul)
 {
-  Context;
   if (!ul->next)
     uff_list.end = ul->prev;
   else
@@ -178,7 +172,6 @@
 {
   uff_list_t	*ul;
 
-  Context;
   if (uff_findentry_byname(ut->feature)) {
     putlog(LOG_MISC, "*", "(!) share: same feature name used twice: %s",
 	   ut->feature);
@@ -211,7 +204,6 @@
 {
   uff_list_t *ul;
 
-  Context;
   for (ul = uff_list.start; ul; ul = ul->next)
     if (!strcmp(ul->entry->feature, ut->feature)) {
       uff_remove_entry(ul);
@@ -244,7 +236,6 @@
   char *buf, *s, *p;
   uff_list_t *ul;
 
-  Context;
   uff_sbuf[0] = 0;				/* Reset static buffer	*/
   p = s = buf = nmalloc(strlen(par) + 1);	/* Allocate temp buffer	*/
   strcpy(buf, par);
@@ -278,7 +269,6 @@
 {
   uff_list_t *ul;
 
-  Context;
   uff_sbuf[0] = 0;
   for (ul = uff_list.start; ul; ul = ul->next)
     if (ul->entry->ask_func == NULL || ul->entry->ask_func(idx)) {
@@ -293,7 +283,6 @@
   char *buf, *s, *p;
   uff_list_t *ul;
 
-  Context;
   uff_sbuf[0] = 0;				/* Reset static buffer	*/
   p = s = buf = nmalloc(strlen(par) + 1);	/* Allocate temp buffer	*/
   strcpy(buf, par);
@@ -337,7 +326,6 @@
 {
   uff_list_t *ul;
 
-  Context;
   for (ul = uff_list.start; ul; ul = ul->next)
     if (ul->entry && ul->entry->snd &&
 	(dcc[idx].u.bot->uff_flags & ul->entry->flag))
@@ -354,7 +342,6 @@
 {
   uff_list_t *ul;
 
-  Context;
   for (ul = uff_list.end; ul; ul = ul->prev)
     if (ul->entry && ul->entry->rcv &&
 	(dcc[idx].u.bot->uff_flags & ul->entry->flag))
Index: eggdrop1.6/src/mod/transfer.mod/transfer.c
diff -u eggdrop1.6/src/mod/transfer.mod/transfer.c:1.33 eggdrop1.6/src/mod/transfer.mod/transfer.c:1.34
--- eggdrop1.6/src/mod/transfer.mod/transfer.c:1.33	Wed Dec 13 22:11:55 2000
+++ eggdrop1.6/src/mod/transfer.mod/transfer.c	Tue Jan 16 11:13:24 2001
@@ -1,7 +1,7 @@
 /* 
  * transfer.c -- part of transfer.mod
  * 
- * $Id: transfer.c,v 1.33 2000/12/14 04:11:55 guppy Exp $
+ * $Id: transfer.c,v 1.34 2001/01/16 17:13:24 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -226,14 +226,12 @@
   struct flag_record fr = {FR_GLOBAL | FR_CHAN | FR_ANYWH, 0, 0, 0, 0, 0};
   char *hand = u ? u->handle : "*";	/* u might be NULL. */
 
-  Context;
   get_user_flagrec(u, &fr, NULL);
   Tcl_SetVar(interp, "_sr1", hand, 0);
   Tcl_SetVar(interp, "_sr2", nick, 0);
   Tcl_SetVar(interp, "_sr3", path, 0);
   check_tcl_bind(h, hand, &fr, " $_sr1 $_sr2 $_sr3",
 		 MATCH_MASK | BIND_USE_ATTR | BIND_STACKABLE);
-  Context;
 }
 
 static void check_tcl_toutlost(struct userrec *u, char *nick, char *path,
@@ -244,7 +242,6 @@
   char *hand = u ? u->handle : "*";	/* u might be NULL. */
   char s[15];
  
-  Context;
   get_user_flagrec(u, &fr, NULL);
   Tcl_SetVar(interp, "_sr1", hand, 0);
   Tcl_SetVar(interp, "_sr2", nick, 0);
@@ -255,7 +252,6 @@
   Tcl_SetVar(interp, "_sr5", s, 0);
   check_tcl_bind(h, hand, &fr, " $_sr1 $_sr2 $_sr3 $_sr4 $_sr5",
 		 MATCH_MASK | BIND_USE_ATTR | BIND_STACKABLE);
-  Context;
 }                                                                     
 
 /* 
@@ -267,7 +263,6 @@
   fileq_t *q = fileq;
   int tot = 0;
 
-  Context;
   while (q != NULL) {
     tot += strlen(q->dir) + strlen(q->file) + 2 + sizeof(fileq_t);
     q = q->next;
@@ -709,7 +704,6 @@
   char s1[121];
   char *s2;
 
-  Context;
   fclose(dcc[idx].u.xfer->f);
   if (!strcmp(dcc[idx].nick, "*users")) {
     int x, y = 0;
@@ -751,7 +745,6 @@
   char *ofn, *nfn, s[1024], *hand;
   struct userrec *u;
 
-  Context;
   fclose(dcc[idx].u.xfer->f);
   if (dcc[idx].u.xfer->length == dcc[idx].status) {
     int l;
@@ -766,10 +759,8 @@
 
 	(f) (idx);
       }
-      Context;
       killsock(dcc[idx].sock);
       lostdcc(idx);
-      Context;
       return;
     }
     putlog(LOG_FILES, "*", "Completed dcc send %s from %s!%s",
@@ -778,7 +769,6 @@
     u = get_user_by_host(s);
     hand = u ? u->handle : "*";
 
-    Context;
     l = strlen(dcc[idx].u.xfer->filename);
     if (l > NAME_MAX) {
       /* The filename is to long... blow it off */
@@ -792,7 +782,6 @@
       lostdcc(idx);
       return;
     }
-    Context;
     /* Move the file from /tmp */
     ofn = nmalloc(strlen(tempdir) + strlen(dcc[idx].u.xfer->filename) + 1);
     nfn = nmalloc(strlen(dcc[idx].u.xfer->dir)
@@ -830,7 +819,6 @@
     return;
   }
   /* Failure :( */
-  Context;
   if (!strcmp(dcc[idx].nick, "*users")) {
     int x, y = 0;
 
@@ -919,7 +907,6 @@
   unsigned long cmp, l;
   int w = len + dcc[idx].u.xfer->sofar, p = 0;
 
-  Context;
   dcc[idx].timeval = now;		/* Mark as active		*/
 
   /* Add bytes to our buffer if we don't have a complete response yet.
@@ -1003,7 +990,6 @@
     return;
   if (dcc[idx].status == dcc[idx].u.xfer->length) {
     /* Successful send, we are done */
-    Context;
     killsock(dcc[idx].sock);
     fclose(dcc[idx].u.xfer->f);
     if (!strcmp(dcc[idx].nick, "*users")) {
@@ -1049,8 +1035,6 @@
       send_next_file(xnick);
     return;
   }
-  Context;
-
   /* Note:  No fseek() needed here, because the file position is kept from
    *        the last run.
    */
@@ -1066,7 +1050,6 @@
 {
   char xnick[NICKLEN], s[1024];
 
-  Context;
   fclose(dcc[idx].u.xfer->f);
   if (!strcmp(dcc[idx].nick, "*users")) {
     int x, y = 0;
@@ -1114,7 +1097,6 @@
   /* Send next queued file if there is one */
   if (!at_limit(xnick))
     send_next_file(xnick);
-  Context;
 }
 
 static void dcc_send(int idx, char *buf, int len)
@@ -1122,7 +1104,6 @@
   char s[512], *b;
   unsigned long sent;
 
-  Context;
   fwrite(buf, len, 1, dcc[idx].u.xfer->f);
   dcc[idx].status += len;
   /* Put in network byte order */
@@ -1153,7 +1134,6 @@
 {
   char xx[1024];
 
-  Context;
   fclose(dcc[i].u.xfer->f);
   if (strcmp(dcc[i].nick, "*users") == 0) {
     int x, y = 0;
@@ -1390,7 +1370,6 @@
   int i;
   char s[UHOSTLEN];
 
-  Context;
   i = answer(dcc[idx].sock, s, &ip, &port, 1);
   killsock(dcc[idx].sock);
   dcc[idx].sock = i;
@@ -1465,7 +1444,6 @@
   struct stat ss;
   FILE *f;
 
-  Context;
   stat(filename, &ss);
   /* File empty?! */
   if (ss.st_size == 0)
@@ -1547,9 +1525,6 @@
   char *par, *arg;
   struct filesys_stats *fs;
 
-  Context;
-  Assert(e);
-  Assert(e->name);
   fs = user_malloc(sizeof(struct filesys_stats));
   egg_bzero(fs, sizeof(struct filesys_stats));
   par = e->u.list->extra;
@@ -1576,13 +1551,7 @@
   register struct filesys_stats *fs;
   struct list_type *l = user_malloc(sizeof(struct list_type));
 
-  Context;
-  Assert(e);
-  Assert(!e->name);
-  Assert(e->u.extra);
   fs = e->u.extra;
-  /* If you set it in the declaration, the Assert will be useless. -- rtc */
-
   l->extra = user_malloc(41);
   egg_snprintf(l->extra, 41, "%09u %09u %09u %09u",
           fs->uploads, fs->upload_ks, fs->dnloads, fs->dnload_ks);
@@ -1597,9 +1566,6 @@
 {
   register struct filesys_stats *fs;
 
-  Context;
-  Assert(e);
-  Assert(e->u.extra);
   fs = e->u.extra;
   if (fprintf(f, "--FSTAT %09u %09u %09u %09u\n",
 	      fs->uploads, fs->upload_ks,
@@ -1612,8 +1578,6 @@
 {
   register struct filesys_stats *fs = buf;
 
-  Context;
-  Assert(e);
   if (e->u.extra != fs) {
     if (e->u.extra)
       nfree(e->u.extra);
@@ -1648,8 +1612,6 @@
   register struct filesys_stats *fs;
   char d[50];
 
-  Assert(e);
-  Assert(e->u.extra);
   BADARGS(3, 4, " handle FSTAT ?u/d?");
   fs = e->u.extra;
   if (argc == 3)
@@ -1671,8 +1633,6 @@
 
 static int fstat_kill(struct user_entry *e)
 {
-  Context;
-  Assert(e);
   if (e->u.extra)
     nfree(e->u.extra);
   nfree(e);
@@ -1688,8 +1648,6 @@
 {
   struct filesys_stats *fs;
 
-  Assert(e);
-  Assert(e->u.extra);
   fs = e->u.extra;
   dprintf(idx, "  FILES: %u download%s (%luk), %u upload%s (%luk)\n",
 	  fs->dnloads, (fs->dnloads == 1) ? "" : "s", fs->dnload_ks,
@@ -1729,7 +1687,6 @@
   char *p;
   struct filesys_stats *fs;
 
-  Assert(e);
   noshare = 1;
   switch (par[0]) {
   case 'u':
@@ -1768,7 +1725,6 @@
 {
   struct filesys_stats *fs;
 
-  Context;
   if (e->u.extra) {
     fs = user_malloc(sizeof(struct filesys_stats));
     my_memcpy(fs, e->u.extra, sizeof(struct filesys_stats));
@@ -1820,7 +1776,6 @@
   register struct filesys_stats *fs;
   int f = 0, k = 0;
 
-  Assert(e);
   BADARGS(4, 6, " handle FSTAT u/d ?files ?ks??");
   if (argc > 4)
     f = atoi(argv[4]);
@@ -1866,7 +1821,6 @@
   int i, port;
   unsigned long offset;
 
-  Context;
   strcpy(msg, text);
   action = newsplit(&msg);
   if (egg_strcasecmp(action, "RESUME"))
@@ -1929,7 +1883,6 @@
   int i;
   p_tcl_bind_list H_ctcp;
 
-  Context;
   putlog(LOG_MISC, "*", "Unloading transfer module, killing all transfer connections...");
   for (i = dcc_total - 1; i >= 0; i--) {
     if (dcc[i].type == &DCC_GET || dcc[i].type == &DCC_GET_PENDING)
@@ -2007,7 +1960,6 @@
 {
   global = global_funcs;
 
-  Context;
   fileq = NULL;
   module_register(MODULE_NAME, transfer_table, 2, 2);
   if (!module_depend(MODULE_NAME, "eggdrop", 106, 0)) {
Index: eggdrop1.6/src/mod/wire.mod/wire.c
diff -u eggdrop1.6/src/mod/wire.mod/wire.c:1.14 eggdrop1.6/src/mod/wire.mod/wire.c:1.15
--- eggdrop1.6/src/mod/wire.mod/wire.c:1.14	Sun Nov  5 22:06:45 2000
+++ eggdrop1.6/src/mod/wire.mod/wire.c	Tue Jan 16 11:13:24 2001
@@ -15,7 +15,7 @@
  * 1.4       1997-11-25      1.2.2.0         Added language addition  Kirk
  * 1.5       1998-07-12      1.3.0.0         Fixed ;me and updated    BB
  * 
- * $Id: wire.c,v 1.14 2000/11/06 04:06:45 guppy Exp $
+ * $Id: wire.c,v 1.15 2001/01/16 17:13:24 guppy Exp $
  */
 /* 
  * Copyright (C) 1999, 2000  Eggheads
@@ -69,7 +69,6 @@
   wire_list *w = wirelist;
   int size = 0;
 
-  Context;
   while (w) {
     size += sizeof(wire_list);
     size += strlen(w->crypt) + 1;
@@ -101,7 +100,6 @@
   char idle[20];
   char *enctmp;
 
-  Context;
   strcpy(wirecrypt, &cmd[5]);
   strcpy(wiretmp, param);
   nsplit(wirereq, param);
@@ -112,7 +110,6 @@
  */
 
   if (!strcmp(wirereq, "!wirereq")) {
-    Context;
     nsplit(wirewho, param);
     while (w) {
       if (!strcmp(w->crypt, wirecrypt)) {
@@ -162,7 +159,6 @@
     return;
   }
   if (!strcmp(wirereq, "!wireresp")) {
-    Context;
     nsplit(wirewho, param);
     reqsock = atoi(wirewho);
     w = wirelist;
@@ -185,7 +181,6 @@
     }
     return;
   }
-  Context;
   while (w) {
     if (!strcmp(wirecrypt, w->crypt))
       wire_display(findanyidx(w->sock), w->key, wirereq, param);
@@ -197,7 +192,6 @@
 {
   char *enctmp;
 
-  Context;
   enctmp = decrypt_string(key, message);
   if (from[0] == '!')
     dprintf(idx, "----- > %s %s\n", &from[1], enctmp + 1);
@@ -211,7 +205,6 @@
   wire_list *w = wirelist;
   int entry = 0;
 
-  Context;
   dprintf(idx, "Current Wire table:  (Base table address = %p)\n", w);
   while (w) {
     dprintf(idx, "entry %d: w=%p  idx=%d  sock=%d  next=%p\n",
@@ -228,7 +221,6 @@
   char idle[20], *enctmp;
   time_t now2 = now;
 
-  Context;
   w = wirelist;
   while (w) {
     if (w->sock == dcc[idx].sock)
@@ -286,7 +278,6 @@
 {
   wire_list *w = wirelist;
 
-  Context;
   if (!par[0]) {
     dprintf(idx, "%s: .wire [<encrypt-key>|OFF|info]\n", MISC_USAGE);
     return 0;
@@ -339,7 +330,6 @@
   char *enctmp;
   wire_list *w = wirelist, *w2;
 
-  Context;
   while (w) {
     if (w->next == 0)
       break;
@@ -356,7 +346,6 @@
   w->key = (char *) nmalloc(strlen(key) + 1);
   strcpy(w->key, key);
   w->next = 0;
-  Context;
   enctmp = encrypt_string(w->key, "wire");
   strcpy(wiretmp, enctmp);
   nfree(enctmp);
@@ -406,7 +395,6 @@
   wire_list *w2 = wirelist;
   wire_list *wlast = wirelist;
 
-  Context;
   while (w) {
     if (w->sock == sock)
       break;
@@ -483,7 +471,6 @@
   char wiretmp2[512];
   char *enctmp;
 
-  Context;
   while (w) {
     if (w->sock == dcc[idx].sock)
       break;
@@ -526,7 +513,6 @@
   int wiretot = 0;
   wire_list *w = wirelist;
 
-  Context;
   while (w) {
     wiretot++;
     w = w->next;
@@ -566,7 +552,6 @@
   /* Remove any current wire encrypt bindings for now, don't worry
    * about duplicate unbinds.
    */
-  Context;
   while (w) {
     enctmp = encrypt_string(w->key, "wire");
     sprintf(wiretmp, "!wire%s", enctmp);
@@ -611,7 +596,6 @@
 
   global = global_funcs;
 
-  Context;
   module_register(MODULE_NAME, wire_table, 2, 0);
   if (!module_depend(MODULE_NAME, "eggdrop", 106, 0)) {
     module_undepend(MODULE_NAME);
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.410 eggdrop1.6/src/patch.h:1.411
--- eggdrop1.6/src/patch.h:1.410	Sun Jan 14 21:28:10 2001
+++ eggdrop1.6/src/patch.h	Tue Jan 16 11:13:20 2001
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  * 
- * $Id: patch.h,v 1.410 2001/01/15 03:28:10 guppy Exp $
+ * $Id: patch.h,v 1.411 2001/01/16 17:13:20 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("979529275");		/* current unixtime */
+patch("979664567");		/* current unixtime */
 /*
  *
  *
  */
-patch("none");
+patch("modcontext");
 /*
  *
  *
----------------------- End of diff -----------------------



More information about the Changes mailing list