diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-08-30 13:35:51 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-08-30 13:35:51 +0000 |
| commit | a554fe6d0fe287b5c857ebdcfcc020cf0c3e3ea4 (patch) | |
| tree | 1a2d9af19564b04354566536ecfd1e8bc7e758ad /protocols | |
| parent | 1d562f91e8bfc5fadc75b0088a80eb97989ac76f (diff) | |
fix for pending scope problems
git-svn-id: http://svn.miranda-ng.org/main/trunk@15117 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/IcqOscarJ/src/icq_proto.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/protocols/IcqOscarJ/src/icq_proto.cpp b/protocols/IcqOscarJ/src/icq_proto.cpp index 6f79e313c8..4f76ff5851 100644 --- a/protocols/IcqOscarJ/src/icq_proto.cpp +++ b/protocols/IcqOscarJ/src/icq_proto.cpp @@ -471,12 +471,12 @@ HANDLE __cdecl CIcqProto::FileAllow(MCONTACT hContact, HANDLE hTransfer, const T return 0; // Invalid contact
if (icqOnline() && hContact && szPath && hTransfer) { // approve old fashioned file transfer
- basic_filetransfer *ft = (basic_filetransfer *)hTransfer;
+ basic_filetransfer *bft = (basic_filetransfer *)hTransfer;
- if (!IsValidFileTransfer(ft))
+ if (!IsValidFileTransfer(bft))
return 0; // Invalid transfer
- if (dwUin && ft->ft_magic == FT_MAGIC_ICQ) {
+ if (dwUin && bft->ft_magic == FT_MAGIC_ICQ) {
filetransfer *ft = (filetransfer *)hTransfer;
ft->szSavePath = tchar_to_utf8(szPath);
{
@@ -492,7 +492,7 @@ HANDLE __cdecl CIcqProto::FileAllow(MCONTACT hContact, HANDLE hTransfer, const T return hTransfer; // Success
}
- else if (ft->ft_magic == FT_MAGIC_OSCAR) { // approve oscar file transfer
+ else if (bft->ft_magic == FT_MAGIC_OSCAR) { // approve oscar file transfer
return oftFileAllow(hContact, hTransfer, szPath);
}
}
@@ -536,7 +536,7 @@ int __cdecl CIcqProto::FileCancel(MCONTACT hContact, HANDLE hTransfer) int __cdecl CIcqProto::FileDeny(MCONTACT hContact, HANDLE hTransfer, const TCHAR* szReason)
{
int nReturnValue = 1;
- basic_filetransfer *ft = (basic_filetransfer*)hTransfer;
+ basic_filetransfer *bft = (basic_filetransfer*)hTransfer;
DWORD dwUin;
uid_str szUid;
@@ -547,7 +547,7 @@ int __cdecl CIcqProto::FileDeny(MCONTACT hContact, HANDLE hTransfer, const TCHAR if (!IsValidFileTransfer(hTransfer))
return 1; // Invalid transfer
- if (dwUin && ft->ft_magic == FT_MAGIC_ICQ) { // deny old fashioned file transfer
+ if (dwUin && bft->ft_magic == FT_MAGIC_ICQ) { // deny old fashioned file transfer
filetransfer *ft = (filetransfer*)hTransfer;
char *szReasonUtf = tchar_to_utf8(szReason);
// Was request received thru DC and have we a open DC, send through that
@@ -559,12 +559,12 @@ int __cdecl CIcqProto::FileDeny(MCONTACT hContact, HANDLE hTransfer, const TCHAR nReturnValue = 0; // Success
}
- else if (ft->ft_magic == FT_MAGIC_OSCAR) { // deny oscar file transfer
+ else if (bft->ft_magic == FT_MAGIC_OSCAR) { // deny oscar file transfer
return oftFileDeny(hContact, hTransfer, szReason);
}
}
// Release possible orphan structure
- SafeReleaseFileTransfer((void**)&ft);
+ SafeReleaseFileTransfer((void**)&bft);
return nReturnValue;
}
|