* many trivial fix to make avahi compile on OpenBSD

[catta] / avahi-daemon / main.c

diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c
index cf87e2371e2e8b7db8b8c790b2a9111a0f83accc..6f0624d3ae96389ce30c5dcefa308331a9cbf429 100644 (file)
--- a/avahi-daemon/main.c
+++ b/avahi-daemon/main.c
@@ -117,7 +117,7 @@ static int has_prefix(const char *s, const char *prefix) {
     return strlen(s) >= l && strncmp(s, prefix, l) == 0;
 }
 
-static int load_resolv_conf(const DaemonConfig *c) {
+static int load_resolv_conf(void) {
     int ret = -1;
     FILE *f;
     int i = 0;
@@ -230,7 +230,7 @@ static void server_callback(AvahiServer *s, AvahiServerState state, void *userda
     avahi_server = s;
     
 #ifdef HAVE_DBUS
-    if (c->enable_dbus)
+    if (c->enable_dbus && state != AVAHI_SERVER_INVALID && state != AVAHI_SERVER_FAILURE)
         dbus_protocol_server_state_changed(state);
 #endif
 
@@ -556,11 +556,11 @@ static void log_function(AvahiLogLevel level, const char *txt) {
     daemon_log(log_level_map[level], "%s", txt);
 }
 
-static void dump(const char *text, void* userdata) {
+static void dump(const char *text, AVAHI_GCC_UNUSED void* userdata) {
     avahi_log_info("%s", text);
 }
 
-static void signal_callback(AvahiWatch *watch, int fd, AvahiWatchEvent event, void *userdata) {
+static void signal_callback(AvahiWatch *watch, AVAHI_GCC_UNUSED int fd, AVAHI_GCC_UNUSED AvahiWatchEvent event, AVAHI_GCC_UNUSED void *userdata) {
     int sig;
     const AvahiPoll *poll_api;
     
@@ -594,7 +594,7 @@ static void signal_callback(AvahiWatch *watch, int fd, AvahiWatchEvent event, vo
             if (resolv_conf_entry_group)
                 avahi_s_entry_group_reset(resolv_conf_entry_group);
 
-            load_resolv_conf(&config);
+            load_resolv_conf();
 
             update_wide_area_servers();
             
@@ -617,8 +617,8 @@ static void signal_callback(AvahiWatch *watch, int fd, AvahiWatchEvent event, vo
 static int run_server(DaemonConfig *c) {
     int r = -1;
     int error;
-    const AvahiPoll *poll_api;
-    AvahiWatch *sig_watch;
+    const AvahiPoll *poll_api = NULL;
+    AvahiWatch *sig_watch = NULL;
 
     assert(c);
 
@@ -657,7 +657,7 @@ static int run_server(DaemonConfig *c) {
 #endif
     }
     
-    load_resolv_conf(c);
+    load_resolv_conf();
     static_service_load();
 
     if (!(avahi_server = avahi_server_new(poll_api, &c->server_config, server_callback, c, &error))) {