Merge branch 'master' of ssh://rootserver/home/lennart/git/public/avahi

[catta] / avahi-client / srv-test.c

diff --git a/avahi-client/srv-test.c b/avahi-client/srv-test.c
index 4e0959eaa284cf5a133869524b09a125f118612f..5242947135b639962a24d67da7dacc25c2e9095a 100644 (file)
--- a/avahi-client/srv-test.c
+++ b/avahi-client/srv-test.c
@@ -33,24 +33,24 @@
 #include <avahi-common/malloc.h>
 
 static void callback(
-    AvahiServiceResolver *r,
-    AvahiIfIndex interface,
-    AvahiProtocol protocol,
+    AVAHI_GCC_UNUSED AvahiServiceResolver *r,
+    AVAHI_GCC_UNUSED AvahiIfIndex interface,
+    AVAHI_GCC_UNUSED AvahiProtocol protocol,
     AvahiResolverEvent event,
     const char *name,
     const char *type,
     const char *domain,
     const char *host_name,
-    const AvahiAddress *a,
-    uint16_t port,
-    AvahiStringList *txt,
-    AvahiLookupResultFlags flags,
-    void *userdata) {
+    AVAHI_GCC_UNUSED const AvahiAddress *a,
+    AVAHI_GCC_UNUSED uint16_t port,
+    AVAHI_GCC_UNUSED AvahiStringList *txt,
+    AVAHI_GCC_UNUSED AvahiLookupResultFlags flags,
+    AVAHI_GCC_UNUSED void *userdata) {
 
     fprintf(stderr, "%i name=%s type=%s domain=%s host=%s\n", event, name, type, domain, host_name);
 }
 
-int main(int argc, char *argv[]) {
+int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) {
 
     AvahiSimplePoll *simple_poll;
     const AvahiPoll *poll_api;
@@ -63,15 +63,13 @@ int main(int argc, char *argv[]) {
     poll_api = avahi_simple_poll_get(simple_poll);
     assert(poll_api);
     
-    client = avahi_client_new(poll_api, NULL, NULL, NULL);
+    client = avahi_client_new(poll_api, 0, NULL, NULL, NULL);
     assert(client);
 
     r = avahi_service_resolver_new(client, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, NULL, "_domain._udp", "0pointer.de", AVAHI_PROTO_UNSPEC, AVAHI_LOOKUP_NO_TXT, callback, simple_poll);
     assert(r);
 
-    for (;;)
-        if (avahi_simple_poll_iterate(simple_poll, -1) != 0)
-            break;
+    avahi_simple_poll_loop(simple_poll);
 
     avahi_client_free(client);
     avahi_simple_poll_free(simple_poll);