From bcb27264ba737778e5d3edad36088bacf74f0236 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 9 Apr 2013 20:03:46 +0000
Subject: - 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
---
 protocols/Yahoo/src/services.cpp |  6 +-----
 protocols/Yahoo/src/yahoo.cpp    | 26 +++++++-------------------
 2 files changed, 8 insertions(+), 24 deletions(-)

(limited to 'protocols/Yahoo/src')

diff --git a/protocols/Yahoo/src/services.cpp b/protocols/Yahoo/src/services.cpp
index c375f29330..b7db4b3c8d 100644
--- a/protocols/Yahoo/src/services.cpp
+++ b/protocols/Yahoo/src/services.cpp
@@ -31,9 +31,7 @@
 void CYahooProto::logoff_buddies()
 {
 	//set all contacts to 'offline'
-	HANDLE hContact = db_find_first();
-	while ( hContact != NULL) 
-	{
+	for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
 		if (IsMyContact(hContact)) {
 			SetWord( hContact, "Status", ID_STATUS_OFFLINE );
 			SetDword(hContact, "IdleTS", 0);
@@ -44,8 +42,6 @@ void CYahooProto::logoff_buddies()
 			db_unset(hContact, m_szModuleName, "YGMsg");
 			//db_unset(hContact, m_szModuleName, "MirVer");
 		}
-
-		hContact = db_find_next(hContact);
 	}	
 }
 
diff --git a/protocols/Yahoo/src/yahoo.cpp b/protocols/Yahoo/src/yahoo.cpp
index f7cce7d094..0f16a241e3 100644
--- a/protocols/Yahoo/src/yahoo.cpp
+++ b/protocols/Yahoo/src/yahoo.cpp
@@ -284,24 +284,16 @@ void CYahooProto::AddBuddy(HANDLE hContact, const char *group, const TCHAR *msg)
 
 HANDLE CYahooProto::getbuddyH(const char *yahoo_id)
 {
-	HANDLE hContact;
-
-	for ( hContact = db_find_first();
-		hContact != NULL;
-		hContact = db_find_next(hContact))
-	{
-		if (IsMyContact(hContact))
-		{
+	for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
+		if (IsMyContact(hContact)) {
 			DBVARIANT dbv;
 			if (GetString(hContact, YAHOO_LOGINID, &dbv))
 				continue;
 
-			{	
-				int tCompareResult = lstrcmpiA( dbv.pszVal, yahoo_id );
-				db_free( &dbv );
-				if ( tCompareResult )
-					continue;
-			}
+			int tCompareResult = lstrcmpiA( dbv.pszVal, yahoo_id );
+			db_free( &dbv );
+			if ( tCompareResult )
+				continue;
 
 			return hContact;
 		}	
@@ -606,17 +598,13 @@ void CYahooProto::ext_got_stealth(char *stealthlist)
 	char **s;
 	int found = 0;
 	char **stealth = NULL;
-	HANDLE hContact;
 
 	LOG(("[ext_got_stealth] list: %s", stealthlist));
 	
 	if (stealthlist)
 		stealth = y_strsplit(stealthlist, ",", -1);
 
-	for ( hContact = db_find_first();
-		   hContact != NULL;
-			hContact = db_find_next(hContact))
-	{
+	for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
 		if (IsMyContact(hContact)) {
 			DBVARIANT dbv;
 			if (GetString( hContact, YAHOO_LOGINID, &dbv))
-- 
cgit v1.2.3