From 6ceb9cb6f7120dfd2f0b7555afa17386e8ab86f4 Mon Sep 17 00:00:00 2001 From: Bram Matthys Date: Tue, 4 Feb 2003 19:40:38 +0000 Subject: [PATCH] Code cleanup (in many files heh)... I replaced all: IsHidden(sptr) ? sptr->user->virthost : sptr->user->realhost stuff to a simple GetHost(sptr) macro (defined in struct.h). Smaller and less error phrone :). Also fixed the if IsHidden -> if (IsHidden found by codemastr . --- Changes | 1 + include/struct.h | 2 ++ src/channel.c | 51 ++++++++++------------------------------ src/modules/m_htm.c | 10 ++++---- src/modules/m_kill.c | 6 ++--- src/modules/m_oper.c | 12 ++++------ src/modules/m_setident.c | 4 +--- src/modules/m_svsmode.c | 5 ++-- src/modules/m_tkl.c | 3 +-- src/modules/m_who.c | 7 +----- src/modules/m_whois.c | 2 +- src/s_serv.c | 14 ++++------- src/s_user.c | 4 ++-- src/send.c | 9 ++----- 14 files changed, 41 insertions(+), 89 deletions(-) diff --git a/Changes b/Changes index 8fc473246..917db9570 100644 --- a/Changes +++ b/Changes @@ -1876,3 +1876,4 @@ seen. gmtime warning still there - Fixed minor memleak with zip links. - Code cleanup in m_umode - Fixed bug in ISON +- Code cleanup diff --git a/include/struct.h b/include/struct.h index db9f6126e..7014b1291 100644 --- a/include/struct.h +++ b/include/struct.h @@ -408,6 +408,8 @@ typedef unsigned int u_int32_t; /* XXX Hope this works! */ #define IsNotSpoof(x) (1) #endif +#define GetHost(x) (IsHidden(x) ? (x)->user->virthost : (x)->user->realhost) + #define SetKillsF(x) ((x)->user->snomask |= SNO_KILLS) #define SetClientF(x) ((x)->user->snomask |= SNO_CLIENT) #define SetFloodF(x) ((x)->user->snomask |= SNO_FLOOD) diff --git a/src/channel.c b/src/channel.c index 3b1ee8dd2..d64e8542e 100644 --- a/src/channel.c +++ b/src/channel.c @@ -2817,9 +2817,7 @@ CMD_FUNC(channel_link) if (MyClient(sptr)) sendto_one(sptr, ":%s!%s@%s JOIN :%s", sptr->name, sptr->user->username, - (IsHidden(sptr) ? sptr-> - user->virthost : sptr->user->realhost), - name); + GetHost(sptr), name); sendto_umode(UMODE_NETADMIN, "*** Invisible(+I) user %s joined %s", sptr->name, chptr->chname); @@ -3043,9 +3041,7 @@ CMD_FUNC(m_join) { sendto_one(sptr, ":%s!%s@%s JOIN :%s", sptr->name, sptr->user->username, - (IsHidden(sptr) ? sptr-> - user->virthost : sptr->user->realhost), - chptr->chname); + GetHost(sptr), chptr->chname); sendto_umode(UMODE_ADMIN, "*** [+I] %s invisible joined %s", sptr->name, chptr->chname); @@ -3061,13 +3057,10 @@ CMD_FUNC(m_join) if (MyClient(sptr)) sendto_one(sptr, ":%s!%s@%s JOIN :%s", sptr->name, sptr->user->username, - (IsHidden(sptr) ? sptr-> - user->virthost : sptr->user->realhost), - chptr->chname); + GetHost(sptr), chptr->chname); sendto_chanops_butone(NULL, chptr, ":%s!%s@%s JOIN :%s", sptr->name, sptr->user->username, - (IsHidden(sptr) ? sptr->user->virthost : sptr-> - user->realhost), chptr->chname); + GetHost(sptr), chptr->chname); } else sendto_channel_butserv(chptr, sptr, @@ -3259,18 +3252,14 @@ CMD_FUNC(m_part) ":%s!%s@%s PART %s", sptr->name, sptr->user->username, - (IsHidden(sptr) ? - sptr->user->virthost : - sptr->user->realhost), + GetHost(sptr), chptr->chname); else sendto_one(sptr, ":%s!%s@%s PART %s :%s", sptr->name, sptr->user->username, - (IsHidden(sptr) ? - sptr->user->virthost : - sptr->user->realhost), + GetHost(sptr), chptr->chname, comment); } } @@ -3284,9 +3273,7 @@ CMD_FUNC(m_part) chptr, ":%s!%s@%s PART %s", sptr->name, sptr->user->username, - (IsHidden(sptr) ? sptr-> - user->virthost : sptr-> - user->realhost), + GetHost(sptr), chptr->chname); if (!is_chan_op(sptr, chptr)) sendto_one(sptr, @@ -3294,10 +3281,7 @@ CMD_FUNC(m_part) sptr->name, sptr->user-> username, - (IsHidden(sptr) ? - sptr->user-> - virthost : sptr-> - user->realhost), + GetHost(sptr), chptr->chname); } else @@ -3307,9 +3291,7 @@ CMD_FUNC(m_part) ":%s!%s@%s PART %s %s", sptr->name, sptr->user->username, - (IsHidden(sptr) ? sptr-> - user->virthost : sptr-> - user->realhost), + GetHost(sptr), chptr->chname, comment); if (!is_chan_op(cptr, chptr)) sendto_one(sptr, @@ -3317,10 +3299,7 @@ CMD_FUNC(m_part) sptr->name, sptr->user-> username, - (IsHidden(sptr) ? - sptr->user-> - virthost : sptr-> - user->realhost), + GetHost(sptr), chptr->chname, comment); } @@ -3692,8 +3671,7 @@ CMD_FUNC(m_topic) #ifndef TOPIC_NICK_IS_NUHOST nicKlen = strlen(sptr->name); #else - tnick = make_nick_user_host(sptr->name, sptr->user->username, - IsHidden(sptr) ? sptr->user->virthost : sptr->user->realhost); + tnick = make_nick_user_host(sptr->name, sptr->user->username, GetHost(sptr)); nicKlen = strlen(tnick); #endif if (chptr->topic) @@ -4114,9 +4092,7 @@ int check_for_chan_flood(aClient *cptr, aClient *sptr, aChannel *chptr) chptr->mode.msgs, chptr->mode.per); if (chptr->mode.kmode == 1) { /* ban. */ - ircsprintf(mask, "*!*@%s", - (IsHidden(sptr) ? sptr->user-> - virthost : sptr->user->realhost)); + ircsprintf(mask, "*!*@%s", GetHost(sptr)); add_banid(&me, chptr, mask); sendto_serv_butone(&me, ":%s MODE %s +b %s 0", me.name, chptr->chname, mask); @@ -4643,8 +4619,7 @@ CMD_FUNC(m_knock) sendto_channelprefix_butone(NULL, &me, chptr, PREFIX_OP, ":%s NOTICE @%s :[Knock] by %s!%s@%s (%s) ", me.name, chptr->chname, sptr->name, - sptr->user->username, - (IsHidden(sptr) ? sptr->user->virthost : sptr->user->realhost), + sptr->user->username, GetHost(sptr), parv[2] ? parv[2] : "no reason specified"); sendto_one(sptr, ":%s %s %s :Knocked on %s", me.name, IsWebTV(sptr) ? "PRIVMSG" : "NOTICE", diff --git a/src/modules/m_htm.c b/src/modules/m_htm.c index c2bb09f36..0415ee24d 100644 --- a/src/modules/m_htm.c +++ b/src/modules/m_htm.c @@ -238,7 +238,7 @@ DLLFUNC int m_htm(aClient *cptr, aClient *sptr, int parc, char *parv[]) sendto_ops ("%s (%s@%s) forced High traffic mode to activate", parv[0], sptr->user->username, - sptr->user->realhost); + GetHost(sptr)); LCF = 60; /* 60 seconds */ mod.flags = EMOD_EVERY; mod.every = LCF; @@ -262,7 +262,7 @@ DLLFUNC int m_htm(aClient *cptr, aClient *sptr, int parc, char *parv[]) sendto_ops ("%s (%s@%s) forced High traffic mode to deactivate", parv[0], sptr->user->username, - sptr->user->realhost); + GetHost(sptr)); } else if (!stricmp(command, "TO")) { @@ -286,7 +286,7 @@ DLLFUNC int m_htm(aClient *cptr, aClient *sptr, int parc, char *parv[]) sendto_ops ("%s (%s@%s) changed the High traffic mode max rate to %dkb/s", parv[0], sptr->user->username, - sptr->user->realhost, LRV); + GetHost(sptr), LRV); } } } @@ -298,7 +298,7 @@ DLLFUNC int m_htm(aClient *cptr, aClient *sptr, int parc, char *parv[]) me.name, parv[0]); sendto_ops("%s (%s@%s) set High traffic mode to QUIET", parv[0], sptr->user->username, - sptr->user->realhost); + GetHost(sptr)); } else if (!stricmp(command, "NOISY")) @@ -309,7 +309,7 @@ DLLFUNC int m_htm(aClient *cptr, aClient *sptr, int parc, char *parv[]) me.name, parv[0]); sendto_ops("%s (%s@%s) set High traffic mode to NOISY", parv[0], sptr->user->username, - sptr->user->realhost); + GetHost(sptr)); } else sendto_one(sptr, ":%s NOTICE %s :Unknown option: %s", diff --git a/src/modules/m_kill.c b/src/modules/m_kill.c index b1f84469f..ebc078ccc 100644 --- a/src/modules/m_kill.c +++ b/src/modules/m_kill.c @@ -245,9 +245,7 @@ DLLFUNC int m_kill(aClient *cptr, aClient *sptr, int parc, char *parv[]) ** ...!operhost!oper ** ...!operhost!oper (comment) */ - strlcpy(inpath, - IsHidden(cptr) ? cptr->user->virthost : cptr->user-> - realhost, sizeof inpath); + strlcpy(inpath, GetHost(cptr), sizeof inpath); if (kcount < 2) { /* Only check the path the first time around, or it gets appended to itself. */ if (!BadPtr(path)) @@ -297,7 +295,7 @@ DLLFUNC int m_kill(aClient *cptr, aClient *sptr, int parc, char *parv[]) ircd_log (LOG_KILL, "KILL (%s) by %s(%s!%s)", make_nick_user_host - (acptr->name, acptr->user->username, (IsHidden(acptr) ? acptr->user->virthost : acptr->user->realhost)), + (acptr->name, acptr->user->username, GetHost(acptr)), parv[0], inpath, path); diff --git a/src/modules/m_oper.c b/src/modules/m_oper.c index bca6e5c87..bce1a1b19 100644 --- a/src/modules/m_oper.c +++ b/src/modules/m_oper.c @@ -264,23 +264,19 @@ DLLFUNC int m_oper(aClient *cptr, aClient *sptr, int parc, char *parv[]) { SetHidden(sptr); } sendto_ops("%s (%s@%s) is now a local operator (o)", - parv[0], sptr->user->username, - IsHidden(sptr) ? sptr->user->virthost : sptr->user->realhost); - + parv[0], sptr->user->username, GetHost(sptr)); } if (announce != NULL) { sendto_ops ("%s (%s@%s) [%s] %s", - parv[0], sptr->user->username, - IsHidden(sptr) ? sptr->user->virthost : sptr-> - user->realhost, parv[1], announce); + parv[0], sptr->user->username, GetHost(sptr), + parv[1], announce); sendto_serv_butone(&me, ":%s GLOBOPS :%s (%s@%s) [%s] %s", me.name, parv[0], sptr->user->username, - IsHidden(sptr) ? sptr-> - user->virthost : sptr->user->realhost, parv[1], announce); + GetHost(sptr), parv[1], announce); } if (aconf->snomask) diff --git a/src/modules/m_setident.c b/src/modules/m_setident.c index 088252394..b7e4c0730 100644 --- a/src/modules/m_setident.c +++ b/src/modules/m_setident.c @@ -245,9 +245,7 @@ DLLFUNC int m_setident(aClient *cptr, aClient *sptr, int parc, char *parv[]) { sendto_one(sptr, ":%s NOTICE %s :Your nick!user@host-mask is now (%s!%s@%s) - To disable ident set change it manually by /setident'ing again", - me.name, parv[0], parv[0], sptr->user->username, - IsHidden(sptr) ? sptr->user->virthost : sptr-> - user->realhost); + me.name, parv[0], parv[0], sptr->user->username, GetHost(sptr)); } return 0; } diff --git a/src/modules/m_svsmode.c b/src/modules/m_svsmode.c index d52711e3b..3c93aed3d 100644 --- a/src/modules/m_svsmode.c +++ b/src/modules/m_svsmode.c @@ -246,9 +246,8 @@ int channel_svsmode(aClient *cptr, aClient *sptr, int parc, char *parv[]) acptr->user->username, acptr->user->realhost), sizeof uhost); strlcpy(vhost, make_nick_user_host(acptr->name, - acptr->user->username, acptr->user->virthost - ? acptr->user->virthost : - acptr->user->realhost), sizeof vhost); + acptr->user->username, GetHost(acptr)), + sizeof vhost); ban = chptr->exlist; while (ban) { bnext = ban->next; diff --git a/src/modules/m_tkl.c b/src/modules/m_tkl.c index 256f46e12..c61c1f380 100644 --- a/src/modules/m_tkl.c +++ b/src/modules/m_tkl.c @@ -368,8 +368,7 @@ DLLFUNC int m_tkl_line(aClient *cptr, aClient *sptr, int parc, char *parv[], ch tkllayer[3] = usermask; tkllayer[4] = hostmask; tkllayer[5] = - make_nick_user_host(sptr->name, sptr->user->username, - (IsHidden(sptr) ? sptr->user->virthost : sptr->user->realhost)); + make_nick_user_host(sptr->name, sptr->user->username, GetHost(sptr)); if (whattodo == 0) { if (secs == 0) diff --git a/src/modules/m_who.c b/src/modules/m_who.c index 0c640967f..d98ad7d55 100644 --- a/src/modules/m_who.c +++ b/src/modules/m_who.c @@ -509,12 +509,7 @@ static int can_see(aClient *sptr, aClient *acptr, aChannel *channel) if (IsAnOper(sptr)) host = acptr->user->realhost; else - { - if (IsHidden(acptr)) - host = acptr->user->virthost; - else - host = acptr->user->realhost; - } + host = GetHost(acptr); if (((wfl.want_host == WHO_WANT) && match(wfl.host, host)) || ((wfl.want_host == WHO_DONTWANT) && !match(wfl.host, host))) diff --git a/src/modules/m_whois.c b/src/modules/m_whois.c index a759c83b1..4d7f73638 100644 --- a/src/modules/m_whois.c +++ b/src/modules/m_whois.c @@ -198,7 +198,7 @@ DLLFUNC int m_whois(aClient *cptr, aClient *sptr, int parc, char *parv[]) sendto_one(acptr, ":%s %s %s :*** %s (%s@%s) did a /whois on you.", me.name, IsWebTV(acptr) ? "PRIVMSG" : "NOTICE", acptr->name, sptr->name, - sptr->user->username, IsHidden(sptr) ? sptr->user->virthost : sptr->user->realhost); + sptr->user->username, GetHost(sptr)); } sendto_one(sptr, rpl_str(RPL_WHOISUSER), me.name, diff --git a/src/s_serv.c b/src/s_serv.c index 15a4d64a2..affb7f2eb 100644 --- a/src/s_serv.c +++ b/src/s_serv.c @@ -1259,8 +1259,7 @@ int m_server_synch(aClient *cptr, long numeric, ConfigItem_link *aconf) server), acptr->user->servicestamp, (!buf || *buf == '\0' ? "+" : buf), - IsHidden(acptr) ? acptr->user-> - virthost : acptr->user->realhost, + GetHost(acptr), acptr->info); } @@ -2610,9 +2609,7 @@ CMD_FUNC(m_stats) if (stat != '*') sendto_snomask(SNO_EYES, "Stats \'%c\' requested by %s (%s@%s)", - stat, sptr->name, sptr->user->username, - IsHidden(sptr) ? sptr->user->virthost : sptr->user-> - realhost); + stat, sptr->name, sptr->user->username, GetHost(sptr)); return 0; } @@ -3812,8 +3809,7 @@ CMD_FUNC(m_trace) rpl_str(RPL_TRACEOPERATOR), me.name, parv[0], class, acptr->name, - IsHidden(acptr) ? acptr->user-> - virthost : acptr->user->realhost, + GetHost(acptr), now - acptr->lasttime); else sendto_one(sptr, @@ -4272,9 +4268,7 @@ CMD_FUNC(m_close) } sendto_one(sptr, rpl_str(RPL_CLOSEEND), me.name, parv[0], closed); sendto_realops("%s!%s@%s closed %d unknown connections", sptr->name, - sptr->user->username, - IsHidden(sptr) ? sptr->user->virthost : sptr->user->realhost, - closed); + sptr->user->username, GetHost(sptr), closed); IRCstats.unknown = 0; return 0; } diff --git a/src/s_user.c b/src/s_user.c index 942c5b34e..49388572a 100644 --- a/src/s_user.c +++ b/src/s_user.c @@ -985,7 +985,7 @@ extern int register_user(aClient *cptr, aClient *sptr, char *nick, char *usernam { IRCstats.unknown--; IRCstats.me_clients++; - if IsHidden(sptr) + if (IsHidden(sptr)) ircd_log(LOG_CLIENT, "Connect - %s!%s@%s [VHOST %s]", nick, user->username, user->realhost, user->virthost); else @@ -2129,7 +2129,7 @@ CMD_FUNC(m_ison) { strcpy(namebuf, acptr->user->username); strcat(namebuf, "@"); - strcat(namebuf, IsHidden(acptr) ? acptr->user->virhost : acptr->user->realhost); + strcat(namebuf, GetHost(acptr)); if (match(user, namebuf)) continue; *--user = '!'; diff --git a/src/send.c b/src/send.c index edef17532..de72df09d 100644 --- a/src/send.c +++ b/src/send.c @@ -1432,10 +1432,7 @@ void vsendto_prefix_one(struct Client *to, struct Client *from, && !MyConnect(from)) { strcat(sender, "@"); - - (void)strcat(sender, - (!IsHidden(from) ? user->realhost : user-> - virthost)); + (void)strcat(sender, GetHost(from)); flag = 1; } } @@ -1447,9 +1444,7 @@ void vsendto_prefix_one(struct Client *to, struct Client *from, && (IsHidden(from) ? *user->virthost : *user->realhost)) { strcat(sender, "@"); - strcat(sender, - (!IsHidden(from) ? user->realhost : user-> - virthost)); + strcat(sender, GetHost(from)); } *sendbuf = ':'; strcpy(&sendbuf[1], sender);