Author: Kev <klmitch@mit.edu>

[ircu2.10.12-pk.git] / ircd / m_userip.c

diff --git a/ircd/m_userip.c b/ircd/m_userip.c
index 8f8cb1a04aab8fd8890a677ad237d60bc8d933fa..4fa321d02fe77dfa8daab53ef194298c7ee4d984 100644 (file)
--- a/ircd/m_userip.c
+++ b/ircd/m_userip.c
@@ -90,20 +90,19 @@
 #include "client.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
+#include "msgq.h"
 #include "numeric.h"
 #include "s_user.h"
 #include "struct.h"
 
 #include <assert.h>
 
-static char* userip_formatter(struct Client* cptr, char* buf)
+static void userip_formatter(struct Client* cptr, struct MsgBuf* mb)
 {
   assert(IsUser(cptr));
-  return sprintf_irc(buf, "%s%s=%c%s@%s", cptr->name,
-                     IsAnOper(cptr) ? "*" : "",
-                     (cptr->user->away) ? '-' : '+',
-                     cptr->user->username,
-                     ircd_ntoa((const char*) &cptr->ip));
+  msgq_append(0, mb, "%s%s=%c%s@%s", cli_name(cptr), IsAnOper(cptr) ? "*" : "",
+             cli_user(cptr)->away ? '-' : '+', cli_user(cptr)->username,
+             ircd_ntoa((const char*) &(cli_ip(cptr))));
 }
 
 /*
@@ -137,7 +136,7 @@ int m_userip(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
   if (parc < 2)
     return need_more_params(sptr, "USERIP");
 
-  sbuf = sprintf_irc(sendbuf, rpl_str(RPL_USERIP), me.name, parv[0]);
+  sbuf = sprintf_irc(sendbuf, rpl_str(RPL_USERIP), me.name, parv[0]); /* XXX DEAD */
   for (i = j, s = ircd_strtok(&p, parv[1], " "); i && s;
       s = ircd_strtok(&p, (char *)0, " "), i--)
     if ((acptr = FindUser(s)))
@@ -151,13 +150,13 @@ int m_userip(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
     else
     {
       if (i < j)
-        sendbufto_one(sptr);
-      sendto_one(sptr, err_str(ERR_NOSUCHNICK), me.name, parv[0], s);
-      sbuf = sprintf_irc(sendbuf, rpl_str(RPL_USERIP), me.name, parv[0]);
+        sendbufto_one(sptr); /* XXX DEAD */
+      sendto_one(sptr, err_str(ERR_NOSUCHNICK), me.name, parv[0], s); /* XXX DEAD */
+      sbuf = sprintf_irc(sendbuf, rpl_str(RPL_USERIP), me.name, parv[0]); /* XXX DEAD */
       j = i - 1;
     }
   if (i < j)
-    sendbufto_one(sptr);
+    sendbufto_one(sptr); /* XXX DEAD */
   return 0;
 }
 #endif /* 0 */