diff src/dbus-useful.c @ 14035:8bda65b88e49

[gaim-migrate @ 16638] A bunch of small changes. Mostly remove "if not null" checks before calling g_free, g_list_free, g_slist_free and g_strdup. Also use g_list_foreach() to call g_free to free strings in an array. And some whitespace changes here and there. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sat, 05 Aug 2006 08:27:39 +0000
parents c9312177821a
children
line wrap: on
line diff
--- a/src/dbus-useful.c	Sat Aug 05 05:42:28 2006 +0000
+++ b/src/dbus-useful.c	Sat Aug 05 08:27:39 2006 +0000
@@ -7,47 +7,47 @@
 
 
 GaimAccount *
-gaim_accounts_find_ext(const char *name, const char *protocol_id, 
+gaim_accounts_find_ext(const char *name, const char *protocol_id,
 		       gboolean (*account_test)(const GaimAccount *account))
 {
-    GaimAccount *result = NULL;
-    GList *l;
-    char *who;
-    
-    if (name)
-	who = g_strdup(gaim_normalize(NULL, name));
-    else 
-	who = NULL;
-    
-    for (l = gaim_accounts_get_all(); l != NULL; l = l->next) {
-	GaimAccount *account = (GaimAccount *)l->data;
-	
-	if (who && strcmp(gaim_normalize(NULL, gaim_account_get_username(account)), who))
-	    continue;
+	GaimAccount *result = NULL;
+	GList *l;
+	char *who;
+
+	if (name)
+		who = g_strdup(gaim_normalize(NULL, name));
+	else
+		who = NULL;
+
+	for (l = gaim_accounts_get_all(); l != NULL; l = l->next) {
+		GaimAccount *account = (GaimAccount *)l->data;
 
-	if (protocol_id && strcmp(account->protocol_id, protocol_id))
-	    continue;
+		if (who && strcmp(gaim_normalize(NULL, gaim_account_get_username(account)), who))
+			continue;
 
-	if (account_test && !account_test(account)) 
-	    continue;
+		if (protocol_id && strcmp(account->protocol_id, protocol_id))
+			continue;
 
-	result = account;
-	break;
-    }
+		if (account_test && !account_test(account))
+			continue;
 
-    g_free(who);
+		result = account;
+		break;
+	}
 
-    return result;
+	g_free(who);
+
+	return result;
 }
 
-GaimAccount *gaim_accounts_find_any(const char *name, const char *protocol) 
+GaimAccount *gaim_accounts_find_any(const char *name, const char *protocol)
 {
-    return gaim_accounts_find_ext(name, protocol, NULL);
+	return gaim_accounts_find_ext(name, protocol, NULL);
 }
 
-GaimAccount *gaim_accounts_find_connected(const char *name, const char *protocol) 
+GaimAccount *gaim_accounts_find_connected(const char *name, const char *protocol)
 {
-    return gaim_accounts_find_ext(name, protocol, gaim_account_is_connected);
+	return gaim_accounts_find_ext(name, protocol, gaim_account_is_connected);
 }