From adb5ab48a2b6efd146b9cc85a62b45c6a70aa34d Mon Sep 17 00:00:00 2001 From: Attila Molnar Date: Mon, 27 Jan 2014 17:01:05 +0100 Subject: m_tline Minor improvements - Replace floats with integers - Use size() instead of counting elements - Use WriteNotice() --- src/modules/m_tline.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/modules/m_tline.cpp b/src/modules/m_tline.cpp index cf5814fd1..64beb3120 100644 --- a/src/modules/m_tline.cpp +++ b/src/modules/m_tline.cpp @@ -32,14 +32,12 @@ class CommandTline : public Command CmdResult Handle (const std::vector ¶meters, User *user) { - float n_counted = 0; - float n_matched = 0; - float n_match_host = 0; - float n_match_ip = 0; + unsigned int n_matched = 0; + unsigned int n_match_host = 0; + unsigned int n_match_ip = 0; for (user_hash::const_iterator u = ServerInstance->Users->clientlist->begin(); u != ServerInstance->Users->clientlist->end(); u++) { - n_counted++; if (InspIRCd::Match(u->second->GetFullRealHost(),parameters[0])) { n_matched++; @@ -55,10 +53,15 @@ class CommandTline : public Command } } } + + unsigned long n_counted = ServerInstance->Users->clientlist->size(); if (n_matched) - user->WriteServ( "NOTICE %s :*** TLINE: Counted %0.0f user(s). Matched '%s' against %0.0f user(s) (%0.2f%% of the userbase). %0.0f by hostname and %0.0f by IP address.",user->nick.c_str(), n_counted, parameters[0].c_str(), n_matched, (n_matched/n_counted)*100, n_match_host, n_match_ip); + { + float p = (n_matched / (float)n_counted) * 100; + user->WriteNotice(InspIRCd::Format("*** TLINE: Counted %lu user(s). Matched '%s' against %u user(s) (%0.2f%% of the userbase). %u by hostname and %u by IP address.", n_counted, parameters[0].c_str(), n_matched, p, n_match_host, n_match_ip)); + } else - user->WriteServ( "NOTICE %s :*** TLINE: Counted %0.0f user(s). Matched '%s' against no user(s).", user->nick.c_str(), n_counted, parameters[0].c_str()); + user->WriteNotice(InspIRCd::Format("*** TLINE: Counted %lu user(s). Matched '%s' against no user(s).", n_counted, parameters[0].c_str())); return CMD_SUCCESS; } -- cgit v1.2.3