- 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

1 files changed, 5 insertions, 11 deletions

diff --git a/plugins/NewsAggregator/Src/Services.cpp b/plugins/NewsAggregator/Src/Services.cpp
index 238e7f1145..da1c899b86 100644
--- a/plugins/NewsAggregator/Src/Services.cpp
+++ b/plugins/NewsAggregator/Src/Services.cpp
@@ -32,13 +32,10 @@ void SetContactStatus(HANDLE hContact, int nNewStatus)
 static void __cdecl WorkingThread(void* param)

 {

 	int nStatus = (int)param;

-	HANDLE hContact= db_find_first();

-	while (hContact != NULL) {

+

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

 		if(IsMyContact(hContact))

 			SetContactStatus(hContact, nStatus);

-

-		hContact = db_find_next(hContact);

-	}

 }

 

 int OnFoldersChanged(WPARAM, LPARAM)

@@ -55,15 +52,14 @@ int NewsAggrInit(WPARAM wParam, LPARAM lParam)
 	else

 		lstrcpyn(tszRoot, VARST( _T("%miranda_userdata%\\Avatars\\"_T(DEFAULT_AVATARS_FOLDER))), SIZEOF(tszRoot));

 

-	HANDLE hContact = db_find_first();

-	while (hContact != NULL) {

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

 		if(IsMyContact(hContact)) {

 			if (!db_get_b(NULL, MODULE, "StartupRetrieve", 1))

 				db_set_dw(hContact, MODULE, "LastCheck", time(NULL));

 			SetContactStatus(hContact, ID_STATUS_ONLINE);

 		}

-		hContact = db_find_next(hContact);

 	}

+

 	NetlibInit();

 	InitIcons();

 	InitMenu();

@@ -158,13 +154,11 @@ INT_PTR NewsAggrGetInfo(WPARAM wParam,LPARAM lParam)
 

 INT_PTR CheckAllFeeds(WPARAM wParam,LPARAM lParam)

 {

-	HANDLE hContact = db_find_first();

-	while (hContact != NULL) {

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

 		if (IsMyContact(hContact) && lParam && db_get_dw(hContact, MODULE, "UpdateTime", DEFAULT_UPDATE_TIME))

 			UpdateListAdd(hContact);

 		else if (IsMyContact(hContact) && !lParam)

 			UpdateListAdd(hContact);

-		hContact = db_find_next(hContact);

 	}

 	if (!ThreadRunning)

 		mir_forkthread(UpdateThreadProc, (LPVOID)FALSE);