mir_*printf patch for protocols

git-svn-id: http://svn.miranda-ng.org/main/trunk@5690 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 10 insertions, 10 deletions

diff --git a/protocols/IcqOscarJ/src/icq_proto.cpp b/protocols/IcqOscarJ/src/icq_proto.cpp
index aba1581956..d8fc2ebb3b 100644
--- a/protocols/IcqOscarJ/src/icq_proto.cpp
+++ b/protocols/IcqOscarJ/src/icq_proto.cpp
@@ -174,7 +174,7 @@ CIcqProto::CIcqProto( const char* aProtoName, const TCHAR* aUserName ) :
 	// Register netlib users

 	NETLIBUSER nlu = {0};

 	TCHAR szBuffer[MAX_PATH + 64];

-	null_snprintf(szBuffer, SIZEOF(szBuffer), TranslateT("%s server connection"), m_tszUserName);

+	mir_sntprintf(szBuffer, SIZEOF(szBuffer), TranslateT("%s server connection"), m_tszUserName);

 	nlu.cbSize = sizeof(nlu);

 	nlu.flags = NUF_OUTGOING | NUF_HTTPCONNS | NUF_TCHAR;

 	nlu.ptszDescriptiveName = szBuffer;

@@ -188,8 +188,8 @@ CIcqProto::CIcqProto( const char* aProtoName, const TCHAR* aUserName ) :
 	m_hServerNetlibUser = (HANDLE)CallService(MS_NETLIB_REGISTERUSER, 0, (LPARAM)&nlu);

 

 	char szP2PModuleName[MAX_PATH];

-	null_snprintf(szP2PModuleName, SIZEOF(szP2PModuleName), "%sP2P", m_szModuleName);

-	null_snprintf(szBuffer, SIZEOF(szBuffer), TranslateT("%s client-to-client connections"), m_tszUserName);

+	mir_snprintf(szP2PModuleName, SIZEOF(szP2PModuleName), "%sP2P", m_szModuleName);

+	mir_sntprintf(szBuffer, SIZEOF(szBuffer), TranslateT("%s client-to-client connections"), m_tszUserName);

 	nlu.flags = NUF_OUTGOING | NUF_INCOMING | NUF_TCHAR;

 	nlu.ptszDescriptiveName = szBuffer;

 	nlu.szSettingsModule = szP2PModuleName;

@@ -276,9 +276,9 @@ int CIcqProto::OnModulesLoaded( WPARAM wParam, LPARAM lParam )
 	char pszSrvGroupsName[MAX_PATH];

 	char* modules[5] = {0,0,0,0,0};

 

-	null_snprintf(pszP2PName, SIZEOF(pszP2PName), "%sP2P", m_szModuleName);

-	null_snprintf(pszGroupsName, SIZEOF(pszGroupsName), "%sGroups", m_szModuleName);

-	null_snprintf(pszSrvGroupsName, SIZEOF(pszSrvGroupsName), "%sSrvGroups", m_szModuleName);

+	mir_snprintf(pszP2PName, SIZEOF(pszP2PName), "%sP2P", m_szModuleName);

+	mir_snprintf(pszGroupsName, SIZEOF(pszGroupsName), "%sGroups", m_szModuleName);

+	mir_snprintf(pszSrvGroupsName, SIZEOF(pszSrvGroupsName), "%sSrvGroups", m_szModuleName);

 	modules[0] = m_szModuleName;

 	modules[1] = pszP2PName;

 	modules[2] = pszGroupsName;

@@ -1437,7 +1437,7 @@ HANDLE __cdecl CIcqProto::SendFile( HANDLE hContact, const TCHAR* szDescription,
 						}

 						else

 						{

-							null_snprintf(szFiles, SIZEOF(szFiles), ICQTranslateUtfStatic("%d Files", tmp, SIZEOF(tmp)), ft->dwFileCount);

+							mir_snprintf(szFiles, SIZEOF(szFiles), ICQTranslateUtfStatic("%d Files", tmp, SIZEOF(tmp)), ft->dwFileCount);

 							pszFiles = szFiles;

 						}

 

@@ -2261,11 +2261,11 @@ int __cdecl CIcqProto::OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM l
 		{

 			char szDbSetting[MAX_PATH];

 

-			null_snprintf(szDbSetting, sizeof(szDbSetting), "%sP2P", m_szModuleName);

+			mir_snprintf(szDbSetting, sizeof(szDbSetting), "%sP2P", m_szModuleName);

 			CallService(MS_DB_MODULE_DELETE, 0, (LPARAM)szDbSetting);

-			null_snprintf(szDbSetting, sizeof(szDbSetting), "%sSrvGroups", m_szModuleName);

+			mir_snprintf(szDbSetting, sizeof(szDbSetting), "%sSrvGroups", m_szModuleName);

 			CallService(MS_DB_MODULE_DELETE, 0, (LPARAM)szDbSetting);

-			null_snprintf(szDbSetting, sizeof(szDbSetting), "%sGroups", m_szModuleName);

+			mir_snprintf(szDbSetting, sizeof(szDbSetting), "%sGroups", m_szModuleName);

 			CallService(MS_DB_MODULE_DELETE, 0, (LPARAM)szDbSetting);

 			break;

 		}