- Fixed improper use of the ID_or_name macro in several places

git-svn-id: svn://svn.ircd-hybrid.org/svnroot/ircd-hybrid/branches/8.1.x@2889 82007160-df01-0410-b94d-b575c5fd34c7

12 files changed, 36 insertions, 36 deletions

diff --git a/modules/core/m_message.c b/modules/core/m_message.c
index 0fa48db..193287c 100644
--- a/modules/core/m_message.c
+++ b/modules/core/m_message.c
@@ -412,8 +412,8 @@ 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, form_str(RPL_TARGUMODEG),
-                     ID_or_name(&me, source_p->from),
-                     ID_or_name(source_p, source_p->from), target_p->name,
+                     ID_or_name(&me, source_p),
+                     ID_or_name(source_p, source_p), target_p->name,
                      callerid ? "+g" : "+G",
                      callerid ? "server side ignore" :
                                 "server side ignore with the exception of common channels");
@@ -423,8 +423,8 @@ msg_client(int p_or_n, const char *command, struct Client *source_p,
         {
           if (p_or_n != NOTICE)
             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);
+                       ID_or_name(&me, source_p),
+                       ID_or_name(source_p, source_p), target_p->name);
 
           sendto_one(target_p, form_str(RPL_UMODEGMSG),
                      me.name, target_p->name,
@@ -512,7 +512,7 @@ handle_special(int p_or_n, const char *command, struct Client *client_p,
          * Not destined for a user on me :-(
          */
         sendto_one(target_p, ":%s %s %s :%s",
-                   ID_or_name(source_p, target_p->from),
+                   ID_or_name(source_p, target_p),
                    command, nick, text);
         if ((p_or_n != NOTICE) && MyClient(source_p))
           source_p->localClient->last_privmsg = CurrentTime;
diff --git a/modules/core/m_mode.c b/modules/core/m_mode.c
index dc4f001..4251aa0 100644
--- a/modules/core/m_mode.c
+++ b/modules/core/m_mode.c
@@ -74,8 +74,8 @@ m_mode(struct Client *client_p, struct Client *source_p,
   if ((chptr = hash_find_channel(parv[1])) == NULL)
   {
     sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
-               ID_or_name(&me, source_p->from),
-               ID_or_name(source_p, source_p->from),
+               ID_or_name(&me, source_p),
+               ID_or_name(source_p, source_p),
                parv[1]);
     return 0;
   }
diff --git a/modules/m_admin.c b/modules/m_admin.c
index fb039a5..2828287 100644
--- a/modules/m_admin.c
+++ b/modules/m_admin.c
@@ -44,8 +44,8 @@
 static int
 do_admin(struct Client *source_p)
 {
-  const char *me_name = ID_or_name(&me, source_p->from);
-  const char *nick = ID_or_name(source_p, source_p->from);
+  const char *me_name = ID_or_name(&me, source_p);
+  const char *nick = ID_or_name(source_p, source_p);
 
   sendto_realops_flags(UMODE_SPY, L_ALL, SEND_NOTICE,
                        "ADMIN requested by %s (%s@%s) [%s]",
diff --git a/modules/m_dline.c b/modules/m_dline.c
index 7aaeec5..35fe431 100644
--- a/modules/m_dline.c
+++ b/modules/m_dline.c
@@ -64,7 +64,7 @@ apply_dline(struct Client *source_p, struct MaskItem *conf,
                          get_oper_name(source_p), tkline_time/60,
                          conf->host, conf->reason);
     sendto_one(source_p, ":%s NOTICE %s :Added temporary %d min. D-Line [%s]",
-               MyConnect(source_p) ? me.name : ID_or_name(&me, source_p->from),
+               MyConnect(source_p) ? me.name : ID_or_name(&me, source_p),
                source_p->name, tkline_time/60, conf->host);
     ilog(LOG_TYPE_DLINE, "%s added temporary %d min. D-Line for [%s] [%s]",
          get_oper_name(source_p), tkline_time/60, conf->host, conf->reason);
@@ -75,7 +75,7 @@ apply_dline(struct Client *source_p, struct MaskItem *conf,
                          "%s added D-Line for [%s] [%s]",
                          get_oper_name(source_p), conf->host, conf->reason);
     sendto_one(source_p, ":%s NOTICE %s :Added D-Line [%s]",
-               MyConnect(source_p) ? me.name : ID_or_name(&me, source_p->from),
+               MyConnect(source_p) ? me.name : ID_or_name(&me, source_p),
                source_p->name, conf->host);
     ilog(LOG_TYPE_DLINE, "%s added D-Line for [%s] [%s]",
          get_oper_name(source_p), conf->host, conf->reason);
diff --git a/modules/m_invite.c b/modules/m_invite.c
index 914ce54..2eb3de6 100644
--- a/modules/m_invite.c
+++ b/modules/m_invite.c
@@ -138,8 +138,8 @@ m_invite(struct Client *client_p, struct Client *source_p,
   }
   else if (target_p->from != client_p)
     sendto_one(target_p, ":%s INVITE %s %s %lu",
-               ID_or_name(source_p, target_p->from),
-               ID_or_name(target_p, target_p->from),
+               ID_or_name(source_p, target_p),
+               ID_or_name(target_p, target_p),
                chptr->chname, (unsigned long)chptr->channelts);
   return 0;
 }
diff --git a/modules/m_kline.c b/modules/m_kline.c
index d4617f2..1810aed 100644
--- a/modules/m_kline.c
+++ b/modules/m_kline.c
@@ -101,7 +101,7 @@ m_kline_add_kline(struct Client *source_p, struct MaskItem *conf,
                          conf->user, conf->host,
                          conf->reason);
     sendto_one(source_p, ":%s NOTICE %s :Added temporary %d min. K-Line [%s@%s]",
-               MyConnect(source_p) ? me.name : ID_or_name(&me, source_p->from),
+               MyConnect(source_p) ? me.name : ID_or_name(&me, source_p),
                source_p->name, tkline_time/60, conf->user, conf->host);
     ilog(LOG_TYPE_KLINE, "%s added temporary %d min. K-Line for [%s@%s] [%s]",
          get_oper_name(source_p), tkline_time/60,
@@ -114,7 +114,7 @@ m_kline_add_kline(struct Client *source_p, struct MaskItem *conf,
                          get_oper_name(source_p),
                          conf->user, conf->host, conf->reason);
     sendto_one(source_p, ":%s NOTICE %s :Added K-Line [%s@%s]",
-               MyConnect(source_p) ? me.name : ID_or_name(&me, source_p->from),
+               MyConnect(source_p) ? me.name : ID_or_name(&me, source_p),
                source_p->name, conf->user, conf->host);
     ilog(LOG_TYPE_KLINE, "%s added K-Line for [%s@%s] [%s]",
          get_oper_name(source_p), conf->user, conf->host, conf->reason);
diff --git a/modules/m_links.c b/modules/m_links.c
index fa2c12f..138e7cf 100644
--- a/modules/m_links.c
+++ b/modules/m_links.c
@@ -53,8 +53,8 @@ do_links(struct Client *source_p, int parc, char *parv[])
     const char *mask = (parc > 2 ? parv[2] : parv[1]);
     const char *me_name, *nick;
 
-    me_name = ID_or_name(&me, source_p->from);
-    nick = ID_or_name(source_p, source_p->from);
+    me_name = ID_or_name(&me, source_p);
+    nick = ID_or_name(source_p, source_p);
 
     DLINK_FOREACH(ptr, global_serv_list.head)
     {
@@ -93,18 +93,18 @@ do_links(struct Client *source_p, int parc, char *parv[])
      * then print out the file (which may or may not be empty)
      */
     sendto_one(source_p, form_str(RPL_LINKS),
-               ID_or_name(&me, source_p->from),
-               ID_or_name(source_p, source_p->from),
+               ID_or_name(&me, source_p),
+               ID_or_name(source_p, source_p),
                me.name, me.name, 0, me.info);
 
     DLINK_FOREACH(ptr, flatten_links.head)
       sendto_one(source_p, ":%s %d %s %s",
-                 ID_or_name(&me, source_p->from), RPL_LINKS,
-                 ID_or_name(source_p, source_p->from),
+                 ID_or_name(&me, source_p), RPL_LINKS,
+                 ID_or_name(source_p, source_p),
                  ptr->data);
     sendto_one(source_p, form_str(RPL_ENDOFLINKS),
-               ID_or_name(&me, source_p->from),
-               ID_or_name(source_p, source_p->from), "*");
+               ID_or_name(&me, source_p),
+               ID_or_name(source_p, source_p), "*");
   }
 }
 
diff --git a/modules/m_svskill.c b/modules/m_svskill.c
index 96f97bf..a72f4c0 100644
--- a/modules/m_svskill.c
+++ b/modules/m_svskill.c
@@ -100,12 +100,12 @@ ms_svskill(struct Client *client_p, struct Client *source_p, int parc, char *par
 
   if (ts == 0)
     sendto_one(target_p, ":%s SVSKILL %s :%s",
-               ID_or_name(source_p, target_p->from),
-               ID_or_name(target_p, target_p->from), comment);
+               ID_or_name(source_p, target_p),
+               ID_or_name(target_p, target_p), comment);
   else
     sendto_one(target_p, ":%s SVSKILL %s %lu :%s",
-               ID_or_name(source_p, target_p->from),
-               ID_or_name(target_p, target_p->from), ts, comment);
+               ID_or_name(source_p, target_p),
+               ID_or_name(target_p, target_p), ts, comment);
   return 0;
 }
 
diff --git a/modules/m_xline.c b/modules/m_xline.c
index bab2b7e..3602c55 100644
--- a/modules/m_xline.c
+++ b/modules/m_xline.c
@@ -219,8 +219,8 @@ relay_xline(struct Client *source_p, char *parv[])
     if ((conf = find_matching_name_conf(CONF_XLINE, parv[2], NULL, NULL, 0)))
     {
       sendto_one(source_p, ":%s NOTICE %s :[%s] already X-Lined by [%s] - %s",
-                 ID_or_name(&me, source_p->from),
-                 ID_or_name(source_p, source_p->from),
+                 ID_or_name(&me, source_p),
+                 ID_or_name(source_p, source_p),
                  parv[2], conf->name, conf->reason);
       return;
     }
@@ -358,7 +358,7 @@ write_xline(struct Client *source_p, char *gecos, char *reason,
                          get_oper_name(source_p), (int)tkline_time/60,
                          conf->name, conf->reason);
     sendto_one(source_p, ":%s NOTICE %s :Added temporary %d min. X-Line [%s]",
-               MyConnect(source_p) ? me.name : ID_or_name(&me, source_p->from),
+               MyConnect(source_p) ? me.name : ID_or_name(&me, source_p),
                source_p->name, (int)tkline_time/60, conf->name);
     ilog(LOG_TYPE_XLINE, "%s added temporary %d min. X-Line for [%s] [%s]",
          source_p->name, (int)tkline_time/60, conf->name, conf->reason);
@@ -372,7 +372,7 @@ write_xline(struct Client *source_p, char *gecos, char *reason,
                          conf->reason);
     sendto_one(source_p,
                ":%s NOTICE %s :Added X-Line [%s] [%s]",
-               MyConnect(source_p) ? me.name : ID_or_name(&me, source_p->from),
+               MyConnect(source_p) ? me.name : ID_or_name(&me, source_p),
                source_p->name, conf->name, conf->reason);
     ilog(LOG_TYPE_XLINE, "%s added X-Line for [%s] [%s]",
          get_oper_name(source_p), conf->name, conf->reason);
diff --git a/src/motd.c b/src/motd.c
index 5b80a08..8b0af6e 100644
--- a/src/motd.c
+++ b/src/motd.c
@@ -280,8 +280,8 @@ static void
 motd_forward(struct Client *source_p, const struct MotdCache *cache)
 {
   unsigned int i = 0;
-  const char *from = ID_or_name(&me, source_p->from);
-  const char *to = ID_or_name(source_p, source_p->from);
+  const char *from = ID_or_name(&me, source_p);
+  const char *to = ID_or_name(source_p, source_p);
 
   assert(source_p);
 
diff --git a/src/parse.c b/src/parse.c
index d38aa8d..82175de 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -716,8 +716,8 @@ handle_numeric(char numeric[], struct Client *client_p, struct Client *source_p,
         !HasUMode(target_p, UMODE_OPER))
       sendto_one(target_p, ":%s %s %s %s", me.name, numeric, target_p->name, parv[2]);
     else
-      sendto_one(target_p, ":%s %s %s %s", ID_or_name(source_p, target_p->from),
-                 numeric, ID_or_name(target_p, target_p->from), parv[2]);
+      sendto_one(target_p, ":%s %s %s %s", ID_or_name(source_p, target_p),
+                 numeric, ID_or_name(target_p, target_p), parv[2]);
   }
   else
     sendto_channel_local(ALL_MEMBERS, 0, chptr, ":%s %s %s %s",
diff --git a/src/send.c b/src/send.c
index fcf2d91..5f9865e 100644
--- a/src/send.c
+++ b/src/send.c
@@ -1028,7 +1028,7 @@ kill_client(struct Client *client_p, struct Client *diedie,
     return;
 
   len = snprintf(buffer, sizeof(buffer), ":%s KILL %s :",
-                 ID_or_name(&me, client_p->from),
+                 ID_or_name(&me, client_p),
                  ID_or_name(diedie, client_p));
 
   va_start(args, pattern);