diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-02-10 08:04:30 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-02-10 08:04:30 +0000 |
| commit | ddba4ede6b451d0cfcd0d32b5180fbd0689966bf (patch) | |
| tree | 5d74f37a7013d13b92c182628d6b68a58e148ae4 /protocols/IcqOscarJ/src/fam_02location.cpp | |
| parent | c39340bf493a1745a41317bbf937fc7eb6cbb26a (diff) | |
- HANDLE hContact => HCONTACT
- GCF_* prefix was added to chat constants to avoid name conflicts
git-svn-id: http://svn.miranda-ng.org/main/trunk@8078 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/IcqOscarJ/src/fam_02location.cpp')
| -rw-r--r-- | protocols/IcqOscarJ/src/fam_02location.cpp | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/protocols/IcqOscarJ/src/fam_02location.cpp b/protocols/IcqOscarJ/src/fam_02location.cpp index e360b9dc8b..d5d6ec590a 100644 --- a/protocols/IcqOscarJ/src/fam_02location.cpp +++ b/protocols/IcqOscarJ/src/fam_02location.cpp @@ -47,7 +47,7 @@ void CIcqProto::handleLocationFam(BYTE *pBuffer, WORD wBufferLength, snac_header case ICQ_ERROR:
{
WORD wError;
- HANDLE hCookieContact;
+ HCONTACT hCookieContact;
cookie_fam15_data *pCookieData;
@@ -101,12 +101,10 @@ static char* AimApplyEncoding(char* pszStr, const char* pszEncoding) void CIcqProto::handleLocationUserInfoReply(BYTE* buf, WORD wLen, DWORD dwCookie)
{
- HANDLE hContact;
DWORD dwUIN;
uid_str szUID;
WORD wTLVCount;
WORD wWarningLevel;
- HANDLE hCookieContact;
WORD status;
cookie_message_data *pCookieData;
@@ -126,33 +124,30 @@ void CIcqProto::handleLocationUserInfoReply(BYTE* buf, WORD wLen, DWORD dwCookie wLen -= 2;
// Determine contact
- hContact = HContactFromUID(dwUIN, szUID, NULL);
+ HCONTACT hContact = HContactFromUID(dwUIN, szUID, NULL);
// Ignore away status if the user is not already on our list
- if (hContact == INVALID_HANDLE_VALUE)
- {
+ if (hContact == INVALID_HANDLE_VALUE) {
#ifdef _DEBUG
debugLogA("Ignoring away reply (%s)", strUID(dwUIN, szUID));
#endif
return;
}
- if (!FindCookie(dwCookie, &hCookieContact, (void**)&pCookieData))
- {
+ HCONTACT hCookieContact;
+ if (!FindCookie(dwCookie, &hCookieContact, (void**)&pCookieData)) {
debugLogA("Error: Received unexpected away reply from %s", strUID(dwUIN, szUID));
return;
}
- if (hContact != hCookieContact)
- {
+ if (hContact != hCookieContact) {
debugLogA("Error: Away reply Contact does not match Cookie Contact(0x%x != 0x%x)", hContact, hCookieContact);
ReleaseCookie(dwCookie); // This could be a bad idea, but I think it is safe
return;
}
- switch (GetCookieType(dwCookie))
- {
+ switch (GetCookieType(dwCookie)) {
case CKT_FAMILYSPECIAL:
{
ReleaseCookie(dwCookie);
|