* fix a bug in avahi-discover-standalone found by some guy calling himself "j"

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@373 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/avahi-core/resolve-service.c b/avahi-core/resolve-service.c
index 0321b4ced55c8836aea95b749a3252a2b2ab8b8e..141df9e11364a1b2221b2125a59dac5f86d496f5 100644 (file)
--- a/avahi-core/resolve-service.c
+++ b/avahi-core/resolve-service.c
@@ -122,7 +122,6 @@ static void finish(AvahiSServiceResolver *r, AvahiResolverEvent event) {
             st[i-1] = 0;
 
         r->callback(r, r->interface, r->protocol, event, sn, st, r->domain_name, r->srv_record->data.srv.name, &a, r->srv_record->data.srv.port, r->txt_record->data.txt.string_list, r->userdata);
-
     }
 }
 

diff --git a/avahi-discover-standalone/main.c b/avahi-discover-standalone/main.c
index 6cd4cc457d7f38b1c70b1d4abbbe3ce57a226f23..1075088a771ef773efb4b26ffe0b6ecf3e5b811b 100644 (file)
--- a/avahi-discover-standalone/main.c
+++ b/avahi-discover-standalone/main.c
@@ -238,6 +238,7 @@ static void service_resolver_callback(AvahiSServiceResolver *r, AvahiIfIndex int
         g_assert(r == service_resolver);
         avahi_s_service_resolver_free(service_resolver);
         service_resolver = NULL;
+        return;
     }
 
     if (event == AVAHI_RESOLVER_TIMEOUT)