diff options
author | George Hazan <george.hazan@gmail.com> | 2015-08-17 19:38:42 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2015-08-17 19:38:42 +0000 |
commit | d0ceb5768ff3146499a0318ffe03c867c0845592 (patch) | |
tree | 984da5102d6a820e670323c47edd8187a37a0b33 /protocols/JabberG/src/jabber_file.cpp | |
parent | 98ac258dc34b281e8441de847e37408c36c7415d (diff) |
- numerous name conflicts resolved;
- funny code that loads resource #102 from miranda32.exe removed;
- massive mir_sntprintf code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@14979 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber_file.cpp')
-rw-r--r-- | protocols/JabberG/src/jabber_file.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/protocols/JabberG/src/jabber_file.cpp b/protocols/JabberG/src/jabber_file.cpp index a6e46d77e7..6a00da7d80 100644 --- a/protocols/JabberG/src/jabber_file.cpp +++ b/protocols/JabberG/src/jabber_file.cpp @@ -178,7 +178,7 @@ void JabberFileServerConnection(JABBER_SOCKET hConnection, DWORD /*dwRemoteIP*/, CallService(MS_NETLIB_GETCONNECTIONINFO, (WPARAM)hConnection, (LPARAM)&connInfo);
TCHAR szPort[10];
- mir_sntprintf(szPort, _countof(szPort), _T("%d"), connInfo.wPort);
+ mir_sntprintf(szPort, _T("%d"), connInfo.wPort);
ppro->debugLogA("File server incoming connection accepted: %s", connInfo.szIpPort);
JABBER_LIST_ITEM *item = ppro->ListGetItemPtr(LIST_FILE, szPort);
@@ -258,7 +258,7 @@ void __cdecl CJabberProto::FileServerThread(filetransfer *ft) ft->hFileEvent = hEvent;
TCHAR szPort[20];
- mir_sntprintf(szPort, _countof(szPort), _T("%d"), nlb.wPort);
+ mir_sntprintf(szPort, _T("%d"), nlb.wPort);
JABBER_LIST_ITEM *item = ListAdd(LIST_FILE, szPort);
item->ft = ft;
@@ -440,7 +440,7 @@ int CJabberProto::FileSendParse(JABBER_SOCKET s, filetransfer *ft, char* buffer, /////////////////////////////////////////////////////////////////////////////////////////
// filetransfer class members
-filetransfer::filetransfer(CJabberProto* proto)
+filetransfer::filetransfer(CJabberProto *proto)
{
memset(this, 0, sizeof(filetransfer));
ppro = proto;
@@ -499,7 +499,7 @@ int filetransfer::create() return fileId;
TCHAR filefull[MAX_PATH];
- mir_sntprintf(filefull, _countof(filefull), _T("%s\\%s"), std.tszWorkingDir, std.tszCurrentFile);
+ mir_sntprintf(filefull, _T("%s\\%s"), std.tszWorkingDir, std.tszCurrentFile);
replaceStrT(std.tszCurrentFile, filefull);
if (hWaitEvent != INVALID_HANDLE_VALUE)
|