From af548e38c2c282132ddac2a75a76218ff3be3175 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 20 Aug 2005 23:11:50 +0000
Subject: [PATCH] * Add avahi-client examples to doxygen * tighten avahi-core
 default #includes a bit

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@365 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
---
 avahi-client/client.h            | 8 ++++++++
 avahi-core/avahi-test.c          | 2 +-
 avahi-core/browse-dns-server.c   | 1 +
 avahi-core/browse-domain.c       | 1 +
 avahi-core/browse-service-type.c | 1 +
 avahi-core/browse-service.c      | 1 +
 avahi-core/browse.c              | 1 +
 avahi-core/core.h                | 6 ++----
 avahi-core/iface.c               | 1 +
 avahi-core/resolve-address.c     | 1 +
 avahi-core/resolve-host-name.c   | 1 +
 avahi-core/resolve-service.c     | 1 +
 avahi-core/server.c              | 1 +
 avahi-daemon/dbus-protocol.c     | 2 ++
 avahi-daemon/main.c              | 2 ++
 avahi-daemon/simple-protocol.c   | 1 +
 avahi-daemon/static-services.c   | 2 ++
 examples/core-browse-services.c  | 1 +
 examples/core-publish-service.c  | 2 ++
 19 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/avahi-client/client.h b/avahi-client/client.h
index 2753f1b..49883d7 100644
--- a/avahi-client/client.h
+++ b/avahi-client/client.h
@@ -33,6 +33,14 @@
 
 /** \file client.h Definitions and functions for the client API over D-Bus */
 
+/** \example client-publish-service.c Example how to register a DNS-SD
+ * service using the client interface to avahi-daemon. It behaves like a network
+ * printer registering both an IPP and a BSD LPR service. */
+
+/** \example client-browse-services.c Example how to browse for DNS-SD
+ * services using the client interface to avahi-daemon. */
+ 
+
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 AVAHI_C_DECL_BEGIN
 #endif
diff --git a/avahi-core/avahi-test.c b/avahi-core/avahi-test.c
index 4b6cd56..7f58676 100644
--- a/avahi-core/avahi-test.c
+++ b/avahi-core/avahi-test.c
@@ -32,10 +32,10 @@
 
 #include <avahi-common/malloc.h>
 #include <avahi-common/simple-watch.h>
+#include <avahi-common/alternative.h>
 #include <avahi-core/core.h>
 #include <avahi-core/log.h>
 
-
 static AvahiSEntryGroup *group = NULL;
 static AvahiServer *server = NULL;
 static char *service_name = NULL;
diff --git a/avahi-core/browse-dns-server.c b/avahi-core/browse-dns-server.c
index dd896de..9121150 100644
--- a/avahi-core/browse-dns-server.c
+++ b/avahi-core/browse-dns-server.c
@@ -27,6 +27,7 @@
 
 #include <avahi-common/domain.h>
 #include <avahi-common/malloc.h>
+#include <avahi-common/error.h>
 
 #include "browse.h"
 #include "log.h"
diff --git a/avahi-core/browse-domain.c b/avahi-core/browse-domain.c
index 73b260a..03219e4 100644
--- a/avahi-core/browse-domain.c
+++ b/avahi-core/browse-domain.c
@@ -25,6 +25,7 @@
 
 #include <avahi-common/domain.h>
 #include <avahi-common/malloc.h>
+#include <avahi-common/error.h>
 
 #include "browse.h"
 
diff --git a/avahi-core/browse-service-type.c b/avahi-core/browse-service-type.c
index 9467028..896e46b 100644
--- a/avahi-core/browse-service-type.c
+++ b/avahi-core/browse-service-type.c
@@ -27,6 +27,7 @@
 
 #include <avahi-common/domain.h>
 #include <avahi-common/malloc.h>
+#include <avahi-common/error.h>
 
 #include "browse.h"
 #include "log.h"
diff --git a/avahi-core/browse-service.c b/avahi-core/browse-service.c
index 9082f63..9419122 100644
--- a/avahi-core/browse-service.c
+++ b/avahi-core/browse-service.c
@@ -27,6 +27,7 @@
 
 #include <avahi-common/domain.h>
 #include <avahi-common/malloc.h>
+#include <avahi-common/error.h>
 
 #include "browse.h"
 #include "log.h"
diff --git a/avahi-core/browse.c b/avahi-core/browse.c
index 346783d..5b87326 100644
--- a/avahi-core/browse.c
+++ b/avahi-core/browse.c
@@ -25,6 +25,7 @@
 
 #include <avahi-common/timeval.h>
 #include <avahi-common/malloc.h>
+#include <avahi-common/error.h>
 
 #include "browse.h"
 #include "log.h"
diff --git a/avahi-core/core.h b/avahi-core/core.h
index 9931589..2f55d73 100644
--- a/avahi-core/core.h
+++ b/avahi-core/core.h
@@ -24,11 +24,11 @@
 
 /** \file core.h The Avahi Multicast DNS and DNS Service Discovery implmentation. */
 
-/** \example publish-service.c Example how to register a DNS-SD
+/** \example core-publish-service.c Example how to register a DNS-SD
  * service using an embedded mDNS stack. It behaves like a network
  * printer registering both an IPP and a BSD LPR service. */
 
-/** \example browse-services.c Example how to browse for DNS-SD
+/** \example core-browse-services.c Example how to browse for DNS-SD
  * services using an embedded mDNS stack. */
 
 #include <avahi-common/cdecl.h>
@@ -49,8 +49,6 @@ AVAHI_C_DECL_END
 
 #include <avahi-core/rr.h>
 #include <avahi-common/address.h>
-#include <avahi-common/alternative.h>
-#include <avahi-common/error.h>
 #include <avahi-common/defs.h>
 #include <avahi-common/watch.h>
 
diff --git a/avahi-core/iface.c b/avahi-core/iface.c
index b2c52f9..f5373e6 100644
--- a/avahi-core/iface.c
+++ b/avahi-core/iface.c
@@ -32,6 +32,7 @@
 #include <net/if.h>
 #include <stdio.h>
 
+#include <avahi-common/error.h>
 #include <avahi-common/malloc.h>
 
 #include "iface.h"
diff --git a/avahi-core/resolve-address.c b/avahi-core/resolve-address.c
index d46483e..07902e6 100644
--- a/avahi-core/resolve-address.c
+++ b/avahi-core/resolve-address.c
@@ -25,6 +25,7 @@
 
 #include <avahi-common/timeval.h>
 #include <avahi-common/malloc.h>
+#include <avahi-common/error.h>
 
 #include "browse.h"
 
diff --git a/avahi-core/resolve-host-name.c b/avahi-core/resolve-host-name.c
index f25c4b1..82b0ab4 100644
--- a/avahi-core/resolve-host-name.c
+++ b/avahi-core/resolve-host-name.c
@@ -26,6 +26,7 @@
 #include <avahi-common/domain.h>
 #include <avahi-common/timeval.h>
 #include <avahi-common/malloc.h>
+#include <avahi-common/error.h>
 
 #include "browse.h"
 #include "log.h"
diff --git a/avahi-core/resolve-service.c b/avahi-core/resolve-service.c
index 4a19942..0321b4c 100644
--- a/avahi-core/resolve-service.c
+++ b/avahi-core/resolve-service.c
@@ -29,6 +29,7 @@
 #include <avahi-common/domain.h>
 #include <avahi-common/timeval.h>
 #include <avahi-common/malloc.h>
+#include <avahi-common/error.h>
 
 #include "browse.h"
 
diff --git a/avahi-core/server.c b/avahi-core/server.c
index 396dcf4..6ba8ea0 100644
--- a/avahi-core/server.c
+++ b/avahi-core/server.c
@@ -35,6 +35,7 @@
 #include <avahi-common/domain.h>
 #include <avahi-common/timeval.h>
 #include <avahi-common/malloc.h>
+#include <avahi-common/error.h>
 
 #include "server.h"
 #include "iface.h"
diff --git a/avahi-daemon/dbus-protocol.c b/avahi-daemon/dbus-protocol.c
index b28b09f..022187b 100644
--- a/avahi-daemon/dbus-protocol.c
+++ b/avahi-daemon/dbus-protocol.c
@@ -41,6 +41,8 @@
 #include <avahi-common/malloc.h>
 #include <avahi-common/dbus.h>
 #include <avahi-common/dbus-watch-glue.h>
+#include <avahi-common/alternative.h>
+#include <avahi-common/error.h>
 #include <avahi-core/log.h>
 #include <avahi-core/core.h>
 
diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c
index 2565f02..76b03d0 100644
--- a/avahi-daemon/main.c
+++ b/avahi-daemon/main.c
@@ -47,6 +47,8 @@
 
 #include <avahi-common/malloc.h>
 #include <avahi-common/simple-watch.h>
+#include <avahi-common/error.h>
+#include <avahi-common/alternative.h>
 #include <avahi-core/core.h>
 #include <avahi-core/log.h>
 
diff --git a/avahi-daemon/simple-protocol.c b/avahi-daemon/simple-protocol.c
index c72fb86..f4eebd7 100644
--- a/avahi-daemon/simple-protocol.c
+++ b/avahi-daemon/simple-protocol.c
@@ -34,6 +34,7 @@
 
 #include <avahi-common/llist.h>
 #include <avahi-common/malloc.h>
+#include <avahi-common/error.h>
 #include <avahi-core/log.h>
 
 #include "simple-protocol.h"
diff --git a/avahi-daemon/static-services.c b/avahi-daemon/static-services.c
index c0fbea5..f6aa193 100644
--- a/avahi-daemon/static-services.c
+++ b/avahi-daemon/static-services.c
@@ -35,6 +35,8 @@
 
 #include <avahi-common/llist.h>
 #include <avahi-common/malloc.h>
+#include <avahi-common/alternative.h>
+#include <avahi-common/error.h>
 #include <avahi-core/log.h>
 
 #include "main.h"
diff --git a/examples/core-browse-services.c b/examples/core-browse-services.c
index 7227bd7..e723339 100644
--- a/examples/core-browse-services.c
+++ b/examples/core-browse-services.c
@@ -31,6 +31,7 @@
 #include <avahi-core/core.h>
 #include <avahi-common/simple-watch.h>
 #include <avahi-common/malloc.h>
+#include <avahi-common/error.h>
 
 static AvahiSimplePoll *simple_poll = NULL;
 
diff --git a/examples/core-publish-service.c b/examples/core-publish-service.c
index dace548..3021094 100644
--- a/examples/core-publish-service.c
+++ b/examples/core-publish-service.c
@@ -31,6 +31,8 @@
 #include <avahi-core/core.h>
 #include <avahi-common/simple-watch.h>
 #include <avahi-common/malloc.h>
+#include <avahi-common/alternative.h>
+#include <avahi-common/error.h>
 
 static AvahiSEntryGroup *group = NULL;
 static AvahiSimplePoll *simple_poll = NULL;
-- 
2.39.5