warning fixes

3 files changed, 2 insertions, 5 deletions

diff --git a/protocols/Tox/src/tox_accounts.cpp b/protocols/Tox/src/tox_accounts.cpp
index c89f28fb82..b4c7f62c4d 100644
--- a/protocols/Tox/src/tox_accounts.cpp
+++ b/protocols/Tox/src/tox_accounts.cpp
@@ -8,7 +8,7 @@ int CToxProto::OnAccountRenamed(WPARAM wParam, LPARAM lParam)
 

 		ptrW newPath(GetToxProfilePath());

 		wchar_t oldPath[MAX_PATH];

-		mir_snwprintf(oldPath, MAX_PATH, L"%s\\%s.tox", VARSW(L"%miranda_userdata%").get(), m_accountName);

+		mir_snwprintf(oldPath, MAX_PATH, L"%s\\%s.tox", VARSW(L"%miranda_userdata%").get(), m_accountName.get());

 		_wrename(oldPath, newPath);

 		m_accountName = mir_wstrdup(m_tszUserName);

 	}

diff --git a/protocols/Tox/src/tox_address.h b/protocols/Tox/src/tox_address.h
index 9ef57caba2..402dc59434 100644
--- a/protocols/Tox/src/tox_address.h
+++ b/protocols/Tox/src/tox_address.h
@@ -19,8 +19,7 @@ private:
 	{

 		hexSize = size * 2;

 		hexData = (char*)mir_calloc(hexSize + 1);

-		char *p = bin2hex(bin, size, hexData);

-		while (*p++ = toupper(*p));

+		strupr(bin2hex(bin, size, hexData));

 	}

 public:

 	ToxHexAddress(const char *hex, size_t size = TOX_ADDRESS_SIZE * 2) { Init(hex, size); }

diff --git a/protocols/Tox/src/tox_search.cpp b/protocols/Tox/src/tox_search.cpp
index ebbddf2ad8..83e4b883cb 100644
--- a/protocols/Tox/src/tox_search.cpp
+++ b/protocols/Tox/src/tox_search.cpp
@@ -91,8 +91,6 @@ HWND CToxProto::OnSearchAdvanced(HWND owner)
 

 	const std::string query = T2Utf(text).str();

 	if (std::regex_search(query, match, regex)) {

-		std::string address = match[1];

-

 		PROTOSEARCHRESULT psr = { sizeof(psr) };

 		psr.flags = PSR_UTF8;

 		psr.id.a = mir_strdup(query.c_str());