* avahi-utils: replace python avahi-browse with a version written in C.

[catta] / avahi-core / entry.c

diff --git a/avahi-core/entry.c b/avahi-core/entry.c
index 5ef2a6747258d3e4707cfb14321bac73d097f8fb..fd0e233e0d8407e1533eda62cd4f51ec3a823544 100644 (file)
--- a/avahi-core/entry.c
+++ b/avahi-core/entry.c
@@ -45,6 +45,7 @@
 #include "log.h"
 #include "util.h"
 #include "dns-srv-rr.h"
+#include "rr-util.h"
 
 void avahi_entry_free(AvahiServer*s, AvahiEntry *e) {
     AvahiEntry *t;
@@ -224,7 +225,7 @@ static AvahiEntry * server_add_internal(
         /* Add a new record */
     
         if (check_record_conflict(s, interface, protocol, r, flags) < 0) {
-            avahi_server_set_errno(s, AVAHI_ERR_LOCAL_COLLISION);
+            avahi_server_set_errno(s, AVAHI_ERR_COLLISION);
             return NULL;
         }
 
@@ -440,7 +441,7 @@ int avahi_server_add_address(
     
     if (!(flags & AVAHI_PUBLISH_NO_REVERSE)) {
         char reverse_n[AVAHI_DOMAIN_NAME_MAX];
-        avahi_reverse_lookup_name(reverse_n, sizeof(reverse_n), a);
+        avahi_reverse_lookup_name(a, reverse_n, sizeof(reverse_n));
             
         if (!(reverse = server_add_ptr_internal(s, g, interface, protocol, flags | AVAHI_PUBLISH_UNIQUE, AVAHI_DEFAULT_TTL_HOST_NAME, reverse_n, name))) {
             ret = avahi_server_errno(s);
@@ -1016,7 +1017,7 @@ static void entry_group_commit_real(AvahiSEntryGroup *g) {
     }
 }
 
-static void entry_group_register_time_event_callback(AvahiTimeEvent *e, void* userdata) {
+static void entry_group_register_time_event_callback(AVAHI_GCC_UNUSED AvahiTimeEvent *e, void* userdata) {
     AvahiSEntryGroup *g = userdata;
     assert(g);