From eefe0f0d556fbf3d77602d0a99b9134505050756 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 16 Jul 2014 13:43:06 +0000 Subject: in _tcsncpy_s / _tcsncat_s / strncpy_s / strncat_s the second parameter to be omitted if the size of first one is fixed (not to contaminate sources with the excessive code) git-svn-id: http://svn.miranda-ng.org/main/trunk@9829 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/FacebookRM/src/avatars.cpp | 2 +- protocols/Gadu-Gadu/src/core.cpp | 2 +- protocols/IcqOscarJ/src/icq_server.cpp | 4 +--- protocols/JabberG/src/jabber_iqid.cpp | 2 +- protocols/JabberG/src/jabber_svc.cpp | 4 ++-- protocols/JabberG/src/jabber_thread.cpp | 4 ++-- 6 files changed, 8 insertions(+), 10 deletions(-) (limited to 'protocols') diff --git a/protocols/FacebookRM/src/avatars.cpp b/protocols/FacebookRM/src/avatars.cpp index c0ac06fd22..ea247fac1f 100644 --- a/protocols/FacebookRM/src/avatars.cpp +++ b/protocols/FacebookRM/src/avatars.cpp @@ -40,7 +40,7 @@ bool FacebookProto::GetDbAvatarInfo(PROTO_AVATAR_INFORMATIONT &ai, std::string * std::tstring filename = GetAvatarFolder() + L'\\' + dbv.ptszVal + (TCHAR*)_A2T(ext.c_str()); db_free(&dbv); - _tcsncpy_s(ai.filename, SIZEOF(ai.filename), filename.c_str(), _TRUNCATE); + _tcsncpy_s(ai.filename, filename.c_str(), _TRUNCATE); ai.format = ProtoGetAvatarFormat(ai.filename); return true; } diff --git a/protocols/Gadu-Gadu/src/core.cpp b/protocols/Gadu-Gadu/src/core.cpp index 3e3e9fb723..0514783678 100644 --- a/protocols/Gadu-Gadu/src/core.cpp +++ b/protocols/Gadu-Gadu/src/core.cpp @@ -635,7 +635,7 @@ retry: TCHAR strFmt1[64]; TCHAR strFmt2[64]; - _tcsncpy_s(strFmt2, SIZEOF(strFmt2), pcli->pfnGetStatusModeDescription( status_gg2m(atoi(__status)), 0), _TRUNCATE); + _tcsncpy_s(strFmt2, pcli->pfnGetStatusModeDescription( status_gg2m(atoi(__status)), 0), _TRUNCATE); if (__city) { mir_sntprintf(strFmt1, SIZEOF(strFmt1), _T(", %s %s"), TranslateT("City:"), __city); _tcsncat(strFmt2, strFmt1, SIZEOF(strFmt2) - _tcslen(strFmt2)); diff --git a/protocols/IcqOscarJ/src/icq_server.cpp b/protocols/IcqOscarJ/src/icq_server.cpp index dccf6996cb..3f7e5166e1 100644 --- a/protocols/IcqOscarJ/src/icq_server.cpp +++ b/protocols/IcqOscarJ/src/icq_server.cpp @@ -295,8 +295,6 @@ void CIcqProto::sendServPacket(icq_packet *pPacket) connectionHandleMutex->Enter(); if (hServerConn) { - int nSendResult; - // This critsec makes sure that the sequence order doesn't get screwed up localSeqMutex->Enter(); @@ -309,7 +307,7 @@ void CIcqProto::sendServPacket(icq_packet *pPacket) pPacket->pData[2] = ((wLocalSequence & 0xff00) >> 8); pPacket->pData[3] = (wLocalSequence & 0x00ff); - nSendResult = Netlib_Send(hServerConn, (const char *)pPacket->pData, pPacket->wLen, 0); + int nSendResult = Netlib_Send(hServerConn, (const char *)pPacket->pData, pPacket->wLen, 0); localSeqMutex->Leave(); connectionHandleMutex->Leave(); diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp index 988ca2246e..a7ca0a42e8 100644 --- a/protocols/JabberG/src/jabber_iqid.cpp +++ b/protocols/JabberG/src/jabber_iqid.cpp @@ -1441,7 +1441,7 @@ LBL_ErrFormat: mir_sha1_finish(&sha, digest); GetAvatarFileName(hContact, tszFileName, SIZEOF(tszFileName)); - _tcsncpy_s(AI.filename, SIZEOF(AI.filename), tszFileName, _TRUNCATE); + _tcsncpy_s(AI.filename, tszFileName, _TRUNCATE); FILE *out = _tfopen(tszFileName, _T("wb")); if (out != NULL) { diff --git a/protocols/JabberG/src/jabber_svc.cpp b/protocols/JabberG/src/jabber_svc.cpp index 8eabdc5e08..8b89ebc57e 100644 --- a/protocols/JabberG/src/jabber_svc.cpp +++ b/protocols/JabberG/src/jabber_svc.cpp @@ -156,7 +156,7 @@ INT_PTR __cdecl CJabberProto::JabberGetAvatarInfo(WPARAM wParam, LPARAM lParam) mir_sntprintf(szJid, SIZEOF(szJid), _T("%s/%s"), tszJid, bestResName); if (szJid[0] == 0) - _tcsncpy_s(szJid, SIZEOF(szJid), tszJid, _TRUNCATE); + _tcsncpy_s(szJid, tszJid, _TRUNCATE); debugLog(_T("Rereading %s for %s"), isXVcard ? JABBER_FEAT_VCARD_TEMP : JABBER_FEAT_AVATAR, szJid); @@ -411,7 +411,7 @@ INT_PTR __cdecl CJabberProto::JabberServiceParseXmppURI(WPARAM, LPARAM lParam) // skip leading prefix TCHAR szUri[ 1024 ]; - _tcsncpy_s(szUri, SIZEOF(szUri), arg, _TRUNCATE); + _tcsncpy_s(szUri, arg, _TRUNCATE); TCHAR *szJid = _tcschr(szUri, _T(':')); if (szJid == NULL) return 1; diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp index d502cfee54..ba9373f5ec 100644 --- a/protocols/JabberG/src/jabber_thread.cpp +++ b/protocols/JabberG/src/jabber_thread.cpp @@ -261,7 +261,7 @@ LBL_Exit: replaceStr(m_szStreamId, NULL); if ((tszValue = getTStringA("LoginName")) != NULL) - _tcsncpy_s(info->username, SIZEOF(info->username), tszValue, _TRUNCATE); + _tcsncpy_s(info->username, tszValue, _TRUNCATE); if (*rtrimt(info->username) == '\0') { DWORD dwSize = SIZEOF(info->username); @@ -297,7 +297,7 @@ LBL_FatalError: } else { if ((tszValue = getTStringA("Resource")) != NULL) - _tcsncpy_s(info->resource, SIZEOF(info->resource), tszValue, _TRUNCATE); + _tcsncpy_s(info->resource, tszValue, _TRUNCATE); else _tcscpy(info->resource, _T("Miranda")); } -- cgit v1.2.3