s/avahi_server_add_text/avahi_server_add_txt/g

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@146 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/avahi-core/core.h b/avahi-core/core.h
index 164e71a5c304fc86488e8b5723670723d8d836da..02e1db9040ccc67ff41cff0104752976b534fc8e 100644 (file)
--- a/avahi-core/core.h
+++ b/avahi-core/core.h
@@ -205,16 +205,17 @@ gint avahi_server_add_ptr(
     const gchar *name,
     const gchar *dest);
 
-gint avahi_server_add_address(
+gint avahi_server_add_txt(
     AvahiServer *s,
     AvahiEntryGroup *g,
     AvahiIfIndex interface,
     AvahiProtocol protocol,
     AvahiEntryFlags flags,
+    guint32 ttl,
     const gchar *name,
-    AvahiAddress *a);
+    ... /* text records, terminated by NULL */);
 
-gint avahi_server_add_text(
+gint avahi_server_add_txt_va(
     AvahiServer *s,
     AvahiEntryGroup *g,
     AvahiIfIndex interface,
@@ -222,9 +223,9 @@ gint avahi_server_add_text(
     AvahiEntryFlags flags,
     guint32 ttl,
     const gchar *name,
-    ... /* text records, terminated by NULL */);
+    va_list va);
 
-gint avahi_server_add_text_va(
+gint avahi_server_add_txt_strlst(
     AvahiServer *s,
     AvahiEntryGroup *g,
     AvahiIfIndex interface,
@@ -232,17 +233,16 @@ gint avahi_server_add_text_va(
     AvahiEntryFlags flags,
     guint32 ttl,
     const gchar *name,
-    va_list va);
+    AvahiStringList *strlst);
 
-gint avahi_server_add_text_strlst(
+gint avahi_server_add_address(
     AvahiServer *s,
     AvahiEntryGroup *g,
     AvahiIfIndex interface,
     AvahiProtocol protocol,
     AvahiEntryFlags flags,
-    guint32 ttl,
     const gchar *name,
-    AvahiStringList *strlst);
+    AvahiAddress *a);
 
 gint avahi_server_add_service(
     AvahiServer *s,

diff --git a/avahi-core/server.c b/avahi-core/server.c
index 62f43581d4107cb81e444e0db494f597f068d7a3..719f9a91fa1432108338cb6a86a41f8548d63c3f 100644 (file)
--- a/avahi-core/server.c
+++ b/avahi-core/server.c
@@ -1619,7 +1619,7 @@ gint avahi_server_add_address(
     return ret;
 }
 
-gint avahi_server_add_text_strlst(
+gint avahi_server_add_txt_strlst(
     AvahiServer *s,
     AvahiEntryGroup *g,
     gint interface,
@@ -1642,7 +1642,7 @@ gint avahi_server_add_text_strlst(
     return ret;
 }
 
-gint avahi_server_add_text_va(
+gint avahi_server_add_txt_va(
     AvahiServer *s,
     AvahiEntryGroup *g,
     gint interface,
@@ -1654,10 +1654,10 @@ gint avahi_server_add_text_va(
     
     g_assert(s);
 
-    return avahi_server_add_text_strlst(s, g, interface, protocol, flags, ttl, name, avahi_string_list_new_va(va));
+    return avahi_server_add_txt_strlst(s, g, interface, protocol, flags, ttl, name, avahi_string_list_new_va(va));
 }
 
-gint avahi_server_add_text(
+gint avahi_server_add_txt(
     AvahiServer *s,
     AvahiEntryGroup *g,
     gint interface,
@@ -1673,7 +1673,7 @@ gint avahi_server_add_text(
     g_assert(s);
 
     va_start(va, name);
-    ret = avahi_server_add_text_va(s, g, interface, protocol, flags, ttl, name, va);
+    ret = avahi_server_add_txt_va(s, g, interface, protocol, flags, ttl, name, va);
     va_end(va);
 
     return ret;
@@ -1745,7 +1745,7 @@ gint avahi_server_add_service_strlst(
     ret |= avahi_server_add(s, g, interface, protocol, AVAHI_ENTRY_UNIQUE, r);
     avahi_record_unref(r);
 
-    ret |= avahi_server_add_text_strlst(s, g, interface, protocol, AVAHI_ENTRY_UNIQUE, AVAHI_DEFAULT_TTL, svc_name, strlst);
+    ret |= avahi_server_add_txt_strlst(s, g, interface, protocol, AVAHI_ENTRY_UNIQUE, AVAHI_DEFAULT_TTL, svc_name, strlst);
 
     snprintf(enum_ptr, sizeof(enum_ptr), "_services._dns-sd._udp.%s", domain);
     ret |=avahi_server_add_ptr(s, g, interface, protocol, AVAHI_ENTRY_NULL, AVAHI_DEFAULT_TTL, enum_ptr, ptr_name);