X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fresolver.c;h=a9d1341274a4ba9b5b051c066a8b6da1f4eafcc8;hb=57156cc5738cfbf60e1b0ddf444ad6eec5964a0d;hp=3ce74c32a99bd9f05b004969b39beda3c694a3b9;hpb=1f86c8a20907ad7c955150c793b853a6b03075be;p=framework%2Fconnectivity%2Fconnman.git

diff --git a/src/resolver.c b/src/resolver.c
index 3ce74c3..a9d1341 100644
--- a/src/resolver.c
+++ b/src/resolver.c
@@ -450,23 +450,20 @@ int connman_resolver_remove(const char *interface, const char *domain,
 
 	DBG("interface %s domain %s server %s", interface, domain, server);
 
-	if (server == NULL)
-		return -EINVAL;
-
 	for (list = entry_list; list; list = list->next) {
 		struct entry_data *entry = list->data;
 
-		if (interface != NULL &&
-				g_strcmp0(entry->interface, interface) != 0)
+		if (g_strcmp0(entry->interface, interface) != 0)
 			continue;
 
-		if (domain != NULL && g_strcmp0(entry->domain, domain) != 0)
+		if (g_strcmp0(entry->domain, domain) != 0)
 			continue;
 
 		if (g_strcmp0(entry->server, server) != 0)
 			continue;
 
 		matches = g_slist_append(matches, entry);
+		break;
 	}
 
 	if (matches == NULL)