summaryrefslogtreecommitdiff
path: root/plugins/YahooGroups/src/utils.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/YahooGroups/src/utils.cpp')
-rw-r--r--plugins/YahooGroups/src/utils.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/plugins/YahooGroups/src/utils.cpp b/plugins/YahooGroups/src/utils.cpp
index 652c19f716..fce73b4936 100644
--- a/plugins/YahooGroups/src/utils.cpp
+++ b/plugins/YahooGroups/src/utils.cpp
@@ -316,15 +316,13 @@ TCHAR *GetContactID(HANDLE hContact, char *szProto)
HANDLE GetContactFromID(TCHAR *szID, char *szProto)
{
- HANDLE hContact = db_find_first();
TCHAR *szHandle;
TCHAR dispName[1024];
char cProtocol[256];
TCHAR *tmp;
int found = 0;
- while (hContact)
- {
+ for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
GetContactProtocol(hContact, cProtocol, sizeof(cProtocol));
szHandle = GetContactID(hContact, cProtocol);
@@ -337,11 +335,10 @@ HANDLE GetContactFromID(TCHAR *szID, char *szProto)
}
if (szHandle) { free(szHandle); }
- if (found) { break; }
- hContact = db_find_next(hContact);
+ if (found) return hContact;
}
- return hContact;
+ return NULL;
}
#pragma warning (default: 4312)