rework service database, pacth from uws (closes #117)

[catta] / avahi-common / address.h

diff --git a/avahi-common/address.h b/avahi-common/address.h
index 53f8d065576457f43f18f343acda3efe33ee2e7a..b8706ee92b177323f9021056d87b4cf8f10eeebd 100644 (file)
--- a/avahi-common/address.h
+++ b/avahi-common/address.h
@@ -53,7 +53,7 @@ enum {
 #define AVAHI_ADDRESS_STR_MAX 40 /* IPv6 Max = 4*8 + 7 + 1 for NUL */
 
 /** Return TRUE if the specified interface index is valid */
-#define AVAHI_IF_VALID(ifindex) (((ifindex) >= 0) || ((ifindex) == AVAHI_PROTO_UNSPEC))
+#define AVAHI_IF_VALID(ifindex) (((ifindex) >= 0) || ((ifindex) == AVAHI_IF_UNSPEC))
 
 /** Return TRUE if the specified protocol is valid */
 #define AVAHI_PROTO_VALID(protocol) (((protocol) == AVAHI_PROTO_INET) || ((protocol) == AVAHI_PROTO_INET6) || ((protocol) == AVAHI_PROTO_UNSPEC))
@@ -73,9 +73,9 @@ typedef struct AvahiAddress {
     AvahiProtocol proto; /**< Address family */
 
     union {
-        AvahiIPv6Address ipv6;  /** Address when IPv6 */
-        AvahiIPv4Address ipv4;  /** Address when IPv4 */
-        uint8_t data[1];        /** Type independant data field */
+        AvahiIPv6Address ipv6;  /**< Address when IPv6 */
+        AvahiIPv4Address ipv4;  /**< Address when IPv4 */
+        uint8_t data[1];        /**< Type independant data field */
     } data;
 } AvahiAddress;
 
@@ -91,7 +91,7 @@ char *avahi_address_snprint(char *ret_s, size_t length, const AvahiAddress *a);
 AvahiAddress *avahi_address_parse(const char *s, AvahiProtocol af, AvahiAddress *ret_addr);
 
 /** Generate the DNS reverse lookup name for an IPv4 or IPv6 address. */
-char* avahi_reverse_lookup_name(char *ret_s, size_t length, const AvahiAddress *a);
+char* avahi_reverse_lookup_name(const AvahiAddress *a, char *ret_s, size_t length);
 
 /** Map AVAHI_PROTO_xxx constants to Unix AF_xxx constants */
 int avahi_proto_to_af(AvahiProtocol proto);