* Cleanup old lang.h defines

svn: 3855

misc/fixdefines.sh

@@ -0,0 +1,26 @@
+#! /bin/bash
+
+langfile="$1"
+for define in $(grep "#define.*\"" $langfile|awk '{print $2}'); do
+  str="$(grep "#define \<${define}\>.*\"" $langfile|grep -v STR|sed -e 's/.*"\(.*\)"/\1/')"
+  # Cleanup newline
+  str="$(echo "$str"|sed -e 's/\\n/\\\\n/g')"
+  # Cleanup /
+#  str="$(echo "$str"|sed -e 's:/:\/:g')"
+  str=${str/\//\\/}
+  str=${str/(/\\(}
+  str=${str/)/\\)}
+  str=${str/]/\\]}
+  str=${str/[/\\[}
+  replaced=0
+  echo "$define -> $str"
+  for file in $(find src -type f \! -name $(basename $langfile) -name "*.c"|grep -v svn); do 
+    grep "\<$define\>" $file > /dev/null 2>&1 && sed -i -e "s/\<$define\>/\"${str}\"/g" $file && echo "replace $define in $file" && replaced=1
+    #grep "[,(?:]*\<$define\>" $file > /dev/null 2>&1 && sed -i -e "s/\([,(?:]\) *\<$define\>/\1 \"${str}\"/g" $file && echo "replace $define in $file" && replaced=1
+  done
+
+  if [ $replaced -eq 1 ]; then
+    cp $langfile tmp
+    grep -v "#define \<${define}\>" tmp > $langfile
+  fi
+done

src/botcmd.c

@@ -56,8 +56,8 @@ static void fake_alert(int idx, char *item, char *extra, char *what)
 
   if ((now - lastfake) > 10) {	
     /* Don't fake_alert more than once every 10secs */
-    dprintf(idx, "ct %s NOTICE: %s (%s != %s). (%s)\n", conf.bot->nick, NET_FAKEREJECT, item, extra, what);
-    putlog(LOG_BOTS, "*", "%s %s (%s != %s). (%s)", dcc[idx].nick, NET_FAKEREJECT, item, extra, what);
+    dprintf(idx, "ct %s NOTICE: %s (%s != %s). (%s)\n", conf.bot->nick, "Fake message rejected", item, extra, what);
+    putlog(LOG_BOTS, "*", "%s %s (%s != %s). (%s)", dcc[idx].nick, "Fake message rejected", item, extra, what);
     lastfake = now;
   }
 }
@@ -284,7 +284,7 @@ static void bot_priv(int idx, char *par)
       if (from[0] != '@')
 	switch (i) {
 	case NOTE_ERROR:
-	  botnet_send_priv(idx, conf.bot->nick, from, NULL, "%s %s.", BOT_NOSUCHUSER, to);
+	  botnet_send_priv(idx, conf.bot->nick, from, NULL, "%s %s.", "No such user", to);
 	  break;
 	}
     }
@@ -303,7 +303,7 @@ static void bot_bye(int idx, char *par)
   bots = bots_in_subtree(findbot(dcc[idx].nick));
   users = users_in_subtree(findbot(dcc[idx].nick));
   simple_snprintf(s, sizeof(s), "%s %s. %s (lost %d bot%s and %d user%s)",
-		 BOT_DISCONNECTED, conf.bot->hub ? dcc[idx].nick : "botnet", par[0] ?
+		 "Disconnected from:", conf.bot->hub ? dcc[idx].nick : "botnet", par[0] ?
 		 par : "No reason", bots, (bots != 1) ?
 		 "s" : "", users, (users != 1) ? "s" : "");
   putlog(LOG_BOTS, "*", "%s", s);
@@ -342,7 +342,7 @@ static void remote_tell_who(int idx, char *nick, int chan)
   if (i > 10) {
     botnet_send_priv(idx, conf.bot->nick, nick, NULL, "%s  (%s)", s, ver);
   } else {
-    botnet_send_priv(idx, conf.bot->nick, nick, NULL, "%s  (%s)", BOT_NOCHANNELS, ver);
+    botnet_send_priv(idx, conf.bot->nick, nick, NULL, "%s  (%s)", "no channels", ver);
   }
   if (admin[0])
     botnet_send_priv(idx, conf.bot->nick, nick, NULL, "Admin: %s", admin);
@@ -383,7 +383,7 @@ static void remote_tell_who(int idx, char *nick, int chan)
     if (dcc[i].type && dcc[i].type == &DCC_BOT) {
       if (!ok) {
 	ok = 1;
-	botnet_send_priv(idx, conf.bot->nick, nick, NULL, "%s:", BOT_BOTSCONNECTED);
+	botnet_send_priv(idx, conf.bot->nick, nick, NULL, "%s:", "Bots connected");
       }
       sprintf(s, "  %s%c%-15s %s",
 	      dcc[i].status & STAT_CALLED ? "<-" : "->",
@@ -398,7 +398,7 @@ static void remote_tell_who(int idx, char *nick, int chan)
       if (dcc[i].u.chat->channel != chan) {
 	if (!ok) {
 	  ok = 1;
-	  botnet_send_priv(idx, conf.bot->nick, nick, NULL, "%s:", BOT_OTHERPEOPLE);
+	  botnet_send_priv(idx, conf.bot->nick, nick, NULL, "%s:", "Other people on the bot");
 	}
 	l = sprintf(s, "  %c%-15s %s", (geticon(i) == '-' ? ' ' : geticon(i)), dcc[i].nick, dcc[i].host);
 	if (now - dcc[i].timeval > 300) {
@@ -497,9 +497,9 @@ static void bot_link(int idx, char *par)
       rfrom = from;
     putlog(LOG_CMDS, "*", "#%s# link %s", rfrom, par);
     if (botlink(from, -1, par))
-      botnet_send_priv(idx, conf.bot->nick, from, NULL, "%s %s ...", BOT_LINKATTEMPT, par);
+      botnet_send_priv(idx, conf.bot->nick, from, NULL, "%s %s ...", "Attempting to link", par);
     else
-      botnet_send_priv(idx, conf.bot->nick, from, NULL, "%s.", BOT_CANTLINKTHERE);
+      botnet_send_priv(idx, conf.bot->nick, from, NULL, "%s.", "Can't link there");
   } else {
     i = nextbot(bot);
     if (i >= 0)
@@ -573,7 +573,7 @@ static void bot_unlink(int idx, char *par)
 	/* Ditto above, about idx */
 	i = nextbot(p + 1);
 	if (i >= 0)
-	  botnet_send_priv(i, conf.bot->nick, from, NULL, "%s %s.", BOT_CANTUNLINK, undes);
+	  botnet_send_priv(i, conf.bot->nick, from, NULL, "%s %s.", "Can't unlink", undes);
       }
     } else {
       p = strchr(from, '@');
@@ -685,7 +685,7 @@ static void bot_nlinked(int idx, char *par)
   
   if (x == '!') {
     if (conf.bot->hub)
-      chatout("*** (%s) %s %s.\n", next, NET_LINKEDTO, newbot);
+      chatout("*** (%s) %s %s.\n", next, "Linked to", newbot);
     else
       chatout("*** %s linked to botnet.\n", newbot);
     x = '-';
@@ -780,10 +780,10 @@ static void bot_traced(int idx, char *par)
           timer_get_now(&tv);
           tm = ((tv.sec % 10000) * 100 + (tv.usec * 100) / (1000000)) - t;
 
-          dprintf(i, "%s -> %s (%li.%li secs, %d hop%s)\n", BOT_TRACERESULT, p2,
+          dprintf(i, "%s -> %s (%li.%li secs, %d hop%s)\n", "Trace result", p2,
             (tm / 100), (tm % 100), j, (j != 1) ? "s" : "");
 	} else
-	  dprintf(i, "%s -> %s\n", BOT_TRACERESULT, p);
+	  dprintf(i, "%s -> %s\n", "Trace result", p);
       }
     }
   } else {
@@ -999,10 +999,10 @@ static void bot_join(int idx, char *par)
   botnet_send_join_party(idx, linking, i2);
   if (i != chan) {
     if (i >= 0) {
-      chanout_but(-1, i, "*** (%s) %s %s %s.\n", conf.bot->hub ? bot : "[botnet]", nick, NET_LEFTTHE, i ? "channel" : "party line");
+      chanout_but(-1, i, "*** (%s) %s %s %s.\n", conf.bot->hub ? bot : "[botnet]", nick, "has left the", i ? "channel" : "party line");
     }
     if (!linking)
-    chanout_but(-1, chan, "*** (%s) %s %s %s.\n", conf.bot->hub ? bot : "[botnet]", nick, NET_JOINEDTHE, chan ? "channel" : "party line");
+    chanout_but(-1, chan, "*** (%s) %s %s %s.\n", conf.bot->hub ? bot : "[botnet]", nick, "has joined the", chan ? "channel" : "party line");
   }
 }
 
@@ -1035,11 +1035,11 @@ static void bot_part(int idx, char *par)
 
       if (par[0])
 	chanout_but(-1, chan, "*** (%s) %s %s %s (%s).\n", conf.bot->hub ? bot : "[botnet]", nick,
-		    NET_LEFTTHE,
+		    "has left the",
 		    chan ? "channel" : "party line", par);
       else
 	chanout_but(-1, chan, "*** (%s) %s %s %s.\n", conf.bot->hub ? bot : "[botnet]", nick,
-		    NET_LEFTTHE,
+		    "has left the",
 		    chan ? "channel" : "party line");
     }
     botnet_send_part_party(idx, partyidx, par, silent);
@@ -1089,11 +1089,11 @@ static void bot_away(int idx, char *par)
     if (par[0])
       chanout_but(-1, party[partyidx].chan,
 		  "*** (%s) %s %s: %s.\n", conf.bot->hub ? bot : "[botnet]",
-		  party[partyidx].nick, NET_AWAY, par);
+		  party[partyidx].nick, "is now away", par);
     else
       chanout_but(-1, party[partyidx].chan,
 		  "*** (%s) %s %s.\n", conf.bot->hub ? bot : "[botnet]",
-		  party[partyidx].nick, NET_UNAWAY);
+		  party[partyidx].nick, "is no longer away");
   }
   botnet_send_away(idx, bot, sock, par, linking);
 }

src/botmsg.c

@@ -474,7 +474,7 @@ int add_note(char *to, char *from, char *msg, int idx, int echo)
     i = nextbot(p);
     if (i < 0) {
       if (idx >= 0)
-	dprintf(idx, BOT_NOTHERE);
+	dprintf(idx, "That bot isn't here.\n");
       return NOTE_ERROR;
     }
     if ((idx >= 0) && (echo))

src/botnet.c

@@ -433,9 +433,9 @@ void answer_local_whom(int idx, int chan)
   int i, t, nicklen, botnicklen, total = 0;
 
   if (chan == (-1))
-    dprintf(idx, "%s (+: %s, *: %s)\n", BOT_BOTNETUSERS, BOT_PARTYLINE, BOT_LOCALCHAN);
+    dprintf(idx, "%s (+: %s, *: %s)\n", "Users across the botnet", "Party line", "Local channel");
   else if (chan > 0)
-    dprintf(idx, "%s %s%d:\n", BOT_USERSONCHAN, (chan < GLOBAL_CHANS) ? "" : "*", chan % GLOBAL_CHANS);
+    dprintf(idx, "%s %s%d:\n", "Users on channel", (chan < GLOBAL_CHANS) ? "" : "*", chan % GLOBAL_CHANS);
 
   /* Find longest nick and botnick */
   nicklen = botnicklen = 0;
@@ -609,7 +609,7 @@ tell_bots(int idx, int up, const char *nodename)
 void tell_bottree(int idx)
 {
   if (tands == 0) {
-    dprintf(idx, "%s\n", BOT_NOBOTSLINKED);
+    dprintf(idx, "%s\n", "No bots linked.");
     return;
   }
 
@@ -638,7 +638,7 @@ void tell_bottree(int idx)
     color_str = (char *) NULL;
 
   if (s[0])
-    dprintf(idx, "(%s %s)\n", BOT_NOTRACEINFO, s);
+    dprintf(idx, "(%s %s)\n", "No trace info for:", s);
   dprintf(idx, "%s%s%s (%s %d)\n", color_str ? color_str : "", 
                                     conf.bot->nick,
                                     color_str ? COLOR_END(idx) : "",
@@ -648,7 +648,7 @@ void tell_bottree(int idx)
   work[0] = 0;
   while (more) {
     if (lev == 20) {
-      dprintf(idx, "\n%s\n", BOT_COMPLEXTREE);
+      dprintf(idx, "\n%s\n", "Tree too complex!");
       return;
     }
     cnt = 0;
@@ -878,15 +878,15 @@ int botunlink(int idx, const char *nick, const char *reason)
   tand_t *bot = NULL;
 
   if (nick[0] == '*')
-    dprintf(idx, "%s\n", BOT_UNLINKALL);
+    dprintf(idx, "%s\n", "Unlinking all bots...");
   for (i = 0; i < dcc_total; i++) {
     if (dcc[i].type && (nick[0] == '*') || !egg_strcasecmp(dcc[i].nick, nick)) {
       if (dcc[i].type == &DCC_FORK_BOT) {
 	if (idx >= 0)
-	  dprintf(idx, "%s: %s -> %s.\n", BOT_KILLLINKATTEMPT,
+	  dprintf(idx, "%s: %s -> %s.\n", "Killed link attempt to",
 		  dcc[i].nick, dcc[i].host);
 	putlog(LOG_BOTS, "*", "%s: %s -> %s:%d",
-	       BOT_KILLLINKATTEMPT, dcc[i].nick,
+	       "Killed link attempt to", dcc[i].nick,
 	       dcc[i].host, dcc[i].port);
 	killsock(dcc[i].sock);
 	lostdcc(i);
@@ -894,7 +894,7 @@ int botunlink(int idx, const char *nick, const char *reason)
 	  return 1;
       } else if (dcc[i].type == &DCC_BOT_NEW) {
 	if (idx >= 0)
-	  dprintf(idx, "%s %s.\n", BOT_ENDLINKATTEMPT,
+	  dprintf(idx, "%s %s.\n", "No longer trying to link:",
 		  dcc[i].nick);
 	putlog(LOG_BOTS, "*", "%s %s @ %s:%d",
 	       "Stopped trying to link", dcc[i].nick,
@@ -907,7 +907,7 @@ int botunlink(int idx, const char *nick, const char *reason)
 	char s[1024] = "";
 
 	if (idx >= 0)
-	  dprintf(idx, "%s %s.\n", BOT_BREAKLINK, dcc[i].nick);
+	  dprintf(idx, "%s %s.\n", "Breaking link with", dcc[i].nick);
 	else if ((idx == -3) && (b_status(i) & STAT_SHARE) && !share_unlinks)
 	  return -1;
 	bot = findbot(dcc[i].nick);
@@ -915,13 +915,13 @@ int botunlink(int idx, const char *nick, const char *reason)
 	users = users_in_subtree(bot);
 	if (reason && reason[0]) {
 	  simple_snprintf(s, sizeof(s), "%s %s (%s) (lost %d bot%s and %d user%s)",
-	  		 BOT_UNLINKEDFROM, dcc[i].nick, reason, bots,
+	  		 "Unlinked from:", dcc[i].nick, reason, bots,
 			 (bots != 1) ? "s" : "", users, (users != 1) ?
 			 "s" : "");
 	  dprintf(i, "bye %s\n", reason);
 	} else {
 	  simple_snprintf(s, sizeof(s), "%s %s (lost %d bot%s and %d user%s)",
-	  		 BOT_UNLINKEDFROM, dcc[i].nick, bots, (bots != 1) ?
+	  		 "Unlinked from:", dcc[i].nick, bots, (bots != 1) ?
 			 "s" : "", users, (users != 1) ? "s" : "");
 	  dprintf(i, "bye No reason\n");
 	}
@@ -935,7 +935,7 @@ int botunlink(int idx, const char *nick, const char *reason)
     }
   }
   if (idx >= 0 && nick[0] != '*')
-    dprintf(idx, "%s\n", BOT_NOTCONNECTED);
+    dprintf(idx, "%s\n", "Not connected to that bot.");
   if (nick[0] != '*') {
     bot = findbot(nick);
     if (bot) {
@@ -958,7 +958,7 @@ int botunlink(int idx, const char *nick, const char *reason)
     }
   }
   if (nick[0] == '*') {
-    dprintf(idx, "%s\n", BOT_WIPEBOTTABLE);
+    dprintf(idx, "%s\n", "Smooshing bot tables and assocs...");
     while (tandbot)
       rembot(tandbot->bot);
     while (parties) {
@@ -978,10 +978,10 @@ int botlink(char *linker, int idx, char *nick)
 
   if (!u || !u->bot) {
     if (idx >= 0)
-      dprintf(idx, "%s %s\n", nick, BOT_BOTUNKNOWN);
+      dprintf(idx, "%s %s\n", nick, "is not a known bot.");
   } else if (!egg_strcasecmp(nick, conf.bot->nick)) {
     if (idx >= 0)
-      dprintf(idx, "%s\n", BOT_CANTLINKMYSELF);
+      dprintf(idx, "%s\n", "Link to myself?  Oh boy, Freud would have a field day.");
   } else if (in_chain(nick) && (idx != -3)) {
     if (idx >= 0)
       dprintf(idx, "That bot is already connected up.\n");
@@ -1007,7 +1007,7 @@ int botlink(char *linker, int idx, char *nick)
       }
     } else if (dcc_total == max_dcc) {
       if (idx >= 0)
-	dprintf(idx, "%s\n", DCC_TOOMANYDCCS1);
+	dprintf(idx, "%s\n", "Sorry, too many DCC connections.");
     } else {
       correct_handle(nick);
 
@@ -1145,11 +1145,11 @@ void tandem_relay(int idx, char *nick, register int i)
   struct userrec *u = get_user_by_handle(userlist, nick);
 
   if (!u || !u->bot) {
-    dprintf(idx, "%s %s\n", nick, BOT_BOTUNKNOWN);
+    dprintf(idx, "%s %s\n", nick, "is not a known bot.");
     return;
   }
   if (!egg_strcasecmp(nick, conf.bot->nick)) {
-    dprintf(idx, "%s\n", BOT_CANTRELAYMYSELF);
+    dprintf(idx, "%s\n", "Relay to myself?  What on EARTH would be the point?!");
     return;
   }
 
@@ -1166,7 +1166,7 @@ void tandem_relay(int idx, char *nick, register int i)
   i = new_dcc(&DCC_DNSWAIT, sizeof(struct dns_info));
 
   if (i < 0) {
-    dprintf(idx, "%s\n", DCC_TOOMANYDCCS1);
+    dprintf(idx, "%s\n", "Sorry, too many DCC connections.");
     return;
   }
 
@@ -1177,7 +1177,7 @@ void tandem_relay(int idx, char *nick, register int i)
   dcc[i].user = u;
   strcpy(dcc[i].host, bi->address);
   if (conf.bot->hub) 
-    dprintf(idx, "%s %s @ %s:%d ...\n", BOT_CONNECTINGTO, nick, bi->address, bi->relay_port);
+    dprintf(idx, "%s %s @ %s:%d ...\n", "Connecting to", nick, bi->address, bi->relay_port);
   dprintf(idx, "(Type *BYE* on a line by itself to abort.)\n");
   dcc[idx].type = &DCC_PRE_RELAY;
 
@@ -1339,8 +1339,8 @@ static void failed_pre_relay(int idx)
     lostdcc(idx);
     return;
   }
-  putlog(LOG_MISC, "*", "%s [%s]%s/%d", BOT_LOSTDCCUSER, dcc[idx].nick, dcc[idx].host, dcc[idx].port);
-  putlog(LOG_MISC, "*", "(%s %s)", BOT_DROPPINGRELAY, dcc[tidx].nick);
+  putlog(LOG_MISC, "*", "%s [%s]%s/%d", "Lost dcc connection to", dcc[idx].nick, dcc[idx].host, dcc[idx].port);
+  putlog(LOG_MISC, "*", "(%s %s)", "Dropping relay attempt to", dcc[tidx].nick);
   if ((dcc[tidx].sock != STDOUT) || backgrd) {
     if (idx > tidx) {
       int t = tidx;
@@ -1378,9 +1378,9 @@ static void cont_tandem_relay(int idx, char *buf, register int len)
   dcc[idx].type = &DCC_RELAY;
   dcc[idx].u.relay->sock = dcc[uidx].sock;
   dcc[uidx].u.relay->sock = dcc[idx].sock;
-  dprintf(uidx, "%s %s ...\n", BOT_RELAYSUCCESS, dcc[idx].nick);
+  dprintf(uidx, "%s %s ...\n", "Success!\n\nNOW CONNECTED TO RELAY BOT", dcc[idx].nick);
   dprintf(uidx, "(You can type *BYE* to prematurely close the connection.)\n\n");
-  putlog(LOG_MISC, "*", "%s %s -> %s", BOT_RELAYLINK,
+  putlog(LOG_MISC, "*", "%s %s -> %s", "Relay link:",
 	 dcc[uidx].nick, dcc[idx].nick);
 
   ri = dcc[uidx].u.relay;
@@ -1413,9 +1413,9 @@ static void eof_dcc_relay(int idx)
   /* In case echo was off, turn it back on (send IAC WON'T ECHO): */
   if (dcc[j].status & STAT_TELNET)
     dprintf(j, TLN_IAC_C TLN_WONT_C TLN_ECHO_C "\n");
-  putlog(LOG_MISC, "*", "%s: %s -> %s", BOT_ENDRELAY1, dcc[j].nick,
+  putlog(LOG_MISC, "*", "%s: %s -> %s", "Ended relay link", dcc[j].nick,
 	 dcc[idx].nick);
-  dprintf(j, "\n\n*** %s %s\n", BOT_ENDRELAY2, conf.bot->nick);
+  dprintf(j, "\n\n*** %s %s\n", "RELAY CONNECTION DROPPED.\nYou are now back on", conf.bot->nick);
 
   struct chat_info *ci = dcc[j].u.relay->chat;
 
@@ -1424,7 +1424,7 @@ static void eof_dcc_relay(int idx)
   dcc[j].type = &DCC_CHAT;
   if (dcc[j].u.chat->channel >= 0) {
     chanout_but(-1, dcc[j].u.chat->channel, "*** %s %s.\n",
-		dcc[j].nick, BOT_PARTYREJOINED);
+		dcc[j].nick, "rejoined the party line.");
     if (dcc[j].u.chat->channel < GLOBAL_CHANS)
       botnet_send_join_idx(j);
   }
@@ -1437,7 +1437,7 @@ static void eof_dcc_relaying(int idx)
 {
   register int j, x = dcc[idx].u.relay->sock;
 
-  putlog(LOG_MISC, "*", "%s [%s]%s/%d", BOT_LOSTDCCUSER, dcc[idx].nick, dcc[idx].host, dcc[idx].port);
+  putlog(LOG_MISC, "*", "%s [%s]%s/%d", "Lost dcc connection to", dcc[idx].nick, dcc[idx].host, dcc[idx].port);
   killsock(dcc[idx].sock);
   lostdcc(idx);
 
@@ -1445,7 +1445,7 @@ static void eof_dcc_relaying(int idx)
     if (dcc[j].type && dcc[j].sock == x && dcc[j].type != &DCC_FORK_RELAY)
       break;
 
-  putlog(LOG_MISC, "*", "(%s %s)", BOT_DROPPEDRELAY, dcc[j].nick);
+  putlog(LOG_MISC, "*", "(%s %s)", "Dropping relay link to", dcc[j].nick);
   killsock(dcc[j].sock);
   lostdcc(j);			/* Drop connection to the bot */
 }
@@ -1507,9 +1507,9 @@ static void dcc_relaying(int idx, char *buf, int j)
   /* In case echo was off, turn it back on (send IAC WON'T ECHO): */
   if (dcc[idx].status & STAT_TELNET)
     dprintf(idx, TLN_IAC_C TLN_WONT_C TLN_ECHO_C "\n");
-  dprintf(idx, "\n(%s %s.)\n", BOT_BREAKRELAY, dcc[j].nick);
+  dprintf(idx, "\n(%s %s.)\n", "Breaking connection to", dcc[j].nick);
   dprintf(idx, "You are now back on %s.\n\n", conf.bot->nick);
-  putlog(LOG_MISC, "*", "%s: %s -> %s", BOT_RELAYBROKEN, dcc[idx].nick, dcc[j].nick);
+  putlog(LOG_MISC, "*", "%s: %s -> %s", "Relay broken", dcc[idx].nick, dcc[j].nick);
   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);
     if (dcc[idx].u.relay->chat->channel < GLOBAL_CHANS)
@@ -1642,13 +1642,13 @@ void check_botnet_pings()
 	    if (dcc[i].status & STAT_WARNED) {
 	      char s[1024] = "";
 
-	      putlog(LOG_BOTS, "*", "%s %s (%s).", BOT_DISCONNECTED, dcc[i].nick, BOT_BOTNOTLEAFLIKE);
-              dprintf(i, "bye %s\n", BOT_BOTNOTLEAFLIKE);
+	      putlog(LOG_BOTS, "*", "%s %s (%s).", "Disconnected from:", dcc[i].nick, "unleaflike behavior");
+              dprintf(i, "bye %s\n", "unleaflike behavior");
 	      bot = findbot(dcc[i].nick);
 	      bots = bots_in_subtree(bot);
 	      users = users_in_subtree(bot);
 	      simple_snprintf(s, sizeof(s), "%s %s (%s) (lost %d bot%s and %d user%s)",
-	    		   BOT_DISCONNECTED, dcc[i].nick, BOT_BOTNOTLEAFLIKE,
+	    		   "Disconnected from:", dcc[i].nick, "unleaflike behavior",
 			   bots, (bots != 1) ? "s" : "", users, (users != 1) ?
 			   "s" : "");
 	      chatout("*** %s\n", s);
@@ -1667,11 +1667,11 @@ void check_botnet_pings()
       if (dcc[i].status & STAT_PINGED) {
         char s[1024] = "";
 
-        putlog(LOG_BOTS, "*", "%s: %s", BOT_PINGTIMEOUT, dcc[i].nick);
+        putlog(LOG_BOTS, "*", "%s: %s", "Ping timeout", dcc[i].nick);
         bot = findbot(dcc[i].nick);
         bots = bots_in_subtree(bot);
         users = users_in_subtree(bot);
-        simple_snprintf(s, sizeof(s), "%s: %s (lost %d bot%s and %d user%s)", BOT_PINGTIMEOUT,
+        simple_snprintf(s, sizeof(s), "%s: %s (lost %d bot%s and %d user%s)", "Ping timeout",
   		       dcc[i].nick, bots, (bots != 1) ? "s" : "",
 		       users, (users != 1) ? "s" : "");
         chatout("*** %s\n", s);
@@ -1696,7 +1696,7 @@ void zapfbot(int idx)
   tand_t *bot = findbot(dcc[idx].nick);
   int bots = bots_in_subtree(bot), users = users_in_subtree(bot);
 
-  simple_snprintf(s, sizeof(s), "%s: %s (lost %d bot%s and %d user%s)", BOT_BOTDROPPED,
+  simple_snprintf(s, sizeof(s), "%s: %s (lost %d bot%s and %d user%s)", "Dropped bot",
   		 dcc[idx].nick, bots, (bots != 1) ? "s" : "", users,
 		 (users != 1) ? "s" : "");
   chatout("*** %s\n", s);

src/dcc.c

@@ -326,7 +326,7 @@ failed_link(int idx)
     add_note(s1, conf.bot->nick, s, -2, 0);
   }
   if (dcc[idx].u.bot->numver >= (-1))
-    putlog(LOG_BOTS, "*", DCC_LINKFAIL, dcc[idx].nick);
+    putlog(LOG_BOTS, "*", "Failed link to %s.", dcc[idx].nick);
   if (dcc[idx].sock != -1) {
     killsock(dcc[idx].sock);
     dcc[idx].sock = -1;
@@ -420,7 +420,7 @@ dcc_bot_new(int idx, char *buf, int x)
 static void
 eof_dcc_bot_new(int idx)
 {
-  putlog(LOG_BOTS, "*", DCC_LOSTBOT, dcc[idx].nick);
+  putlog(LOG_BOTS, "*", "Lost Bot: %s", dcc[idx].nick);
   killsock(dcc[idx].sock);
   lostdcc(idx);
 }
@@ -429,7 +429,7 @@ static void
 timeout_dcc_bot_new(int idx)
 {
   if (conf.bot->hub)
-    putlog(LOG_BOTS, "*", DCC_TIMEOUT, dcc[idx].nick, dcc[idx].host, dcc[idx].port);
+    putlog(LOG_BOTS, "*", "Timeout: bot link to %s at %s:%d", dcc[idx].nick, dcc[idx].host, dcc[idx].port);
   else
     putlog(LOG_BOTS, "*", "Timeout: bot link to %s", dcc[idx].nick);
   killsock(dcc[idx].sock);
@@ -624,7 +624,7 @@ dcc_identd_connect(int idx, char *buf, int atr)
     sock = answer(sock, s, &ip, &port, 0);
 
   if (sock < 0) {
-    putlog(LOG_MISC, "*", DCC_FAILED, strerror(errno));
+    putlog(LOG_MISC, "*", "Failed TELNET incoming (%s)", strerror(errno));
     return;
   }
   /* changeover_dcc(idx, &DCC_IDENTD, 0); */
@@ -674,7 +674,7 @@ dcc_chat_secpass(int idx, char *buf, int atr)
 
   /* Correct pass or secpass! */
   if (!dcc[idx].wrong_pass && (!dccauth || (dccauth && !badauth))) {
-    putlog(LOG_MISC, "*", DCC_LOGGEDIN, dcc[idx].nick, dcc[idx].host, dcc[idx].port);
+    putlog(LOG_MISC, "*", "Logged in: %s (%s/%d)", dcc[idx].nick, dcc[idx].host, dcc[idx].port);
     if (dcc[idx].u.chat->away) {
       free(dcc[idx].u.chat->away);
       dcc[idx].u.chat->away = NULL;
@@ -702,7 +702,7 @@ dcc_chat_secpass(int idx, char *buf, int atr)
     dcc_chatter(idx);
   } else if ((dccauth && badauth) || dcc[idx].wrong_pass) { 		/* bad auth */
     dprintf(idx, "%s\n", response(RES_BADUSERPASS));
-    putlog(LOG_MISC, "*", DCC_BADAUTH, dcc[idx].nick, dcc[idx].host, dcc[idx].port);
+    putlog(LOG_MISC, "*", "Bad Auth: [%s]%s/%d", dcc[idx].nick, dcc[idx].host, dcc[idx].port);
     if (dcc[idx].u.chat->away) {        /* su from a dumb user */
       /* Turn echo back on for telnet sessions (send IAC WON'T ECHO). */
       if (dcc[idx].status & STAT_TELNET)
@@ -718,7 +718,7 @@ dcc_chat_secpass(int idx, char *buf, int atr)
       dcc[idx].u.chat->channel = dcc[idx].u.chat->su_channel;
       if (dcc[idx].u.chat->channel < GLOBAL_CHANS)
         botnet_send_join_idx(idx);
-      chanout_but(-1, dcc[idx].u.chat->channel, DCC_JOIN, dcc[idx].nick);
+      chanout_but(-1, dcc[idx].u.chat->channel, "*** %s has joined the party line.\n", dcc[idx].nick);
     } else {
       killsock(dcc[idx].sock);
       lostdcc(idx);
@@ -729,7 +729,7 @@ dcc_chat_secpass(int idx, char *buf, int atr)
 static void
 eof_dcc_general(int idx)
 {
-  putlog(LOG_MISC, "*", DCC_LOSTDCC, dcc[idx].nick, dcc[idx].host, dcc[idx].port);
+  putlog(LOG_MISC, "*", "Lost dcc connection to %s (%s/%d)", dcc[idx].nick, dcc[idx].host, dcc[idx].port);
   killsock(dcc[idx].sock);
   lostdcc(idx);
 }
@@ -737,7 +737,7 @@ eof_dcc_general(int idx)
 static void
 tout_dcc_chat_secpass(int idx)
 {
-  putlog(LOG_MISC, "*", DCC_SPWDTIMEOUT, dcc[idx].nick, dcc[idx].host);
+  putlog(LOG_MISC, "*", "Auth timeout on dcc chat: [%s]%s", dcc[idx].nick, dcc[idx].host);
   killsock(dcc[idx].sock);
   lostdcc(idx);
 }
@@ -751,7 +751,7 @@ display_dcc_chat_secpass(int idx, char *buf)
 static void
 tout_dcc_chat_pass(int idx)
 {
-  putlog(LOG_MISC, "*", DCC_PWDTIMEOUT, dcc[idx].nick, dcc[idx].host);
+  putlog(LOG_MISC, "*", "Password timeout on dcc chat: [%s]%s", dcc[idx].nick, dcc[idx].host);
   killsock(dcc[idx].sock);
   lostdcc(idx);
 }
@@ -1012,7 +1012,7 @@ dcc_chat_pass(int idx, char *buf, int atr)
     }
   } else {
     dprintf(idx, "%s\n", response(RES_BADUSERPASS));
-    putlog(LOG_MISC, "*", DCC_BADLOGIN, dcc[idx].nick, dcc[idx].host, dcc[idx].port);
+    putlog(LOG_MISC, "*", "Bad Password: [%s]%s/%d", dcc[idx].nick, dcc[idx].host, dcc[idx].port);
     if (dcc[idx].u.chat->away) {        /* su from a dumb user */
       /* Turn echo back on for telnet sessions (send IAC WON'T ECHO). */
       if (dcc[idx].status & STAT_TELNET)
@@ -1028,7 +1028,7 @@ dcc_chat_pass(int idx, char *buf, int atr)
       dcc[idx].u.chat->channel = dcc[idx].u.chat->su_channel;
       if (dcc[idx].u.chat->channel < GLOBAL_CHANS)
         botnet_send_join_idx(idx);
-      chanout_but(-1, dcc[idx].u.chat->channel, DCC_JOIN, dcc[idx].nick);
+      chanout_but(-1, dcc[idx].u.chat->channel, "*** %s has joined the party line.\n", dcc[idx].nick);
     } else {
       killsock(dcc[idx].sock);
       lostdcc(idx);
@@ -1102,7 +1102,7 @@ int ansi_len(char *s)
 static void
 eof_dcc_chat(int idx)
 {
-  putlog(LOG_MISC, "*", DCC_LOSTDCC, dcc[idx].nick, dcc[idx].host, dcc[idx].port);
+  putlog(LOG_MISC, "*", "Lost dcc connection to %s (%s/%d)", dcc[idx].nick, dcc[idx].host, dcc[idx].port);
   if (dcc[idx].u.chat->channel >= 0) {
     chanout_but(idx, dcc[idx].u.chat->channel, "*** %s lost dcc link.\n", dcc[idx].nick);
     if (dcc[idx].u.chat->channel < GLOBAL_CHANS)
@@ -1336,7 +1336,7 @@ dcc_telnet(int idx, char *buf, int ii)
     sock = answer(dcc[idx].sock, s, &ip, &port, 0);
 /*. ssl_link ACCEPT_SSL should go here!!!! */
   if (sock < 0) {
-    putlog(LOG_MISC, "*", DCC_FAILED, strerror(errno));
+    putlog(LOG_MISC, "*", "Failed TELNET incoming (%s)", strerror(errno));
 //    killsock(dcc[idx].sock);
     return;
   }
@@ -1348,7 +1348,7 @@ dcc_telnet(int idx, char *buf, int ii)
 #else
   if (port < 1024 || port > 65535) {
 #endif
-    putlog(LOG_BOTS, "*", DCC_BADSRC, s, port);
+    putlog(LOG_BOTS, "*", "Refused %s/%d (bad src port)", s, port);
     killsock(sock);
     return;
   }
@@ -1426,7 +1426,7 @@ static void dcc_telnet_dns_callback(int id, void *client_data, const char *ip, c
   if (dcc[idx].host[0] == '@') {
     /* Restrict by hostname */
     if (!wild_match(dcc[idx].host + 1, dcc[i].host)) {
-      putlog(LOG_BOTS, "*", DCC_BADHOST, dcc[i].host);
+      putlog(LOG_BOTS, "*", "Refused %s (bad hostname)", dcc[i].host);
       killsock(dcc[i].sock);
       lostdcc(i);
       return;
@@ -1464,7 +1464,7 @@ static void dcc_telnet_dns_callback(int id, void *client_data, const char *ip, c
     }
   }
   if (s[0]) {
-    putlog(LOG_MISC, "*", DCC_IDENTFAIL, dcc[i].host, s);
+    putlog(LOG_MISC, "*", "Ident failed for %s: %s", dcc[i].host, s);
     simple_snprintf(s, sizeof(s), "telnet@%s", dcc[i].host);
     dcc_telnet_got_ident(i, s);
     return;
@@ -1483,7 +1483,7 @@ static void dcc_telnet_dns_callback(int id, void *client_data, const char *ip, c
 static void
 eof_dcc_telnet(int idx)
 {
-  putlog(LOG_MISC, "*", DCC_PORTDIE, dcc[idx].port);
+  putlog(LOG_MISC, "*", "(!) Listening port %d abruptly died.", dcc[idx].port);
   killsock(dcc[idx].sock);
   lostdcc(idx);
 }
@@ -1510,7 +1510,7 @@ struct dcc_table DCC_TELNET = {
 static void
 eof_dcc_dupwait(int idx)
 {
-  putlog(LOG_BOTS, "*", DCC_LOSTDUP, dcc[idx].host);
+  putlog(LOG_BOTS, "*", "Lost telnet connection from %s while checking for duplicate", dcc[idx].host);
   killsock(dcc[idx].sock);
   lostdcc(idx);
 }
@@ -1533,7 +1533,7 @@ timeout_dupwait(int idx)
     char x[UHOSTLEN] = "";
 
     simple_snprintf(x, sizeof x, "%s!%s", dcc[idx].nick, dcc[idx].host);
-    putlog(LOG_BOTS, "*", DCC_DUPLICATE, x);
+    putlog(LOG_BOTS, "*", "Refused telnet connection from %s (duplicate)", x);
     killsock(dcc[idx].sock);
     lostdcc(idx);
   } else {
@@ -1631,7 +1631,7 @@ dcc_telnet_id(int idx, char *buf, int atr)
 
   if (!ok) {
     if (dcc[idx].user)
-      putlog(LOG_BOTS, "*", "%s: %s!%s", ischanhub() ? DCC_REFUSED : DCC_REFUSEDNC, nick, dcc[idx].host);
+      putlog(LOG_BOTS, "*", "%s: %s!%s", ischanhub() ? "Refused DCC chat (no access)" : "Refused DCC chat (I'm not a chathub (+c))", nick, dcc[idx].host);
     else if (dcc[idx].bot)
       putlog(LOG_BOTS, "*", "Refused %s (invalid bot handle: %s) (Add with '%snewleaf %s')", dcc[idx].host, nick, settings.dcc_prefix, nick);
     else
@@ -1644,7 +1644,7 @@ dcc_telnet_id(int idx, char *buf, int atr)
   strcpy(dcc[idx].nick, nick);
   if (dcc[idx].user->bot) {
     if (!egg_strcasecmp(conf.bot->nick, dcc[idx].nick)) {
-      putlog(LOG_BOTS, "*", DCC_MYBOTNETNICK, dcc[idx].host);
+      putlog(LOG_BOTS, "*", "Refused telnet connection from %s (tried using my botnetnick)", dcc[idx].host);
       killsock(dcc[idx].sock);
       lostdcc(idx);
       return;
@@ -1675,7 +1675,7 @@ dcc_telnet_pass(int idx, int atr)
   /* No password set? */
   if (!dcc[idx].user->bot && (u_pass_match(dcc[idx].user, "-"))) {
     dprintf(idx, "Can't telnet until you have a password set.\r\n");
-    putlog(LOG_MISC, "*", DCC_NOPASS, dcc[idx].nick, dcc[idx].host);
+    putlog(LOG_MISC, "*", "Refused [%s]%s (no password)", dcc[idx].nick, dcc[idx].host);
     killsock(dcc[idx].sock);
     lostdcc(idx);
     return;
@@ -1714,7 +1714,7 @@ dcc_telnet_pass(int idx, int atr)
       dprintf(-dcc[idx].sock, "neg? %s %s\n", rand, buf);
     } else {
       /* Turn off remote telnet echo (send IAC WILL ECHO). */
-      dprintf(idx, "\n%s" TLN_IAC_C TLN_WILL_C TLN_ECHO_C "\n", DCC_ENTERPASS);
+      dprintf(idx, "\n%s" TLN_IAC_C TLN_WILL_C TLN_ECHO_C "\n", "Enter your password");
     }
   } else
     dprintf(idx, "%s\n" TLN_IAC_C TLN_WILL_C TLN_ECHO_C, response(RES_PASSWORD));
@@ -1723,7 +1723,7 @@ dcc_telnet_pass(int idx, int atr)
 static void
 eof_dcc_telnet_id(int idx)
 {
-  putlog(LOG_MISC, "*", DCC_LOSTCON, dcc[idx].host, dcc[idx].port);
+  putlog(LOG_MISC, "*", "Lost telnet connection to %s/%d", dcc[idx].host, dcc[idx].port);
   killsock(dcc[idx].sock);
   lostdcc(idx);
 }
@@ -1731,7 +1731,7 @@ eof_dcc_telnet_id(int idx)
 static void
 timeout_dcc_telnet_id(int idx)
 {
-  putlog(LOG_MISC, "*", DCC_TTIMEOUT, dcc[idx].host);
+  putlog(LOG_MISC, "*", "Ident timeout on telnet: %s", dcc[idx].host);
   killsock(dcc[idx].sock);
   lostdcc(idx);
 }
@@ -1795,7 +1795,7 @@ dcc_identwait(int idx, char *buf, int len)
 void
 eof_dcc_identwait(int idx)
 {
-  putlog(LOG_MISC, "*", DCC_LOSTCONN, dcc[idx].host, dcc[idx].port);
+  putlog(LOG_MISC, "*", "Lost connection while identing [%s/%d]", dcc[idx].host, dcc[idx].port);
   for (int i = 0; i < dcc_total; i++)
     if (dcc[i].type && (dcc[i].type == &DCC_IDENT) && (dcc[i].uint.ident_sock == dcc[idx].sock)) {
       killsock(dcc[i].sock);    /* Cleanup ident socket */
@@ -1857,7 +1857,7 @@ eof_dcc_ident(int idx)
 
   for (int i = 0; i < dcc_total; i++)
     if (dcc[i].type && (dcc[i].type == &DCC_IDENTWAIT) && (dcc[i].sock == dcc[idx].uint.ident_sock)) {
-      putlog(LOG_MISC, "*", DCC_EOFIDENT);
+      putlog(LOG_MISC, "*", "Timeout/EOF ident connection");
       simple_snprintf(buf, sizeof(buf), "telnet@%s", dcc[idx].host);
       dcc_telnet_got_ident(i, buf);
     }
@@ -1897,7 +1897,7 @@ dcc_telnet_got_ident(int i, char *host)
   dcc[i].u.other = 0;
 
   if (idx == dcc_total || !dcc[idx].type) {
-    putlog(LOG_MISC, "*", DCC_LOSTIDENT);
+    putlog(LOG_MISC, "*", "Lost ident wait telnet socket!!");
     killsock(dcc[i].sock);
     lostdcc(i);
     return;
@@ -1943,7 +1943,7 @@ dcc_telnet_got_ident(int i, char *host)
     if (!ok && (dcc[idx].status & LSTN_PUBLIC))
       ok = 1;
     if (!ok) {
-      putlog(LOG_MISC, "*", DCC_NOACCESS, dcc[i].host);
+      putlog(LOG_MISC, "*", "Denied telnet: %s, No Access", dcc[i].host);
       killsock(dcc[i].sock);
       lostdcc(i);
       return;

src/dccutil.c

@@ -765,7 +765,7 @@ detect_dcc_flood(time_t * timer, struct chat_info *chat, int idx)
       if ((dcc[idx].type->flags & DCT_CHAT) && chat && (chat->channel >= 0)) {
         char x[1024];
 
-        simple_snprintf(x, sizeof x, DCC_FLOODBOOT, dcc[idx].nick);
+        simple_snprintf(x, sizeof x, "%s has been forcibly removed for flooding.\n", dcc[idx].nick);
         chanout_but(idx, chat->channel, "*** %s", x);
         if (chat->channel < GLOBAL_CHANS)
           botnet_send_part_idx(idx, x);
@@ -789,15 +789,15 @@ detect_dcc_flood(time_t * timer, struct chat_info *chat, int idx)
 void
 do_boot(int idx, const char *by, const char *reason)
 {
-  dprintf(idx, DCC_BOOTED1);
-  dprintf(idx, DCC_BOOTED2, by, reason[0] ? ": " : ".", reason);
+  dprintf(idx, "-=- poof -=-\n");
+  dprintf(idx, "You've been booted from the bot by %s%s%s\n", by, reason[0] ? ": " : ".", reason);
   /* If it's a partyliner (chatterer :) */
   /* Horrible assumption that DCT_CHAT using structure uses same format
    * as DCC_CHAT */
   if ((dcc[idx].type->flags & DCT_CHAT) && (dcc[idx].u.chat->channel >= 0)) {
     char x[1024] = "";
 
-    simple_snprintf(x, sizeof x, DCC_BOOTED3, by, dcc[idx].nick, reason[0] ? ": " : "", reason);
+    simple_snprintf(x, sizeof x, "%s booted %s from the party line%s%s", by, dcc[idx].nick, reason[0] ? ": " : "", reason);
     chanout_but(idx, dcc[idx].u.chat->channel, "*** %s.\n", x);
     if (dcc[idx].u.chat->channel < GLOBAL_CHANS)
       botnet_send_part_idx(idx, x);

src/lang.h

@@ -10,67 +10,24 @@
 
 
 #define IGN_NONE		"No ignores"
-#define IGN_CURRENT		"Currently ignoring"
-#define IGN_NOLONGER		"No longer ignoring"
 
 /* Messages referring to bots
  */
-#define BOT_NOTHERE		"That bot isn't here.\n"
 #define BOT_USERAWAY		"is away"
 #define BOT_MSGDIE		"Bot shut down beginning...."
-#define BOT_NOSUCHUSER		"No such user"
-#define BOT_NOCHANNELS		"no channels"
-#define BOT_BOTSCONNECTED	"Bots connected"
-#define BOT_OTHERPEOPLE		"Other people on the bot"
 /* was: BOT_OUTDATEDWHOM - 0xb1e */
-#define BOT_LINKATTEMPT		"Attempting to link"
-#define BOT_DISCONNECTED	"Disconnected from:"
-#define BOT_CANTLINKTHERE	"Can't link there"
-#define BOT_CANTUNLINK		"Can't unlink"
 /* was: BOT_BOGUSLINK2 - 0xb2a */
 #define BOT_DISCONNLEAF		"Disconnected left"
 #define BOT_LINKEDTO		"Linked to"
 #define BOT_YOUREALEAF		"You are supposed to be a leaf!"
 #define BOT_REJECTING		"Rejecting bot"
 #define BOT_OLDBOT		"Older bot detected (unsupported)"
-#define BOT_TRACERESULT		"Trace result"
 #define BOT_DOESNTEXIST		"doesn't exist"
 #define BOT_NOREMOTEBOOT	"Remote boots are not allowed."
 #define BOT_NOOWNERBOOT		"Can't boot the bot owner."
 #define BOT_XFERREJECTED	"FILE TRANSFER REJECTED"
 /* was: BOT_NOFILESYS - 0xb36 */
-#define BOT_BOTNETUSERS		"Users across the botnet"
-#define BOT_PARTYLINE		"Party line"
-#define BOT_LOCALCHAN		"Local channel"
-#define BOT_USERSONCHAN		"Users on channel"
-#define BOT_NOBOTSLINKED	"No bots linked."
-#define BOT_NOTRACEINFO		"No trace info for:"
-#define BOT_COMPLEXTREE		"Tree too complex!"
-#define BOT_UNLINKALL		"Unlinking all bots..."
-#define BOT_KILLLINKATTEMPT	"Killed link attempt to"
-#define BOT_ENDLINKATTEMPT	"No longer trying to link:"
-#define BOT_BREAKLINK		"Breaking link with"
-#define BOT_UNLINKEDFROM	"Unlinked from:"
-#define BOT_NOTCONNECTED	"Not connected to that bot."
-#define BOT_WIPEBOTTABLE	"Smooshing bot tables and assocs..."
-#define BOT_BOTUNKNOWN		"is not a known bot."
-#define BOT_CANTLINKMYSELF	"Link to myself?  Oh boy, Freud would have a field day."
-#define BOT_CANTRELAYMYSELF	"Relay to myself?  What on EARTH would be the point?!"
-#define BOT_CONNECTINGTO	"Connecting to"
 /* was: BOT_PARTYJOINED - 0xb52 */
-#define BOT_LOSTDCCUSER		"Lost dcc connection to"
-#define BOT_DROPPINGRELAY	"Dropping relay attempt to"
-#define BOT_RELAYSUCCESS	"Success!\n\nNOW CONNECTED TO RELAY BOT"
-#define BOT_RELAYLINK		"Relay link:"
-#define BOT_ENDRELAY1		"Ended relay link"
-#define BOT_ENDRELAY2		"RELAY CONNECTION DROPPED.\nYou are now back on"
-#define BOT_PARTYREJOINED	"rejoined the party line."
-#define BOT_DROPPEDRELAY	"Dropping relay link to"
-#define BOT_BREAKRELAY		"Breaking connection to"
-#define BOT_RELAYBROKEN		"Relay broken"
-#define BOT_PINGTIMEOUT		"Ping timeout"
-#define BOT_BOTNOTLEAFLIKE	"unleaflike behavior"
-#define BOT_BOTDROPPED		"Dropped bot"
 
 /* Messages pertaining to MODULES
  */
@@ -93,11 +50,8 @@
 
 
 #define DCC_NOSTRANGERS		"I don't accept DCC chats from strangers."
-#define DCC_REFUSED		"Refused DCC chat (no access)"
-#define DCC_REFUSEDNC		"Refused DCC chat (I'm not a chathub (+c))"
 #define DCC_REFUSED2		"No access"
 #define DCC_REFUSED3		"You must have a password set."
-#define DCC_REFUSED4		"Refused DCC chat (no password)"
 #define DCC_REFUSED5		"Refused DCC chat (+x but no file area)"
 /* was: DCC_REFUSED6 - 0xc06 */
 #define DCC_REFUSED7		"Refused DCC chat (invalid port)"
@@ -106,8 +60,6 @@
 /* was: DCC_REFUSEDTAND - 0xc09 */
 /* was: DCC_NOSTRANGERFILES1 - 0xc0a */
 /* was: DCC_NOSTRANGERFILES2 - 0xc0b */
-#define DCC_TOOMANYDCCS1	"Sorry, too many DCC connections."
-#define DCC_TOOMANYDCCS2	"DCC connections full: %s %s (%s!%s)"
 /* was: DCC_DCCNOTSUPPORTED - 0xc0e */
 /* was: DCC_REFUSEDNODCC - 0xc0f */
 /* was: DCC_FILENAMEBADSLASH - 0xc10 */
@@ -120,14 +72,7 @@
 /* was: DCC_FILETOOLARGE - 0xc17 */
 /* was: DCC_FILETOOLARGE2 - 0xc18 */
 #define DCC_CONNECTFAILED1	"Failed to connect"
-#define DCC_CONNECTFAILED2	"DCC connection failed"
-#define DCC_CONNECTFAILED3	"DCC invalid port"
 /* was: DCC_FILESYSBROKEN - 0xc1b */
-#define DCC_ENTERPASS		"Enter your password"
-#define DCC_FLOODBOOT		"%s has been forcibly removed for flooding.\n"
-#define DCC_BOOTED1		"-=- poof -=-\n"
-#define DCC_BOOTED2		"You've been booted from the bot by %s%s%s\n"
-#define DCC_BOOTED3		"%s booted %s from the party line%s%s"
 
 /* Stuff from chan.c
  */
@@ -135,54 +80,23 @@
 
 /* BOTNET messages
  */
-#define NET_FAKEREJECT		"Fake message rejected"
-#define NET_LINKEDTO		"Linked to"
-#define NET_LEFTTHE		"has left the"
-#define NET_JOINEDTHE		"has joined the"
-#define NET_AWAY		"is now away"
-#define NET_UNAWAY		"is no longer away"
 #define NET_NICKCHANGE		"Nick Change:"
 
 /* Stuff from dcc.c
  */
 #define DCC_REJECT		"Rejecting link from %s"
-#define DCC_LINKFAIL		"Failed link to %s."
 #define DCC_BADPASS		"Bad password on connect attempt to %s."
 #define DCC_PASSREQ		"Password required for connection to %s."
 #define DCC_LINKERROR		"ERROR linking %s: %s"
-#define DCC_LOSTBOT		"Lost Bot: %s"
-#define DCC_TIMEOUT		"Timeout: bot link to %s at %s:%d"
-#define DCC_LOGGEDIN		"Logged in: %s (%s/%d)"
-#define DCC_BADLOGIN		"Bad Password: [%s]%s/%d"
-#define DCC_BADAUTH		"Bad Auth: [%s]%s/%d"
 #define DCC_HOUSTON		"Negative on that, Houston.\n"
-#define DCC_JOIN		"*** %s has joined the party line.\n"
-#define DCC_LOSTDCC		"Lost dcc connection to %s (%s/%d)"
-#define DCC_PWDTIMEOUT		"Password timeout on dcc chat: [%s]%s"
-#define DCC_SPWDTIMEOUT		"Auth timeout on dcc chat: [%s]%s"
 #define DCC_CLOSED		"DCC connection closed (%s!%s)"
-#define DCC_FAILED		"Failed TELNET incoming (%s)"
-#define DCC_BADSRC		"Refused %s/%d (bad src port)"
 /* was: DCC_BADIP 0xe19 */
 
-#define DCC_BADHOST		"Refused %s (bad hostname)"
 #define DCC_TELCONN		"Telnet connection: %s/%d"
-#define DCC_IDENTFAIL		"Ident failed for %s: %s"
-#define DCC_PORTDIE		"(!) Listening port %d abruptly died."
 #define DCC_BADNICK		"Refused %s (bad nick)"
 #define DCC_NONBOT		"Refused %s (non-bot)"
 #define DCC_NONUSER		"Refused %s (non-user)"
-#define DCC_DUPLICATE		"Refused telnet connection from %s (duplicate)"
-#define DCC_NOPASS		"Refused [%s]%s (no password)"
-#define DCC_LOSTCON		"Lost telnet connection to %s/%d"
-#define DCC_TTIMEOUT		"Ident timeout on telnet: %s"
 #define DCC_TCLERROR		"Tcl error [%s]: %s"
 #define DCC_DEADSOCKET		"*** ATTENTION: DEAD SOCKET (%d) OF TYPE %s UNTRAPPED"
-#define DCC_LOSTCONN		"Lost connection while identing [%s/%d]"
-#define DCC_EOFIDENT		"Timeout/EOF ident connection"
-#define DCC_LOSTIDENT		"Lost ident wait telnet socket!!"
-#define DCC_NOACCESS		"Denied telnet: %s, No Access"
-#define DCC_MYBOTNETNICK	"Refused telnet connection from %s (tried using my botnetnick)"
-#define DCC_LOSTDUP		"Lost telnet connection from %s while checking for duplicate"
 
 #endif				/* _EGG_LANG_H */

src/mod/console.mod/console.c

@@ -227,13 +227,13 @@ console_display(int idx, struct user_entry *e, struct userrec *u)
   struct console_info *i = (struct console_info *) e->u.extra;
 
   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);
-    dprintf(idx, "    %s %s, %s %s, %s %s\n", CONSOLE_FLAGS,
-            masktype(i->conflags), CONSOLE_STRIPFLAGS,
-            stripmasktype(i->stripflags), CONSOLE_ECHO, i->echoflags ? CONSOLE_YES : CONSOLE_NO);
-    dprintf(idx, "    %s %d, %s %s%d\n", CONSOLE_PAGE_SETTING, i->page,
-            CONSOLE_CHANNEL2, (i->conchan < GLOBAL_CHANS) ? "" : "*", i->conchan % GLOBAL_CHANS);
+    dprintf(idx, "  %s\n", "Saved Console Settings:");
+    dprintf(idx, "    %s %s\n", "Channel:", i->channel);
+    dprintf(idx, "    %s %s, %s %s, %s %s\n", "Console flags:",
+            masktype(i->conflags), "",
+            stripmasktype(i->stripflags), "Echo:", i->echoflags ? "yes" : "no");
+    dprintf(idx, "    %s %d, %s %s%d\n", "Page setting:", i->page,
+            "Console channel:", (i->conchan < GLOBAL_CHANS) ? "" : "*", i->conchan % GLOBAL_CHANS);
     dprintf(idx, "    Color: $b%s$b\n", i->color ? "on" : "off");
     dprintf(idx, "    Login settings:\n");
     dprintf(idx, "     Banner:   $b%-3s$b   Bots: $b%-3s$b\n", i->banner ? "on" : "off", i->bots ? "on" : "off");
@@ -343,12 +343,12 @@ console_store(int idx, char *par, bool displaySave)
 
   i->conchan = dcc[idx].u.chat->channel;
   if (par) {
-    dprintf(idx, "%s\n", CONSOLE_SAVED_SETTINGS2);
-    dprintf(idx, "  %s %s\n", CONSOLE_CHANNEL, i->channel);
-    dprintf(idx, "  %s %s, %s %s, %s %s\n", CONSOLE_FLAGS,
-            masktype(i->conflags), CONSOLE_STRIPFLAGS,
-            stripmasktype(i->stripflags), CONSOLE_ECHO, i->echoflags ? CONSOLE_YES : CONSOLE_NO);
-    dprintf(idx, "  %s %d, %s %d\n", CONSOLE_PAGE_SETTING, i->page, CONSOLE_CHANNEL2, i->conchan);
+    dprintf(idx, "%s\n", "Saved your Console Settings:");
+    dprintf(idx, "  %s %s\n", "Channel:", i->channel);
+    dprintf(idx, "  %s %s, %s %s, %s %s\n", "Console flags:",
+            masktype(i->conflags), "",
+            stripmasktype(i->stripflags), "Echo:", i->echoflags ? "yes" : "no");
+    dprintf(idx, "  %s %d, %s %d\n", "Page setting:", i->page, "Console channel:", i->conchan);
     dprintf(idx, "    Color: $b%s$b\n", i->color ? "on" : "off");
     dprintf(idx, "    Login settings:\n");
     dprintf(idx, "    Login settings:\n");

src/mod/console.mod/console.h

@@ -6,16 +6,6 @@
 #ifndef _EGG_MOD_CONSOLE_CONSOLE_H
 #define _EGG_MOD_CONSOLE_CONSOLE_H
 
-#define CONSOLE_SAVED_SETTINGS  "Saved Console Settings:"
-#define CONSOLE_SAVED_SETTINGS2	"Saved your Console Settings:"
-#define CONSOLE_CHANNEL		"Channel:"
-#define CONSOLE_FLAGS		"Console flags:"
-#define CONSOLE_STRIPFLAGS	"Strip flags:"
-#define CONSOLE_ECHO		"Echo:"
-#define CONSOLE_PAGE_SETTING	"Page setting:"
-#define CONSOLE_CHANNEL2	"Console channel:"
-#define CONSOLE_YES		"yes"
-#define CONSOLE_NO		"no"
 #define CONSOLE_COLOR		"Color:"
 
 void console_dostore(int, bool = 1);

src/mod/ctcp.mod/ctcp.h

@@ -7,7 +7,7 @@
 #ifndef _EGG_MOD_CTCP_CTCP_H
 #define _EGG_MOD_CTCP_CTCP_H
 
-#define CLIENTINFO "SED VERSION CLIENTINFO USERINFO ERRMSG FINGER TIME ACTION DCC UTC PING ECHO  :Use CLIENTINFO <COMMAND> to get more specific information"
+#define CTCP_CLIENTINFO "SED VERSION CLIENTINFO USERINFO ERRMSG FINGER TIME ACTION DCC UTC PING ECHO  :Use CLIENTINFO <COMMAND> to get more specific information"
 #define CLIENTINFO_SED "SED contains simple_encrypted_data"
 #define CLIENTINFO_VERSION "VERSION shows client type, version and environment"
 #define CLIENTINFO_CLIENTINFO "CLIENTINFO gives information about available CTCP commands"

src/mod/server.mod/server.c

@@ -867,14 +867,14 @@ static int ctcp_DCC_CHAT(char *nick, char *from, struct userrec *u, char *object
   if (ischanhub() && !glob_chuba(fr))
    ok = 0;
   if (dcc_total == max_dcc) {
-    putlog(LOG_MISC, "*", DCC_TOOMANYDCCS2, "CHAT", param, nick, from);
+    putlog(LOG_MISC, "*", "DCC connections full: %s %s (%s!%s)", "CHAT", param, nick, from);
   } else if (!ok) {
-    putlog(LOG_MISC, "*", "%s: %s!%s", ischanhub() ? DCC_REFUSED : DCC_REFUSEDNC, nick, from);
+    putlog(LOG_MISC, "*", "%s: %s!%s", ischanhub() ? "Refused DCC chat (no access)" : "Refused DCC chat (I'm not a chathub (+c))", nick, from);
   } else if (u_pass_match(u, "-")) {
-    putlog(LOG_MISC, "*", "%s: %s!%s", DCC_REFUSED4, nick, from);
+    putlog(LOG_MISC, "*", "%s: %s!%s", "Refused DCC chat (no password)", nick, from);
   } else if (atoi(prt) < 1024 || atoi(prt) > 65535) {
     /* Invalid port */
-    putlog(LOG_MISC, "*", "%s: CHAT (%s!%s)", DCC_CONNECTFAILED3, nick, from);
+    putlog(LOG_MISC, "*", "%s: CHAT (%s!%s)", "DCC invalid port", nick, from);
   } else {
     if (!sanitycheck_dcc(nick, from, ip, prt))
       return 1;
@@ -917,7 +917,7 @@ static void dcc_chat_hostresolved(int i)
 #endif /* USE_IPV6 */
   if (dcc[i].sock < 0 || open_telnet_dcc(dcc[i].sock, ip, buf) < 0) {
     strcpy(buf, strerror(errno));
-    putlog(LOG_MISC, "*", "%s: CHAT (%s!%s)", DCC_CONNECTFAILED2, dcc[i].nick, dcc[i].host);
+    putlog(LOG_MISC, "*", "%s: CHAT (%s!%s)", "DCC connection failed", dcc[i].nick, dcc[i].host);
     putlog(LOG_MISC, "*", "    (%s)", buf);
     killsock(dcc[i].sock);
     lostdcc(i);

src/mod/server.mod/server.h

@@ -41,7 +41,6 @@ enum {
 	NETT_HYBRID_EFNET	= 4	/* new +e/+I Efnet hybrid.	  */
 };
 
-#define IRC_CANTCHANGENICK "Can't change nickname on %s.  Is my nickname banned?"
 #endif		/* _EGG_MOD_SERVER_SERVER_H */
 
 extern bind_table_t	*BT_ctcp, *BT_ctcr, *BT_msgc;

src/mod/server.mod/servmsg.c

@@ -540,17 +540,17 @@ static int gotmsg(char *from, char *msg)
                   code = newsplit(&ctcp);
                   if (!strcmp(code, "CHAT")) {
                     if (!ischanhub())
-                      putlog(LOG_MISC, "*", "%s: %s", DCC_REFUSEDNC, from);
+                      putlog(LOG_MISC, "*", "%s: %s", "Refused DCC chat (I'm not a chathub (+c))", from);
                     else
-                      putlog(LOG_MISC, "*", "%s: %s", DCC_REFUSED, from);
+                      putlog(LOG_MISC, "*", "%s: %s", "Refused DCC chat (no access)", from);
                   } else {
                     putlog(LOG_MISC, "*", "Refused DCC %s: %s", code, from);
                   }
                 } else if (!strcmp(code, "CHAT")) {
                   if (!ischanhub())
-                    putlog(LOG_MISC, "*", "%s: %s", DCC_REFUSEDNC, from);
+                    putlog(LOG_MISC, "*", "%s: %s", "Refused DCC chat (I'm not a chathub (+c))", from);
                   else
-                    putlog(LOG_MISC, "*", "%s: %s", DCC_REFUSED, from);
+                    putlog(LOG_MISC, "*", "%s: %s", "Refused DCC chat (no access)", from);
                 }
 	      }
 
@@ -921,7 +921,7 @@ static int got437(char *from, char *msg)
     if (chan) {
       chan->status &= ~(CHAN_JOINING);
       if (chan->status & CHAN_ACTIVE) {
-	putlog(LOG_MISC, "*", IRC_CANTCHANGENICK, s);
+	putlog(LOG_MISC, "*", "Can't change nickname on %s.  Is my nickname banned?", s);
       } else {
 	if (!channel_juped(chan)) {
 	  putlog(LOG_MISC, "*", "Channel %s is juped. :(", s);

src/mod/transfer.mod/transfer.c

@@ -174,11 +174,11 @@ static void eof_dcc_send(int idx)
       }
     }
     if (y >= 0) {
-      putlog(LOG_BOTS, "*", TRANSFER_USERFILE_LOST, dcc[y].nick);
+      putlog(LOG_BOTS, "*", "Lost userfile transfer from %s; aborting.", dcc[y].nick);
       unlink(dcc[idx].u.xfer->filename);
       /* Drop that bot */
       dprintf(y, "bye\n");
-      simple_snprintf(s, sizeof s, TRANSFER_USERFILE_DISCON, dcc[y].nick);
+      simple_snprintf(s, sizeof s, "Disconnected %s (aborted userfile transfer)", dcc[y].nick);
       botnet_send_unlinked(y, dcc[y].nick, s);
       chatout("*** %s %s\n", dcc[y].nick, s);
 
@@ -252,7 +252,7 @@ inline static void handle_resend_packet(int idx, transfer_reget *reget_data)
 			      ((reget_data->byte_offset & 0x000000ff) << 24);
   }
   if (reget_data->packet_id != TRANSFER_REGET_PACKETID)
-    putlog(LOG_FILES, "*", TRANSFER_REGET_PACKET,
+    putlog(LOG_FILES, "*", "(!) reget packet from %s for %s is invalid!",
 	   dcc[idx].nick, dcc[idx].u.xfer->origname);
   else
     dcc[idx].u.xfer->offset = reget_data->byte_offset;
@@ -322,12 +322,12 @@ void dcc_get(int idx, char *buf, int len)
   if (cmp > dcc[idx].u.xfer->length && cmp > dcc[idx].status) {
     /* Attempt to resume, but file is not as long as requested... */
     putlog(LOG_FILES, "*",
-	   TRANSFER_BEHIND_FILEEND,
+	   "!! Resuming file transfer behind file end for %s to %s",
 	   dcc[idx].u.xfer->origname, dcc[idx].nick);
   } else if (cmp > dcc[idx].status) {
     /* Attempt to resume */
     if (!strcmp(dcc[idx].nick, "*users")) {
-      putlog(LOG_BOTS, "*", TRANSFER_TRY_SKIP_AHEAD);
+      putlog(LOG_BOTS, "*", "!!! Trying to skip ahead on userfile transfer");
     } else if (!strcmp(dcc[idx].nick, "*binary")) {
       putlog(LOG_BOTS, "*","!!! Trying to skip ahead on binary transfer");
     }
@@ -363,7 +363,7 @@ void dcc_get(int idx, char *buf, int len)
       if (y >= 0)
 	dcc[y].status &= ~STAT_SENDING;
 
-      putlog(LOG_BOTS, "*", TRANSFER_COMPLETED_USERFILE, dcc[y].nick);
+      putlog(LOG_BOTS, "*", "Completed userfile transfer to %s.", dcc[y].nick);
       unlink(dcc[idx].u.xfer->filename);
       /* Any sharebot things that were queued: */
       dump_resync(y);
@@ -408,11 +408,11 @@ void eof_dcc_get(int idx)
 	y = x;
         break;
       }
-    putlog(LOG_BOTS, "*", TRANSFER_ABORT_USERFILE);
+    putlog(LOG_BOTS, "*", "Lost userfile transfer; aborting.");
     /* Note: no need to unlink the xfer file, as it's already unlinked. */
     /* Drop that bot */
     dprintf(-dcc[y].sock, "bye\n");
-    simple_snprintf(s, sizeof s, TRANSFER_USERFILE_DISCON,
+    simple_snprintf(s, sizeof s, "Disconnected %s (aborted userfile transfer)",
 		 dcc[y].nick);
     botnet_send_unlinked(y, dcc[y].nick, s);
     chatout("*** %s\n", s);
@@ -478,9 +478,9 @@ void dcc_send(int idx, char *buf, int len)
   dcc[idx].timeval = now;
   if (dcc[idx].status > dcc[idx].u.xfer->length &&
       dcc[idx].u.xfer->length > 0) {
-    dprintf(DP_HELP,TRANSFER_BOGUS_FILE_LENGTH, dcc[idx].nick);
+    dprintf(DP_HELP,"NOTICE %s :Bogus file length.\n", dcc[idx].nick);
     putlog(LOG_FILES, "*",
-	   TRANSFER_FILE_TOO_LONG,
+	   "File too long: dropping dcc send %s from %s!%s",
 	   dcc[idx].u.xfer->origname, dcc[idx].nick, dcc[idx].host);
     fclose(dcc[idx].u.xfer->f);
     siz = strlen(tempdir) + strlen(dcc[idx].u.xfer->filename) + 1;
@@ -511,9 +511,9 @@ static void transfer_get_timeout(int i)
       dcc[y].status &= ~STAT_SHARE;
     }
     unlink(dcc[i].u.xfer->filename);
-    putlog(LOG_BOTS, "*",TRANSFER_USERFILE_TIMEOUT);
+    putlog(LOG_BOTS, "*","Timeout on userfile transfer.");
     dprintf(y, "bye\n");
-    simple_snprintf(xx, sizeof xx,TRANSFER_DICONNECT_TIMEOUT,
+    simple_snprintf(xx, sizeof xx,"Disconnected %s (timed-out userfile transfer)",
 		 dcc[y].nick);
     botnet_send_unlinked(y, dcc[y].nick, xx);
     chatout("*** %s\n", xx);
@@ -572,7 +572,7 @@ void tout_dcc_send(int idx)
       dcc[y].status &= ~STAT_SHARE;
     }
     unlink(dcc[idx].u.xfer->filename);
-    putlog(LOG_BOTS, "*", TRANSFER_USERFILE_TIMEOUT);
+    putlog(LOG_BOTS, "*", "Timeout on userfile transfer.");
   } else if (!strcmp(dcc[idx].nick, "*binary")) {
     int x, y = -1;
 
@@ -593,27 +593,27 @@ void tout_dcc_send(int idx)
 void display_dcc_get(int idx, char *buf)
 {
   if (dcc[idx].status == dcc[idx].u.xfer->length)
-    sprintf(buf, TRANSFER_SEND, dcc[idx].u.xfer->acked,
+    sprintf(buf, "send  (%lu)/%lu\n    Filename: %s\n", dcc[idx].u.xfer->acked,
 	    dcc[idx].u.xfer->length, dcc[idx].u.xfer->origname);
   else
-    sprintf(buf,TRANSFER_SEND, dcc[idx].status,
+    sprintf(buf,"send  (%lu)/%lu\n    Filename: %s\n", dcc[idx].status,
 	    dcc[idx].u.xfer->length, dcc[idx].u.xfer->origname);
 }
 
 void display_dcc_get_p(int idx, char *buf)
 {
-  sprintf(buf,TRANSFER_SEND_WAITED, now - dcc[idx].timeval, dcc[idx].u.xfer->origname);
+  sprintf(buf,"send  waited %lus\n    Filename: %s\n", now - dcc[idx].timeval, dcc[idx].u.xfer->origname);
 }
 
 void display_dcc_send(int idx, char *buf)
 {
-  sprintf(buf,TRANSFER_SEND, dcc[idx].status,
+  sprintf(buf,"send  (%lu)/%lu\n    Filename: %s\n", dcc[idx].status,
 	  dcc[idx].u.xfer->length, dcc[idx].u.xfer->origname);
 }
 
 void display_dcc_fork_send(int idx, char *buf)
 {
-  simple_sprintf(buf, TRANSFER_CONN_SEND);
+  simple_sprintf(buf, "conn  send");
 }
 
 void kill_dcc_xfer(int idx, void *x)
@@ -684,7 +684,7 @@ void dcc_fork_send(int idx, char *x, int y)
   dcc[idx].u.xfer->start_time = now;
   simple_snprintf(s1, sizeof s1, "%s!%s", dcc[idx].nick, dcc[idx].host);
   if (strcmp(dcc[idx].nick, "*users") && strcmp(dcc[idx].nick, "*binary"))
-    putlog(LOG_MISC, "*", TRANSFER_DCC_CONN, dcc[idx].u.xfer->origname, s1);
+    putlog(LOG_MISC, "*", "DCC connection: SEND %s (%s)", dcc[idx].u.xfer->origname, s1);
 }
 
 struct dcc_table DCC_GET =
@@ -728,8 +728,8 @@ static void dcc_get_pending(int idx, char *buf, int len)
   dcc[idx].addr = ip;
   dcc[idx].port = (int) port;
   if (dcc[idx].sock == -1) {
-    dprintf(DP_HELP, TRANSFER_NOTICE_BAD_CONN, dcc[idx].nick, strerror(errno));
-    putlog(LOG_FILES, "*", TRANSFER_LOG_BAD_CONN,
+    dprintf(DP_HELP, "NOTICE %s :Bad connection (%s)\n", dcc[idx].nick, strerror(errno));
+    putlog(LOG_FILES, "*", "DCC bad connection: GET %s (%s!%s)",
 	   dcc[idx].u.xfer->origname, dcc[idx].nick, dcc[idx].host);
     fclose(dcc[idx].u.xfer->f);
     lostdcc(idx);
@@ -882,7 +882,7 @@ int raw_dcc_send(char *filename, char *nick, char *from, int *idx)
 void transfer_report(int idx, int details)
 {
   if (details) {
-    dprintf(idx,TRANSFER_STAT_BLOCK,
+    dprintf(idx,"    DCC block is %d%s, max concurrent d/ls is %d\n",
 	    dcc_block, (dcc_block == 0) ? " (turbo dcc)" : "", dcc_limit);
   }
 }

src/mod/transfer.mod/transfer.h

@@ -75,37 +75,19 @@ typedef struct {
 #define TRANSFER_FAILED_MOVE        "FAILED move `%s' from `%s'! File lost!"
 #define TRANSFER_THANKS             "Thanks for the file!\n"
 #define TRANSFER_NOTICE_THANKS      "NOTICE %s :Thanks for the file!\n"
-#define TRANSFER_USERFILE_LOST      "Lost userfile transfer from %s; aborting."
 /* #define TRANSFER_BYE	            "0xf1e) */
-#define TRANSFER_USERFILE_DISCON    "Disconnected %s (aborted userfile transfer)"
 #define TRANSFER_LOST_DCCSEND       "Lost dcc send %s from %s!%s (%lu/%lu)"
-#define TRANSFER_REGET_PACKET       "(!) reget packet from %s for %s is invalid!"
-#define TRANSFER_BEHIND_FILEEND     "!! Resuming file transfer behind file end for %s to %s"
-#define TRANSFER_TRY_SKIP_AHEAD     "!!! Trying to skip ahead on userfile transfer"
 #define TRANSFER_RESUME_FILE        "Resuming file transfer at %dk for %s to %s"
-#define TRANSFER_COMPLETED_USERFILE "Completed userfile transfer to %s."
 #define TRANSFER_FINISHED_DCCSEND   "Finished dcc send %s to %s"
-#define TRANSFER_ABORT_USERFILE     "Lost userfile transfer; aborting."
 #define TRANSFER_LOST_DCCGET        "Lost dcc get %s from %s!%s"
-#define TRANSFER_BOGUS_FILE_LENGTH  "NOTICE %s :Bogus file length.\n"
-#define TRANSFER_FILE_TOO_LONG      "File too long: dropping dcc send %s from %s!%s"
-#define TRANSFER_USERFILE_TIMEOUT   "Timeout on userfile transfer."
-#define TRANSFER_DICONNECT_TIMEOUT  "Disconnected %s (timed-out userfile transfer)"
 #define TRANSFER_NOTICE_TIMEOUT     "NOTICE %s :Timeout during transfer, aborting %s.\n"
 #define TRANSFER_LOG_TIMEOUT        "EGGDROP TEAM IS TEH GAY"
 #define TRANSFER_DCC_GET_TIMEOUT    "DCC timeout: GET %s (%s) at %lu/%lu"
 #define TRANSFER_DCC_SEND_TIMEOUT   "DCC timeout: SEND %s (%s) at %lu/%lu"
-#define TRANSFER_SEND               "send  (%lu)/%lu\n    Filename: %s\n"
-#define TRANSFER_SEND_WAITED        "send  waited %lus\n    Filename: %s\n"
-#define TRANSFER_CONN_SEND          "conn  send"
-#define TRANSFER_DCC_CONN           "DCC connection: SEND %s (%s)"
-#define TRANSFER_NOTICE_BAD_CONN    "NOTICE %s :Bad connection (%s)\n"
-#define TRANSFER_LOG_BAD_CONN       "DCC bad connection: GET %s (%s!%s)"
 #define TRANSFER_BEGIN_DCC          "Begin DCC %ssend %s to %s"
 #define TRANSFER_RE                 "re"
 #define TRANSFER_DCC_IGNORED        "NOTICE %s :Ignoring resume of `%s': no data requested.\n"
 #define TRANSFER_UNLOADING          "Unloading transfer module, killing all transfer connections..."
-#define TRANSFER_STAT_BLOCK         "    DCC block is %d%s, max concurrent d/ls is %d\n"
 #define TRANSFER_STAT_MEMORY        "   Using %d bytes of memory\n"
 /* end of langauge addon */
 

src/users.c

@@ -201,7 +201,7 @@ void tell_ignores(int idx, char *match)
     dprintf(idx, "No ignores.\n");
     return;
   }
-  dprintf(idx, "%s:\n", IGN_CURRENT);
+  dprintf(idx, "%s:\n", "Currently ignoring");
 
   int k = 1;
 
@@ -226,7 +226,7 @@ void check_expired_ignores()
     return;
   while (*u) {
     if (!((*u)->flags & IGREC_PERM) && (now >= (*u)->expire)) {
-      putlog(LOG_MISC, "*", "%s %s (expired)", IGN_NOLONGER, (*u)->igmask);
+      putlog(LOG_MISC, "*", "%s %s (expired)", "No longer ignoring", (*u)->igmask);
       delignore((*u)->igmask);
     } else {
       u = &((*u)->next);