diff options
Diffstat (limited to 'plugins/TrafficCounter/src')
| -rw-r--r-- | plugins/TrafficCounter/src/misc.cpp | 14 | ||||
| -rw-r--r-- | plugins/TrafficCounter/src/vars.cpp | 42 | 
2 files changed, 28 insertions, 28 deletions
diff --git a/plugins/TrafficCounter/src/misc.cpp b/plugins/TrafficCounter/src/misc.cpp index 72bb146280..1217d1568a 100644 --- a/plugins/TrafficCounter/src/misc.cpp +++ b/plugins/TrafficCounter/src/misc.cpp @@ -207,49 +207,49 @@ size_t GetDurationFormatM(DWORD Duration, TCHAR *Format, TCHAR *Buffer, WORD Siz  		Token[TokenIndex] = 0;
  		// Что получили в аккумуляторе?
 -		if (!_tcscmp(Token, _T("d")))
 +		if (!mir_tstrcmp(Token, _T("d")))
  		{
  			q = Duration / (60 * 60 * 24);
  			mir_sntprintf(Token, SIZEOF(Token), _T("%d"), q);
  			Duration -= q * 60 * 60 * 24;
  		}
  		else
 -		if (!_tcscmp(Token, _T("h")))
 +		if (!mir_tstrcmp(Token, _T("h")))
  		{
  			q = Duration / (60 * 60);
  			mir_sntprintf(Token, SIZEOF(Token), _T("%d"), q);
  			Duration -= q * 60 * 60;
  		}
  		else
 -		if (!_tcscmp(Token, _T("hh")))
 +		if (!mir_tstrcmp(Token, _T("hh")))
  		{
  			q = Duration / (60 * 60);
  			mir_sntprintf(Token, SIZEOF(Token), _T("%02d"), q);
  			Duration -= q * 60 * 60;
  		}
  		else
 -		if (!_tcscmp(Token, _T("m")))
 +		if (!mir_tstrcmp(Token, _T("m")))
  		{
  			q = Duration / 60;
  			mir_sntprintf(Token, SIZEOF(Token), _T("%d"), q);
  			Duration -= q * 60;
  		}
  		else
 -		if (!_tcscmp(Token, _T("mm")))
 +		if (!mir_tstrcmp(Token, _T("mm")))
  		{
  			q = Duration / 60;
  			mir_sntprintf(Token, SIZEOF(Token), _T("%02d"), q);
  			Duration -= q * 60;
  		}
  		else
 -		if (!_tcscmp(Token, _T("s")))
 +		if (!mir_tstrcmp(Token, _T("s")))
  		{
  			q = Duration;
  			mir_sntprintf(Token, SIZEOF(Token), _T("%d"), q);
  			Duration -= q;
  		}
  		else
 -		if (!_tcscmp(Token, _T("ss")))
 +		if (!mir_tstrcmp(Token, _T("ss")))
  		{
  			q = Duration;
  			mir_sntprintf(Token, SIZEOF(Token), _T("%02d"), q);
 diff --git a/plugins/TrafficCounter/src/vars.cpp b/plugins/TrafficCounter/src/vars.cpp index 1e0635c71f..769685f1fc 100644 --- a/plugins/TrafficCounter/src/vars.cpp +++ b/plugins/TrafficCounter/src/vars.cpp @@ -30,7 +30,7 @@ static TCHAR* GetTraffic(ARGUMENTSINFO *ai)  	if (ai->argc != 5) return NULL;
 -	if (!_tcscmp(ai->targv[1], _T("overall")))
 +	if (!mir_tstrcmp(ai->targv[1], _T("overall")))
  	{
  		tmpsn = OverallInfo.CurrentSentTraffic;
  		tmprn = OverallInfo.CurrentRecvTraffic;
 @@ -38,7 +38,7 @@ static TCHAR* GetTraffic(ARGUMENTSINFO *ai)  		tmprt = OverallInfo.TotalRecvTraffic;
  	}
  	else
 -	if (!_tcscmp(ai->targv[1], _T("summary")))
 +	if (!mir_tstrcmp(ai->targv[1], _T("summary")))
  	{
  		for (ed = 0; ed < NumberOfAccounts; ed++)
  			if (ProtoList[ed].Visible)
 @@ -55,7 +55,7 @@ static TCHAR* GetTraffic(ARGUMENTSINFO *ai)  		{
  			if (!ProtoList[ed].name) continue;
  			TCHAR *buf = mir_a2t(ProtoList[ed].name);
 -			if (!_tcscmp(buf, ai->targv[1]))
 +			if (!mir_tstrcmp(buf, ai->targv[1]))
  			{
  				tmpsn = ProtoList[ed].CurrentSentTraffic;
  				tmprn = ProtoList[ed].CurrentRecvTraffic;
 @@ -68,34 +68,34 @@ static TCHAR* GetTraffic(ARGUMENTSINFO *ai)  		if (tmp != 0xAA) return NULL;
  	}
 -	if (!_tcscmp(ai->targv[2], _T("now")))
 +	if (!mir_tstrcmp(ai->targv[2], _T("now")))
  	{
 -		if (!_tcscmp(ai->targv[3], _T("sent"))) tmp = tmpsn;
 +		if (!mir_tstrcmp(ai->targv[3], _T("sent"))) tmp = tmpsn;
  		else
 -		if (!_tcscmp(ai->targv[3], _T("received"))) tmp = tmprn;
 +		if (!mir_tstrcmp(ai->targv[3], _T("received"))) tmp = tmprn;
  		else
 -		if (!_tcscmp(ai->targv[3], _T("both"))) tmp = tmprn + tmpsn;
 +		if (!mir_tstrcmp(ai->targv[3], _T("both"))) tmp = tmprn + tmpsn;
  		else return NULL;
  	}
  	else
 -	if (!_tcscmp(ai->targv[2], _T("total")))
 +	if (!mir_tstrcmp(ai->targv[2], _T("total")))
  	{
 -		if (!_tcscmp(ai->targv[3], _T("sent"))) tmp = tmpst;
 +		if (!mir_tstrcmp(ai->targv[3], _T("sent"))) tmp = tmpst;
  		else
 -		if (!_tcscmp(ai->targv[3], _T("received"))) tmp = tmprt;
 +		if (!mir_tstrcmp(ai->targv[3], _T("received"))) tmp = tmprt;
  		else
 -		if (!_tcscmp(ai->targv[3], _T("both"))) tmp = tmprt + tmpst;
 +		if (!mir_tstrcmp(ai->targv[3], _T("both"))) tmp = tmprt + tmpst;
  		else return NULL;
  	}
  	else return NULL;
 -	if (!_tcscmp(ai->targv[4], _T("b"))) ed = 0;
 +	if (!mir_tstrcmp(ai->targv[4], _T("b"))) ed = 0;
  	else
 -	if (!_tcscmp(ai->targv[4], _T("k"))) ed = 1;
 +	if (!mir_tstrcmp(ai->targv[4], _T("k"))) ed = 1;
  	else
 -	if (!_tcscmp(ai->targv[4], _T("m"))) ed = 2;
 +	if (!mir_tstrcmp(ai->targv[4], _T("m"))) ed = 2;
  	else
 -	if (!_tcscmp(ai->targv[4], _T("d"))) ed = 3;
 +	if (!mir_tstrcmp(ai->targv[4], _T("d"))) ed = 3;
  	else return NULL;
  	// Получаем форматированную строку и возвращаем указатель на неё.
 @@ -123,24 +123,24 @@ static TCHAR* GetTime(ARGUMENTSINFO *ai)  		TCHAR *buf;
  		if (!ProtoList[ed].name) continue;
  		buf = mir_a2t(ProtoList[ed].name);
 -		if (!_tcscmp(buf, ai->targv[1]))
 +		if (!mir_tstrcmp(buf, ai->targv[1]))
  		{
  			flag = 0xAA;
 -			if (!_tcscmp(ai->targv[2], _T("now")))
 +			if (!mir_tstrcmp(ai->targv[2], _T("now")))
  				Duration = ProtoList[ed].Session.Timer;
 -			else if (!_tcscmp(ai->targv[2], _T("total")))
 +			else if (!mir_tstrcmp(ai->targv[2], _T("total")))
  				Duration = ProtoList[ed].Total.Timer;
  			else flag = 0;
  			break;
  		}
  		mir_free(buf);
  	}
 -	if ( (flag != 0xAA) && !_tcscmp(ai->targv[1], _T("summary")) )
 +	if ( (flag != 0xAA) && !mir_tstrcmp(ai->targv[1], _T("summary")) )
  	{
  		flag = 0xAA;
 -		if (!_tcscmp(ai->targv[2], _T("now")))
 +		if (!mir_tstrcmp(ai->targv[2], _T("now")))
  			Duration = OverallInfo.Session.Timer;
 -		else if (!_tcscmp(ai->targv[2], _T("total")))
 +		else if (!mir_tstrcmp(ai->targv[2], _T("total")))
  			Duration = OverallInfo.Total.Timer;
  		else flag = 0;
  	}
  | 
