- short function names allows to write database loops in one string;

- 'continue' operator can be used then;
- multiple bugs fixed in clists;
- code becomes much more compact;

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

2 files changed, 4 insertions, 11 deletions

diff --git a/plugins/YahooGroups/src/services.cpp b/plugins/YahooGroups/src/services.cpp
index 5334e7f4a2..e5c1175db4 100644
--- a/plugins/YahooGroups/src/services.cpp
+++ b/plugins/YahooGroups/src/services.cpp
@@ -161,12 +161,8 @@ void CreateGroup(char *group)
 

 void ProcessContacts(void (*callback)(HANDLE, char *), char *protocol)

 {

-	HANDLE hContact = db_find_first();

-	while (hContact)

-	{

+	for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact))

 		callback(hContact, protocol);

-		hContact = db_find_next(hContact);

-	}

 }

 

 void YahooMoveCallback(HANDLE hContact, char *unused)

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)