From: Patrik Flykt <patrik.flykt@linux.intel.com>
Date: Thu, 24 May 2012 13:24:57 +0000 (+0300)
Subject: resolver: Simplify code to return if a resolver entry exists
X-Git-Tag: 2.0_alpha~146
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1f86c8a20907ad7c955150c793b853a6b03075be;p=framework%2Fconnectivity%2Fconnman.git

resolver: Simplify code to return if a resolver entry exists
---

diff --git a/src/resolver.c b/src/resolver.c
index 4780ac1..3ce74c3 100644
--- a/src/resolver.c
+++ b/src/resolver.c
@@ -362,7 +362,7 @@ static int append_resolver(const char *interface, const char *domain,
 int connman_resolver_append(const char *interface, const char *domain,
 						const char *server)
 {
-	GSList *list, *matches = NULL;
+	GSList *list;
 
 	DBG("interface %s domain %s server %s", interface, domain, server);
 
@@ -372,18 +372,15 @@ int connman_resolver_append(const char *interface, const char *domain,
 	for (list = entry_list; list; list = list->next) {
 		struct entry_data *entry = list->data;
 
-		if (entry->timeout > 0 ||
-				g_strcmp0(entry->interface, interface) != 0 ||
-				g_strcmp0(entry->domain, domain) != 0 ||
-				g_strcmp0(entry->server, server) != 0)
+		if (entry->timeout > 0)
 			continue;
 
-		matches = g_slist_append(matches, entry);
+		if (g_strcmp0(entry->interface, interface) == 0 &&
+				g_strcmp0(entry->domain, domain) == 0 &&
+				g_strcmp0(entry->server, server) == 0)
+			return -EEXIST;
 	}
 
-	if (matches != NULL)
-		remove_entries(matches);
-
 	return append_resolver(interface, domain, server, 0, 0);
 }