- 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, 2 insertions, 8 deletions

diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp
index 67c4333121..76f44eefe7 100644
--- a/plugins/TabSRMM/src/globals.cpp
+++ b/plugins/TabSRMM/src/globals.cpp
@@ -562,7 +562,6 @@ int CGlobals::MetaContactEvent(WPARAM wParam, LPARAM lParam)
 

 int CGlobals::PreshutdownSendRecv(WPARAM wParam, LPARAM lParam)

 {

-	HANDLE 	hContact;

 	int		i;

 

 #if defined(__USE_EX_HANDLERS)

@@ -579,11 +578,8 @@ int CGlobals::PreshutdownSendRecv(WPARAM wParam, LPARAM lParam)
 			::SendMessage(pFirstContainer->hwnd, WM_CLOSE, 0, 1);

 		}

 

-		hContact = db_find_first();

-		while (hContact) {

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

 			M->WriteDword(hContact, SRMSGMOD_T, "messagecount", 0);

-			hContact = db_find_next(hContact);

-		}

 

 		for (i=0; i < SERVICE_LAST; i++) {

 			if (PluginConfig.hSvc[i])

@@ -651,8 +647,7 @@ void CGlobals::RestoreUnreadMessageAlerts(void)
 	cle.pszService = "SRMsg/ReadMessage";

 	cle.flags = CLEF_TCHAR;

 

-	HANDLE hContact = db_find_first();

-	while (hContact) {

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

 		if (M->GetDword(hContact, "SendLater", "count", 0))

 		   sendLater->addContact(hContact);

 

@@ -675,7 +670,6 @@ void CGlobals::RestoreUnreadMessageAlerts(void)
 			}

 			hDbEvent = db_event_next(hDbEvent);

 		}

-		hContact = db_find_next(hContact);

 	}

 }