combine avahi-core and avahi-common components into one library

[catta] / examples / core-browse-services.c

diff --git a/examples/core-browse-services.c b/examples/core-browse-services.c
index 5de47b3ae2e4399ed4849b6295b9018a42d55611..563125b54ad326429722567d46d4f713f616a36a 100644 (file)
--- a/examples/core-browse-services.c
+++ b/examples/core-browse-services.c
@@ -1,29 +1,27 @@
-/* $Id$ */
-
 /* PLEASE NOTE *
  * This file demonstrates how to use Avahi's core API, this is
  * the embeddable mDNS stack for embedded applications.
  *
  * End user applications should *not* use this API and should use
- * the DBUS or C APIs, please see
+ * the D-Bus or C APIs, please see
  * client-browse-services.c and glib-integration.c
- * 
+ *
  * I repeat, you probably do *not* want to use this example.
  */
 
 /***
   This file is part of avahi.
- 
+
   avahi is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
- 
+
   avahi is distributed in the hope that it will be useful, but WITHOUT
   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
   or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
   Public License for more details.
- 
+
   You should have received a copy of the GNU Lesser General Public
   License along with avahi; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -39,19 +37,19 @@
 #include <stdlib.h>
 #include <time.h>
 
-#include <avahi-core/core.h>
-#include <avahi-core/lookup.h>
-#include <avahi-common/simple-watch.h>
-#include <avahi-common/malloc.h>
-#include <avahi-common/error.h>
+#include <avahi/core.h>
+#include <avahi/lookup.h>
+#include <avahi/simple-watch.h>
+#include <avahi/malloc.h>
+#include <avahi/error.h>
 
 static AvahiSimplePoll *simple_poll = NULL;
 static AvahiServer *server = NULL;
 
 static void resolve_callback(
     AvahiSServiceResolver *r,
-    AvahiIfIndex interface,
-    AvahiProtocol protocol,
+    AVAHI_GCC_UNUSED AvahiIfIndex interface,
+    AVAHI_GCC_UNUSED AvahiProtocol protocol,
     AvahiResolverEvent event,
     const char *name,
     const char *type,
@@ -61,8 +59,8 @@ static void resolve_callback(
     uint16_t port,
     AvahiStringList *txt,
     AvahiLookupResultFlags flags,
-    void* userdata) {
-    
+    AVAHI_GCC_UNUSED void* userdata) {
+
     assert(r);
 
     /* Called whenever a service has been resolved successfully or timed out */
@@ -73,10 +71,10 @@ static void resolve_callback(
             break;
 
         case AVAHI_RESOLVER_FOUND: {
-            char a[128], *t;
-            
+            char a[AVAHI_ADDRESS_STR_MAX], *t;
+
             fprintf(stderr, "(Resolver) Service '%s' of type '%s' in domain '%s':\n", name, type, domain);
-            
+
             avahi_address_snprint(a, sizeof(a), address);
             t = avahi_string_list_to_string(txt);
             fprintf(stderr,
@@ -90,14 +88,14 @@ static void resolve_callback(
                     host_name, port, a,
                     t,
                     avahi_string_list_get_service_cookie(txt),
-                    avahi_server_is_service_local(server, interface, protocol, name, type, domain),
+                    !!(flags & AVAHI_LOOKUP_RESULT_LOCAL),
                     !!(flags & AVAHI_LOOKUP_RESULT_WIDE_AREA),
                     !!(flags & AVAHI_LOOKUP_RESULT_MULTICAST),
                     !!(flags & AVAHI_LOOKUP_RESULT_CACHED));
             avahi_free(t);
         }
     }
-    
+
     avahi_s_service_resolver_free(r);
 }
 
@@ -109,9 +107,9 @@ static void browse_callback(
     const char *name,
     const char *type,
     const char *domain,
-    AvahiLookupResultFlags flags,
+    AVAHI_GCC_UNUSED AvahiLookupResultFlags flags,
     void* userdata) {
-    
+
     AvahiServer *s = userdata;
     assert(b);
 
@@ -120,7 +118,7 @@ static void browse_callback(
     switch (event) {
 
         case AVAHI_BROWSER_FAILURE:
-            
+
             fprintf(stderr, "(Browser) %s\n", avahi_strerror(avahi_server_errno(server)));
             avahi_simple_poll_quit(simple_poll);
             return;
@@ -132,10 +130,10 @@ static void browse_callback(
                function we free it. If the server is terminated before
                the callback function is called the server will free
                the resolver for us. */
-            
+
             if (!(avahi_s_service_resolver_new(s, interface, protocol, name, type, domain, AVAHI_PROTO_UNSPEC, 0, resolve_callback, s)))
                 fprintf(stderr, "Failed to resolve service '%s': %s\n", name, avahi_strerror(avahi_server_errno(s)));
-            
+
             break;
 
         case AVAHI_BROWSER_REMOVE:
@@ -149,7 +147,7 @@ static void browse_callback(
     }
 }
 
-int main(int argc, char*argv[]) {
+int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char*argv[]) {
     AvahiServerConfig config;
     AvahiSServiceBrowser *sb = NULL;
     int error;
@@ -175,7 +173,7 @@ int main(int argc, char*argv[]) {
     avahi_address_parse("192.168.50.1", AVAHI_PROTO_UNSPEC, &config.wide_area_servers[0]);
     config.n_wide_area_servers = 1;
     config.enable_wide_area = 1;
-    
+
     /* Allocate a new server */
     server = avahi_server_new(avahi_simple_poll_get(simple_poll), &config, NULL, NULL, &error);
 
@@ -187,26 +185,24 @@ int main(int argc, char*argv[]) {
         fprintf(stderr, "Failed to create server: %s\n", avahi_strerror(error));
         goto fail;
     }
-    
+
     /* Create the service browser */
-    if (!(sb = avahi_s_service_browser_new(server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, "_http._tcp", NULL, 0, browse_callback, server))) {
+    if (!(sb = avahi_s_service_browser_new(server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, "_ipp._tcp", NULL, 0, browse_callback, server))) {
         fprintf(stderr, "Failed to create service browser: %s\n", avahi_strerror(avahi_server_errno(server)));
         goto fail;
     }
-    
+
     /* Run the main loop */
-    for (;;)
-        if (avahi_simple_poll_iterate(simple_poll, -1) != 0)
-            break;
-    
+    avahi_simple_poll_loop(simple_poll);
+
     ret = 0;
-    
+
 fail:
-    
+
     /* Cleanup things */
     if (sb)
         avahi_s_service_browser_free(sb);
-    
+
     if (server)
         avahi_server_free(server);