- Revert to -r1831

git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/trunk@1834 82007160-df01-0410-b94d-b575c5fd34c7

9 files changed, 72 insertions, 73 deletions

diff --git a/modules/core/m_die.c b/modules/core/m_die.c
index 7c466dc..b47c92c 100644
--- a/modules/core/m_die.c
+++ b/modules/core/m_die.c
@@ -45,7 +45,7 @@ mo_die(struct Client *client_p, struct Client *source_p,
 
   if (!HasOFlag(source_p, OPER_FLAG_DIE))
   {
-    sendto_one(source_p, ERR_NOPRIVS,
+    sendto_one(source_p, form_str(ERR_NOPRIVS),
                me.name, source_p->name, "die");
     return;
   }
diff --git a/modules/core/m_join.c b/modules/core/m_join.c
index 730385f..c5b21e4 100644
--- a/modules/core/m_join.c
+++ b/modules/core/m_join.c
@@ -96,7 +96,6 @@ m_join(struct Client *client_p, struct Client *source_p,
   char *key_list = NULL;
   char *chan_list = NULL;
   char *chan = NULL;
-  const char *s = NULL;
   struct Channel *chptr = NULL;
   struct MaskItem *conf = NULL;
   int i = 0;
@@ -104,7 +103,7 @@ m_join(struct Client *client_p, struct Client *source_p,
 
   if (EmptyString(parv[1]))
   {
-    sendto_one(source_p, ERR_NEEDMOREPARAMS,
+    sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
                me.name, source_p->name, "JOIN");
     return;
   }
@@ -129,7 +128,7 @@ m_join(struct Client *client_p, struct Client *source_p,
 
     if (!check_channel_name(chan, 1))
     {
-      sendto_one(source_p, ERR_BADCHANNAME,
+      sendto_one(source_p, form_str(ERR_BADCHANNAME),
                  me.name, source_p->name, chan);
       continue;
     }
@@ -140,7 +139,7 @@ m_join(struct Client *client_p, struct Client *source_p,
     {
       if (conf)
         ++conf->count;
-      sendto_one(source_p, ERR_BADCHANNAME,
+      sendto_one(source_p, form_str(ERR_BADCHANNAME),
                  me.name, source_p->name, chan);
       sendto_realops_flags(UMODE_SPY, L_ALL, SEND_NOTICE,
                            "Forbidding reserved channel [%s] from user %s",
@@ -153,7 +152,7 @@ m_join(struct Client *client_p, struct Client *source_p,
          ConfigChannel.max_chans_per_oper :
          ConfigChannel.max_chans_per_user))
     {
-      sendto_one(source_p, ERR_TOOMANYCHANNELS,
+      sendto_one(source_p, form_str(ERR_TOOMANYCHANNELS),
                  me.name, source_p->name, chan);
       break;
     }
@@ -166,7 +165,7 @@ m_join(struct Client *client_p, struct Client *source_p,
       if (splitmode && !HasUMode(source_p, UMODE_OPER) &&
           ConfigChannel.no_join_on_split)
       {
-        sendto_one(source_p, ERR_UNAVAILRESOURCE,
+        sendto_one(source_p, form_str(ERR_UNAVAILRESOURCE),
                    me.name, source_p->name, chan);
         continue;
       }
@@ -174,9 +173,9 @@ m_join(struct Client *client_p, struct Client *source_p,
       /*
        * can_join checks for +i key, bans.
        */
-      if ((s = can_join(source_p, chptr, key)))
+      if ((i = can_join(source_p, chptr, key)))
       {
-        sendto_one(source_p, s, me.name,
+        sendto_one(source_p, form_str(i), me.name,
                    source_p->name, chptr->chname);
         continue;
       }
@@ -195,7 +194,7 @@ m_join(struct Client *client_p, struct Client *source_p,
       if (splitmode && !HasUMode(source_p, UMODE_OPER) &&
           (ConfigChannel.no_create_on_split || ConfigChannel.no_join_on_split))
       {
-        sendto_one(source_p, ERR_UNAVAILRESOURCE,
+        sendto_one(source_p, form_str(ERR_UNAVAILRESOURCE),
                    me.name, source_p->name, chan);
         continue;
       }
@@ -266,10 +265,10 @@ m_join(struct Client *client_p, struct Client *source_p,
 
     if (chptr->topic[0])
     {
-      sendto_one(source_p, RPL_TOPIC, me.name,
+      sendto_one(source_p, form_str(RPL_TOPIC), me.name,
                  source_p->name, chptr->chname, chptr->topic);
 
-      sendto_one(source_p, RPL_TOPICWHOTIME,
+      sendto_one(source_p, form_str(RPL_TOPICWHOTIME),
                  me.name, source_p->name, chptr->chname,
                  chptr->topic_info, chptr->topic_time);
     }
diff --git a/modules/core/m_kick.c b/modules/core/m_kick.c
index ef4d464..f800136 100644
--- a/modules/core/m_kick.c
+++ b/modules/core/m_kick.c
@@ -72,7 +72,7 @@ m_kick(struct Client *client_p, struct Client *source_p,
 
   if (EmptyString(parv[2]))
   {
-    sendto_one(source_p, ERR_NEEDMOREPARAMS,
+    sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
                from, to, "KICK");
     return;
   }
@@ -95,7 +95,7 @@ m_kick(struct Client *client_p, struct Client *source_p,
 
   if ((chptr = hash_find_channel(name)) == NULL)
   {
-    sendto_one(source_p, ERR_NOSUCHCHANNEL,
+    sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
                from, to, name);
     return;
   }
@@ -106,7 +106,7 @@ m_kick(struct Client *client_p, struct Client *source_p,
     {
       if (MyConnect(source_p))
       {
-        sendto_one(source_p, ERR_NOTONCHANNEL,
+        sendto_one(source_p, form_str(ERR_NOTONCHANNEL),
                    me.name, source_p->name, name);
         return;
       }
@@ -118,7 +118,7 @@ m_kick(struct Client *client_p, struct Client *source_p,
       if (MyConnect(source_p))
       {
         /* user on _my_ server, with no chanops.. so go away */
-        sendto_one(source_p, ERR_CHANOPRIVSNEEDED,
+        sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
                    me.name, source_p->name, name);
         return;
       }
@@ -126,7 +126,7 @@ m_kick(struct Client *client_p, struct Client *source_p,
       if (chptr->channelts == 0)
       {
         /* If its a TS 0 channel, do it the old way */         
-        sendto_one(source_p, ERR_CHANOPRIVSNEEDED,
+        sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
                    from, to, name);
         return;
       }
@@ -177,7 +177,7 @@ m_kick(struct Client *client_p, struct Client *source_p,
       if (((chptr->mode.mode & MODE_PRIVATE) && has_member_flags(ms_target,
         CHFL_CHANOP|CHFL_HALFOP)) || has_member_flags(ms_target, CHFL_CHANOP))
       {
-        sendto_one(source_p, ERR_CHANOPRIVSNEEDED,
+        sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
                    me.name, source_p->name, name);
         return;
       }
@@ -209,7 +209,7 @@ m_kick(struct Client *client_p, struct Client *source_p,
     remove_user_from_channel(ms_target);
   }
   else
-    sendto_one(source_p, ERR_USERNOTINCHANNEL,
+    sendto_one(source_p, form_str(ERR_USERNOTINCHANNEL),
                from, to, user, name);
 }
 
diff --git a/modules/core/m_kill.c b/modules/core/m_kill.c
index 73968b9..434c906 100644
--- a/modules/core/m_kill.c
+++ b/modules/core/m_kill.c
@@ -87,14 +87,14 @@ mo_kill(struct Client *client_p, struct Client *source_p,
 
   if (*user == '\0')
   {
-    sendto_one(source_p, ERR_NEEDMOREPARAMS,
+    sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
                me.name, source_p->name, "KILL");
     return;
   }
 
   if (!HasOFlag(source_p, OPER_FLAG_GLOBAL_KILL|OPER_FLAG_K))
   {
-    sendto_one(source_p, ERR_NOPRIVILEGES,
+    sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
                me.name, source_p->name);
     return;
   }
@@ -118,7 +118,7 @@ mo_kill(struct Client *client_p, struct Client *source_p,
                                 (time_t)ConfigFileEntry.kill_chase_time_limit))
                                 == NULL)
     {
-      sendto_one(source_p, ERR_NOSUCHNICK,
+      sendto_one(source_p, form_str(ERR_NOSUCHNICK),
                  me.name, source_p->name, user);
       return;
     }
@@ -129,7 +129,7 @@ mo_kill(struct Client *client_p, struct Client *source_p,
 
   if (IsServer(target_p) || IsMe(target_p))
   {
-    sendto_one(source_p, ERR_CANTKILLSERVER,
+    sendto_one(source_p, form_str(ERR_CANTKILLSERVER),
                me.name, source_p->name);
     return;
   }
@@ -195,7 +195,7 @@ ms_kill(struct Client *client_p, struct Client *source_p,
 
   if (EmptyString(parv[1]))
   {
-    sendto_one(source_p, ERR_NEEDMOREPARAMS,
+    sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
                me.name, source_p->name, "KILL");
     return;
   }
@@ -234,7 +234,7 @@ ms_kill(struct Client *client_p, struct Client *source_p,
                                 (time_t)ConfigFileEntry.kill_chase_time_limit))
        == NULL)
     {
-      sendto_one(source_p, ERR_NOSUCHNICK,
+      sendto_one(source_p, form_str(ERR_NOSUCHNICK),
                  me.name, source_p->name, user);
       return;
     }
@@ -245,7 +245,7 @@ ms_kill(struct Client *client_p, struct Client *source_p,
 
   if (IsServer(target_p) || IsMe(target_p))
   {
-    sendto_one(source_p, ERR_CANTKILLSERVER,
+    sendto_one(source_p, form_str(ERR_CANTKILLSERVER),
                me.name, source_p->name);
     return;
   }
diff --git a/modules/core/m_message.c b/modules/core/m_message.c
index 4414c36..7fadaba 100644
--- a/modules/core/m_message.c
+++ b/modules/core/m_message.c
@@ -146,7 +146,7 @@ m_message(int p_or_n, const char *command, struct Client *client_p,
   if (parc < 2 || EmptyString(parv[1]))
   {
     if (p_or_n != NOTICE)
-      sendto_one(source_p, ERR_NORECIPIENT,
+      sendto_one(source_p, form_str(ERR_NORECIPIENT),
                  ID_or_name(&me, client_p),
                  ID_or_name(source_p, client_p), command);
     return;
@@ -155,7 +155,7 @@ m_message(int p_or_n, const char *command, struct Client *client_p,
   if (parc < 3 || EmptyString(parv[2]))
   {
     if (p_or_n != NOTICE)
-      sendto_one(source_p, ERR_NOTEXTTOSEND,
+      sendto_one(source_p, form_str(ERR_NOTEXTTOSEND),
                  ID_or_name(&me, client_p),
                  ID_or_name(source_p, client_p));
     return;
@@ -238,7 +238,7 @@ build_target_list(int p_or_n, const char *command, struct Client *client_p,
         {
           if (ntargets >= ConfigFileEntry.max_targets)
           {
-            sendto_one(source_p, ERR_TOOMANYTARGETS,
+            sendto_one(source_p, form_str(ERR_TOOMANYTARGETS),
                        ID_or_name(&me, client_p),
                        ID_or_name(source_p, client_p), nick,
 		       ConfigFileEntry.max_targets);
@@ -251,7 +251,7 @@ build_target_list(int p_or_n, const char *command, struct Client *client_p,
       else
       {
         if (p_or_n != NOTICE)
-          sendto_one(source_p, ERR_NOSUCHNICK,
+          sendto_one(source_p, form_str(ERR_NOSUCHNICK),
                      ID_or_name(&me, client_p),
                      ID_or_name(source_p, client_p), nick);
       }
@@ -265,7 +265,7 @@ build_target_list(int p_or_n, const char *command, struct Client *client_p,
       {
         if (ntargets >= ConfigFileEntry.max_targets)
 	  {
-	    sendto_one(source_p, ERR_TOOMANYTARGETS,
+	    sendto_one(source_p, form_str(ERR_TOOMANYTARGETS),
                        ID_or_name(&me, client_p),
                        ID_or_name(source_p, client_p), nick,
 		       ConfigFileEntry.max_targets);
@@ -303,7 +303,7 @@ build_target_list(int p_or_n, const char *command, struct Client *client_p,
       /* suggested by Mortiis */
       if (*nick == '\0')      /* if its a '\0' dump it, there is no recipient */
       {
-        sendto_one(source_p, ERR_NORECIPIENT,
+        sendto_one(source_p, form_str(ERR_NORECIPIENT),
                    ID_or_name(&me, client_p),
                    ID_or_name(source_p, client_p), command);
         continue;
@@ -320,7 +320,7 @@ build_target_list(int p_or_n, const char *command, struct Client *client_p,
           if (!has_member_flags(find_channel_link(source_p, chptr),
                                 CHFL_CHANOP|CHFL_HALFOP|CHFL_VOICE))
           {
-            sendto_one(source_p, ERR_CHANOPRIVSNEEDED,
+            sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
                        ID_or_name(&me, client_p),
                        ID_or_name(source_p, client_p), with_prefix);
             return(-1);
@@ -331,7 +331,7 @@ build_target_list(int p_or_n, const char *command, struct Client *client_p,
         {
           if (ntargets >= ConfigFileEntry.max_targets)
           {
-	    sendto_one(source_p, ERR_TOOMANYTARGETS,
+	    sendto_one(source_p, form_str(ERR_TOOMANYTARGETS),
                        ID_or_name(&me, client_p),
                        ID_or_name(source_p, client_p), nick,
 		       ConfigFileEntry.max_targets);
@@ -345,7 +345,7 @@ build_target_list(int p_or_n, const char *command, struct Client *client_p,
       else
       {
         if (p_or_n != NOTICE)
-          sendto_one(source_p, ERR_NOSUCHNICK,
+          sendto_one(source_p, form_str(ERR_NOSUCHNICK),
                      ID_or_name(&me, client_p),
                      ID_or_name(source_p, client_p), nick);
       }
@@ -361,7 +361,7 @@ build_target_list(int p_or_n, const char *command, struct Client *client_p,
       if (p_or_n != NOTICE)
       {
         if (!IsDigit(*nick) || MyClient(source_p))
-	  sendto_one(source_p, ERR_NOSUCHNICK,
+	  sendto_one(source_p, form_str(ERR_NOSUCHNICK),
 		     ID_or_name(&me, client_p),
 		     ID_or_name(source_p, client_p), nick);
       }
@@ -429,7 +429,7 @@ msg_channel(int p_or_n, const char *command, struct Client *client_p,
   else
   {
     if (p_or_n != NOTICE)
-      sendto_one(source_p, ERR_CANNOTSENDTOCHAN,
+      sendto_one(source_p, form_str(ERR_CANNOTSENDTOCHAN),
                  ID_or_name(&me, client_p),
                  ID_or_name(source_p, client_p), chptr->chname);
   }
@@ -505,7 +505,7 @@ msg_client(int p_or_n, const char *command, struct Client *source_p,
       source_p->localClient->last_privmsg = CurrentTime;
 
     if ((p_or_n != NOTICE) && target_p->away[0])
-      sendto_one(source_p, RPL_AWAY, me.name,
+      sendto_one(source_p, form_str(RPL_AWAY), me.name,
                  source_p->name, target_p->name, target_p->away);
 
     if (HasUMode(target_p, UMODE_REGONLY) && target_p != source_p)
@@ -513,7 +513,7 @@ msg_client(int p_or_n, const char *command, struct Client *source_p,
       if (!HasUMode(source_p, UMODE_REGISTERED|UMODE_OPER))
       {
         if (p_or_n != NOTICE)
-          sendto_one(source_p, ERR_NONONREG, me.name, source_p->name,
+          sendto_one(source_p, form_str(ERR_NONONREG), me.name, source_p->name,
                      target_p->name);
         return;
       }
@@ -536,7 +536,7 @@ msg_client(int p_or_n, const char *command, struct Client *source_p,
       {
         /* check for accept, flag recipient incoming message */
         if (p_or_n != NOTICE)
-	  sendto_one(source_p, RPL_TARGUMODEG,
+	  sendto_one(source_p, form_str(RPL_TARGUMODEG),
 		     ID_or_name(&me, source_p->from),
 		     ID_or_name(source_p, source_p->from), target_p->name);
 
@@ -544,11 +544,11 @@ msg_client(int p_or_n, const char *command, struct Client *source_p,
              ConfigFileEntry.caller_id_wait) < CurrentTime)
         {
           if (p_or_n != NOTICE)
-	    sendto_one(source_p, RPL_TARGNOTIFY,
+	    sendto_one(source_p, form_str(RPL_TARGNOTIFY),
 		       ID_or_name(&me, source_p->from),
 		       ID_or_name(source_p, source_p->from), target_p->name);
 
-          sendto_one(target_p, RPL_UMODEGMSG,
+          sendto_one(target_p, form_str(RPL_UMODEGMSG),
                      me.name, target_p->name,
                      get_client_name(source_p, HIDE_IP));
 
@@ -738,7 +738,7 @@ handle_special(int p_or_n, const char *command, struct Client *client_p,
 
     if ((host = strchr(nick, '%')) && !HasUMode(source_p, UMODE_OPER))
     {
-      sendto_one(source_p, ERR_NOPRIVILEGES,
+      sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
                  ID_or_name(&me, client_p),
                  ID_or_name(source_p, client_p));
       return;
@@ -787,18 +787,18 @@ handle_special(int p_or_n, const char *command, struct Client *client_p,
 	    source_p->localClient->last_privmsg = CurrentTime;
 	}
 	else
-	  sendto_one(source_p, ERR_TOOMANYTARGETS,
+	  sendto_one(source_p, form_str(ERR_TOOMANYTARGETS),
                      ID_or_name(&me, client_p),
                      ID_or_name(source_p, client_p), nick,
 		     ConfigFileEntry.max_targets);
       }
     }
     else if (server && *(server+1) && (target_p == NULL))
-	sendto_one(source_p, ERR_NOSUCHSERVER,
+	sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
                    ID_or_name(&me, client_p),
                    ID_or_name(source_p, client_p), server+1);
     else if (server && (target_p == NULL))
-	sendto_one(source_p, ERR_NOSUCHNICK,
+	sendto_one(source_p, form_str(ERR_NOSUCHNICK),
                    ID_or_name(&me, client_p),
                    ID_or_name(source_p, client_p), nick);
     return;
@@ -806,7 +806,7 @@ handle_special(int p_or_n, const char *command, struct Client *client_p,
 
   if (!HasUMode(source_p, UMODE_OPER))
   {
-    sendto_one(source_p, ERR_NOPRIVILEGES,
+    sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
                ID_or_name(&me, client_p),
                ID_or_name(source_p, client_p));
     return;
@@ -832,7 +832,7 @@ handle_special(int p_or_n, const char *command, struct Client *client_p,
 
     if ((s = strrchr(nick, '.')) == NULL)
     {
-      sendto_one(source_p, ERR_NOTOPLEVEL,
+      sendto_one(source_p, form_str(ERR_NOTOPLEVEL),
                  me.name, source_p->name, nick);
       return;
     }
@@ -843,7 +843,7 @@ handle_special(int p_or_n, const char *command, struct Client *client_p,
 
     if (*s == '*' || *s == '?')
     {
-      sendto_one(source_p, ERR_WILDTOPLEVEL,
+      sendto_one(source_p, form_str(ERR_WILDTOPLEVEL),
                  ID_or_name(&me, client_p),
                  ID_or_name(source_p, client_p), nick);
       return;
diff --git a/modules/core/m_mode.c b/modules/core/m_mode.c
index 6e115b8..897ce59 100644
--- a/modules/core/m_mode.c
+++ b/modules/core/m_mode.c
@@ -56,7 +56,7 @@ m_mode(struct Client *client_p, struct Client *source_p,
 
   if (EmptyString(parv[1]))
   {
-    sendto_one(source_p, ERR_NEEDMOREPARAMS,
+    sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
                me.name, source_p->name, "MODE");
     return;
   }
@@ -71,7 +71,7 @@ m_mode(struct Client *client_p, struct Client *source_p,
 
   if ((chptr = hash_find_channel(parv[1])) == NULL)
   {
-    sendto_one(source_p, ERR_NOSUCHCHANNEL,
+    sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
 	       ID_or_name(&me, source_p->from),
 	       ID_or_name(source_p, source_p->from),
 	       parv[1]);
@@ -82,9 +82,9 @@ m_mode(struct Client *client_p, struct Client *source_p,
   if (parc < 3)
   {
     channel_modes(chptr, source_p, modebuf, parabuf);
-    sendto_one(source_p, RPL_CHANNELMODEIS,
+    sendto_one(source_p, form_str(RPL_CHANNELMODEIS),
                me.name, source_p->name, chptr->chname, modebuf, parabuf);
-    sendto_one(source_p, RPL_CREATIONTIME,
+    sendto_one(source_p, form_str(RPL_CREATIONTIME),
                me.name, source_p->name, chptr->chname, chptr->channelts);
   }
   /* bounce all modes from people we deop on sjoin
@@ -133,7 +133,7 @@ ms_tmode(struct Client *client_p, struct Client *source_p, int parc, char *parv[
 
   if ((chptr = hash_find_channel(parv[2])) == NULL)
   {
-    sendto_one(source_p, ERR_NOSUCHCHANNEL,
+    sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
                ID_or_name(&me, client_p), ID_or_name(source_p, client_p), parv[2]);
     return;
   }
diff --git a/modules/core/m_nick.c b/modules/core/m_nick.c
index 747b479..a490292 100644
--- a/modules/core/m_nick.c
+++ b/modules/core/m_nick.c
@@ -171,7 +171,7 @@ change_local_nick(struct Client *source_p, const char *nick)
     fd_note(&source_p->localClient->fd, "Nick: %s", nick);
   }
   else
-    sendto_one(source_p, ERR_NICKTOOFAST,
+    sendto_one(source_p, form_str(ERR_NICKTOOFAST),
                me.name, source_p->name, source_p->name,
                nick, ConfigFileEntry.max_nick_time);
 }
@@ -201,7 +201,7 @@ mr_nick(struct Client *client_p, struct Client *source_p,
 
   if (parc < 2 || EmptyString(parv[1]))
   {
-    sendto_one(source_p, ERR_NONICKNAMEGIVEN, me.name,
+    sendto_one(source_p, form_str(ERR_NONICKNAMEGIVEN), me.name,
                source_p->name[0] ? source_p->name : "*");
     return;
   }
@@ -216,7 +216,7 @@ mr_nick(struct Client *client_p, struct Client *source_p,
   /* check the nickname is ok */
   if (!valid_nickname(nick, 1))
   {
-    sendto_one(source_p, ERR_ERRONEUSNICKNAME, me.name,
+    sendto_one(source_p, form_str(ERR_ERRONEUSNICKNAME), me.name,
                source_p->name[0] ? source_p->name : "*", parv[1]);
     return;
   }
@@ -225,7 +225,7 @@ mr_nick(struct Client *client_p, struct Client *source_p,
   if ((conf = find_matching_name_conf(CONF_NRESV, nick, NULL, NULL, 0)))
   {
     ++conf->count;
-    sendto_one(source_p, ERR_ERRONEUSNICKNAME, me.name,
+    sendto_one(source_p, form_str(ERR_ERRONEUSNICKNAME), me.name,
                source_p->name[0] ? source_p->name : "*", nick);
     sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
                          "Forbidding reserved nick [%s] from user %s",
@@ -238,7 +238,7 @@ mr_nick(struct Client *client_p, struct Client *source_p,
   else if (source_p == target_p)
     strlcpy(source_p->name, nick, sizeof(source_p->name));
   else
-    sendto_one(source_p, ERR_NICKNAMEINUSE, me.name, "*", nick);
+    sendto_one(source_p, form_str(ERR_NICKNAMEINUSE), me.name, "*", nick);
 }
 
 
@@ -268,7 +268,7 @@ m_nick(struct Client *client_p, struct Client *source_p,
 
   if (parc < 2 || EmptyString(parv[1]))
   {
-    sendto_one(source_p, ERR_NONICKNAMEGIVEN,
+    sendto_one(source_p, form_str(ERR_NONICKNAMEGIVEN),
                me.name, source_p->name);
     return;
   }
@@ -283,7 +283,7 @@ m_nick(struct Client *client_p, struct Client *source_p,
   /* check the nickname is ok */
   if (!valid_nickname(nick, 1))
   {
-    sendto_one(source_p, ERR_ERRONEUSNICKNAME,
+    sendto_one(source_p, form_str(ERR_ERRONEUSNICKNAME),
                me.name, source_p->name, nick);
     return;
   }
@@ -294,7 +294,7 @@ m_nick(struct Client *client_p, struct Client *source_p,
       (conf = find_matching_name_conf(CONF_NRESV, nick, NULL, NULL, 0)))
   {
     ++conf->count;
-    sendto_one(source_p, ERR_ERRONEUSNICKNAME,
+    sendto_one(source_p, form_str(ERR_ERRONEUSNICKNAME),
                me.name, source_p->name, nick);
     sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
                          "Forbidding reserved nick [%s] from user %s",
@@ -325,7 +325,7 @@ m_nick(struct Client *client_p, struct Client *source_p,
     change_local_nick(source_p, nick);
   }
   else
-    sendto_one(source_p, ERR_NICKNAMEINUSE, me.name,
+    sendto_one(source_p, form_str(ERR_NICKNAMEINUSE), me.name,
                source_p->name, nick);
 }
 
@@ -803,7 +803,7 @@ perform_nick_collides(struct Client *source_p, struct Client *client_p,
                                  "%s (Nick collision (new))",
 				 me.name);
       ++ServerStats.is_kill;
-      sendto_one(target_p, ERR_NICKCOLLISION,
+      sendto_one(target_p, form_str(ERR_NICKCOLLISION),
                  me.name, target_p->name, target_p->name);
 
       AddFlag(target_p, FLAGS_KILLED);
@@ -842,7 +842,7 @@ perform_nick_collides(struct Client *source_p, struct Client *client_p,
 			  client_p->name);
 
         ++ServerStats.is_kill;
-	sendto_one(target_p, ERR_NICKCOLLISION,
+	sendto_one(target_p, form_str(ERR_NICKCOLLISION),
 	           me.name, target_p->name, target_p->name);
 
         /* if it came from a LL server, itd have been source_p,
@@ -873,7 +873,7 @@ perform_nick_collides(struct Client *source_p, struct Client *client_p,
 		 source_p->name, target_p->name, target_p->from->name,
 		 client_p->name);
     
-      sendto_one(target_p, ERR_NICKCOLLISION, me.name,
+      sendto_one(target_p, form_str(ERR_NICKCOLLISION), me.name,
                  target_p->name, target_p->name);
 
       ++ServerStats.is_kill;
@@ -941,7 +941,7 @@ perform_nick_collides(struct Client *source_p, struct Client *client_p,
 				 me.name);
 
        ++ServerStats.is_kill;
-       sendto_one(target_p, ERR_NICKCOLLISION,
+       sendto_one(target_p, form_str(ERR_NICKCOLLISION),
                   me.name, target_p->name, target_p->name);
 
        AddFlag(target_p, FLAGS_KILLED);
diff --git a/modules/core/m_part.c b/modules/core/m_part.c
index 2a8b27e..3d1e83a 100644
--- a/modules/core/m_part.c
+++ b/modules/core/m_part.c
@@ -56,14 +56,14 @@ part_one_client(struct Client *client_p, struct Client *source_p,
 
   if ((chptr = hash_find_channel(name)) == NULL)
   {
-    sendto_one(source_p, ERR_NOSUCHCHANNEL,
+    sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
                me.name, source_p->name, name);
     return;
   }
 
   if ((ms = find_channel_link(source_p, chptr)) == NULL)
   {
-    sendto_one(source_p, ERR_NOTONCHANNEL,
+    sendto_one(source_p, form_str(ERR_NOTONCHANNEL),
                me.name, source_p->name, name);
     return;
   }
@@ -122,7 +122,7 @@ m_part(struct Client *client_p, struct Client *source_p,
 
   if (EmptyString(parv[1]))
   {
-    sendto_one(source_p, ERR_NEEDMOREPARAMS,
+    sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
                me.name, source_p->name, "PART");
     return;
   }
diff --git a/modules/core/m_squit.c b/modules/core/m_squit.c
index 122794e..6fef291 100644
--- a/modules/core/m_squit.c
+++ b/modules/core/m_squit.c
@@ -55,7 +55,7 @@ mo_squit(struct Client *client_p, struct Client *source_p,
 
   if (parc < 2 || EmptyString(parv[1]))
   {
-    sendto_one(source_p, ERR_NEEDMOREPARAMS,
+    sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
                me.name, source_p->name, "SQUIT");
     return;
   }
@@ -81,14 +81,14 @@ mo_squit(struct Client *client_p, struct Client *source_p,
 
   if ((target_p == NULL) || IsMe(target_p))
   {
-    sendto_one(source_p, ERR_NOSUCHSERVER,
+    sendto_one(source_p, form_str(ERR_NOSUCHSERVER),
                me.name, source_p->name, server);
     return;
   }
 
   if (!MyConnect(target_p) && !HasOFlag(source_p, OPER_FLAG_REMOTE))
   {
-    sendto_one(source_p, ERR_NOPRIVILEGES,
+    sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
                me.name, source_p->name);
     return;
   }