From c425952cd68c95eebfaa344f4902560fd8972ca1 Mon Sep 17 00:00:00 2001 From: Bram Matthys Date: Sun, 19 Jul 2015 17:42:05 +0200 Subject: [PATCH] Textual changes --- src/modules/m_kill.c | 2 +- src/modules/m_nick.c | 6 +++--- src/modules/m_sjoin.c | 2 +- src/modules/m_svsnick.c | 2 +- src/send.c | 20 ++++++++++---------- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/modules/m_kill.c b/src/modules/m_kill.c index f555ac7ea..76210e985 100644 --- a/src/modules/m_kill.c +++ b/src/modules/m_kill.c @@ -209,7 +209,7 @@ DLLFUNC int m_kill(aClient *cptr, aClient *sptr, int parc, char *parv[]) */ sendto_snomask_normal(SNO_KILLS, - "*** Notice -- Received KILL message for %s!%s@%s from %s Path: %s!%s", + "*** Received KILL message for %s!%s@%s from %s Path: %s!%s", acptr->name, acptr->user->username, IsHidden(acptr) ? acptr->user->virthost : acptr->user->realhost, sptr->name, inpath, path); diff --git a/src/modules/m_nick.c b/src/modules/m_nick.c index 2dc51cee8..3c4e82b42 100644 --- a/src/modules/m_nick.c +++ b/src/modules/m_nick.c @@ -917,13 +917,13 @@ DLLFUNC CMD_FUNC(m_nick) } else sptr->user->flood.nick_c++; - sendto_snomask(SNO_NICKCHANGE, "*** Notice -- %s (%s@%s) has changed their nickname to %s", + sendto_snomask(SNO_NICKCHANGE, "*** %s (%s@%s) has changed their nickname to %s", sptr->name, sptr->user->username, sptr->user->realhost, nick); RunHook2(HOOKTYPE_LOCAL_NICKCHANGE, sptr, nick); } else { if (!IsULine(sptr)) - sendto_snomask(SNO_FNICKCHANGE, "*** Notice -- %s (%s@%s) has changed their nickname to %s", + sendto_snomask(SNO_FNICKCHANGE, "*** %s (%s@%s) has changed their nickname to %s", sptr->name, sptr->user->username, sptr->user->realhost, nick); RunHook3(HOOKTYPE_REMOTE_NICKCHANGE, cptr, sptr, nick); @@ -1117,7 +1117,7 @@ int _register_user(aClient *cptr, aClient *sptr, char *nick, char *username, cha return FLUSH_BUFFER; sendto_snomask(SNO_CLIENT, - "*** Notice -- %s from %s.", + "*** %s from %s.", i == -3 ? "Too many connections" : "Unauthorized connection", get_client_host(sptr)); ircstp->is_ref++; diff --git a/src/modules/m_sjoin.c b/src/modules/m_sjoin.c index 24e628986..a098c0161 100644 --- a/src/modules/m_sjoin.c +++ b/src/modules/m_sjoin.c @@ -851,7 +851,7 @@ CMD_FUNC(m_sjoin) if (oldts != -1) if (oldts != chptr->creationtime) sendto_channel_butserv(chptr, &me, - ":%s NOTICE %s :*** Notice -- TS for %s changed from %ld to %ld", + ":%s NOTICE %s :*** TS for %s changed from %ld to %ld", me.name, chptr->chname, chptr->chname, oldts, chptr->creationtime); diff --git a/src/modules/m_svsnick.c b/src/modules/m_svsnick.c index 4e0c3a270..bff6d46cf 100644 --- a/src/modules/m_svsnick.c +++ b/src/modules/m_svsnick.c @@ -118,7 +118,7 @@ aClient *ocptr; /* Other client */ hash_check_watch(acptr, RPL_LOGOFF); sendto_snomask(SNO_NICKCHANGE, - "*** Notice -- %s (%s@%s) has been forced to change their nickname to %s", + "*** %s (%s@%s) has been forced to change their nickname to %s", acptr->name, acptr->user->username, acptr->user->realhost, parv[2]); RunHook2(HOOKTYPE_LOCAL_NICKCHANGE, acptr, parv[2]); diff --git a/src/send.c b/src/send.c index 789ba8afb..d3aa31908 100644 --- a/src/send.c +++ b/src/send.c @@ -763,7 +763,7 @@ void sendto_ops(char *pattern, ...) list_for_each_entry(cptr, &lclient_list, lclient_node) if (!IsServer(cptr) && !IsMe(cptr) && SendServNotice(cptr)) { - (void)ircsnprintf(nbuf, sizeof(nbuf), ":%s NOTICE %s :*** Notice -- ", me.name, cptr->name); + (void)ircsnprintf(nbuf, sizeof(nbuf), ":%s NOTICE %s :*** ", me.name, cptr->name); (void)strlcat(nbuf, pattern, sizeof nbuf); va_start(vl, pattern); @@ -1170,7 +1170,7 @@ void sendto_realops(char *pattern, ...) list_for_each_entry(cptr, &oper_list, special_node) { - (void)ircsnprintf(nbuf, sizeof(nbuf), ":%s NOTICE %s :*** Notice -- ", + (void)ircsnprintf(nbuf, sizeof(nbuf), ":%s NOTICE %s :*** ", me.name, cptr->name); (void)strlcat(nbuf, pattern, sizeof nbuf); @@ -1205,22 +1205,22 @@ void sendto_connectnotice(aClient *acptr, int disconnect, char *comment) { RunHook(HOOKTYPE_LOCAL_CONNECT, acptr); ircsnprintf(connectd, sizeof(connectd), - "*** Notice -- Client connecting on port %d: %s (%s@%s) [%s] %s%s%s", + "*** Client connecting on port %d: %s (%s@%s) [%s] %s%s%s", acptr->local->listener->port, acptr->name, acptr->user->username, acptr->user->realhost, acptr->local->class ? acptr->local->class->name : "", IsSecure(acptr) ? "[secure " : "", IsSecure(acptr) ? SSL_get_cipher(acptr->local->ssl) : "", IsSecure(acptr) ? "]" : ""); ircsnprintf(connecth, sizeof(connecth), - "*** Notice -- Client connecting: %s (%s@%s) [%s] {%s}", acptr->name, + "*** Client connecting: %s (%s@%s) [%s] {%s}", acptr->name, acptr->user->username, acptr->user->realhost, Inet_ia2p(&acptr->local->ip), acptr->local->class ? acptr->local->class->name : "0"); } else { - ircsnprintf(connectd, sizeof(connectd), "*** Notice -- Client exiting: %s (%s@%s) [%s]", + ircsnprintf(connectd, sizeof(connectd), "*** Client exiting: %s (%s@%s) [%s]", acptr->name, acptr->user->username, acptr->user->realhost, comment); - ircsnprintf(connecth, sizeof(connecth), "*** Notice -- Client exiting: %s (%s@%s) [%s] [%s]", + ircsnprintf(connecth, sizeof(connecth), "*** Client exiting: %s (%s@%s) [%s] [%s]", acptr->name, acptr->user->username, acptr->user->realhost, comment, Inet_ia2p(&acptr->local->ip)); } @@ -1248,17 +1248,17 @@ void sendto_fconnectnotice(aClient *acptr, int disconnect, char *comment) if (!disconnect) { - ircsnprintf(connectd, sizeof(connectd), "*** Notice -- Client connecting at %s: %s (%s@%s)", + ircsnprintf(connectd, sizeof(connectd), "*** Client connecting at %s: %s (%s@%s)", acptr->user->server, acptr->name, acptr->user->username, acptr->user->realhost); ircsnprintf(connecth, sizeof(connecth), - "*** Notice -- Client connecting at %s: %s (%s@%s) [%s] {0}", acptr->user->server, acptr->name, + "*** Client connecting at %s: %s (%s@%s) [%s] {0}", acptr->user->server, acptr->name, acptr->user->username, acptr->user->realhost, acptr->ip ? acptr->ip : "0"); } else { - ircsnprintf(connectd, sizeof(connectd), "*** Notice -- Client exiting at %s: %s!%s@%s (%s)", + ircsnprintf(connectd, sizeof(connectd), "*** Client exiting at %s: %s!%s@%s (%s)", acptr->user->server, acptr->name, acptr->user->username, acptr->user->realhost, comment); - ircsnprintf(connecth, sizeof(connecth), "*** Notice -- Client exiting at %s: %s (%s@%s) [%s] [%s]", + ircsnprintf(connecth, sizeof(connecth), "*** Client exiting at %s: %s (%s@%s) [%s] [%s]", acptr->user->server, acptr->name, acptr->user->username, acptr->user->realhost, comment, acptr->ip ? acptr->ip : "0"); }