- 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

3 files changed, 5 insertions, 5 deletions

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);