remove or unexport avahi_server_add_txt_strlst(), avahi_server_add_txt_va(), avahi_se...

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

diff --git a/avahi-core/entry.c b/avahi-core/entry.c
index be215ddf1c97482fb80630c349c480b604ef4b6c..f89d6137cd332f2de01d7168451ec7e020879c95 100644 (file)
--- a/avahi-core/entry.c
+++ b/avahi-core/entry.c
@@ -483,58 +483,6 @@ static int server_add_txt_strlst_nocopy(
     return ret;
 }
 
-int avahi_server_add_txt_strlst(
-    AvahiServer *s,
-    AvahiSEntryGroup *g,
-    AvahiIfIndex interface,
-    AvahiProtocol protocol,
-    AvahiPublishFlags flags,
-    uint32_t ttl,
-    const char *name,
-    AvahiStringList *strlst) {
-
-    assert(s);
-
-    return server_add_txt_strlst_nocopy(s, g, interface, protocol, flags, ttl, name, avahi_string_list_copy(strlst));
-}
-
-int avahi_server_add_txt_va(
-    AvahiServer *s,
-    AvahiSEntryGroup *g,
-    AvahiIfIndex interface,
-    AvahiProtocol protocol,
-    AvahiPublishFlags flags,
-    uint32_t ttl,
-    const char *name,
-    va_list va) {
-
-    assert(s);
-
-    return server_add_txt_strlst_nocopy(s, g, interface, protocol, flags, ttl, name, avahi_string_list_new_va(va));
-}
-
-int avahi_server_add_txt(
-    AvahiServer *s,
-    AvahiSEntryGroup *g,
-    AvahiIfIndex interface,
-    AvahiProtocol protocol,
-    AvahiPublishFlags flags,
-    uint32_t ttl,
-    const char *name,
-    ...) {
-
-    va_list va;
-    int ret;
-    
-    assert(s);
-
-    va_start(va, name);
-    ret = avahi_server_add_txt_va(s, g, interface, protocol, flags, ttl, name, va);
-    va_end(va);
-
-    return ret;
-}
-
 static AvahiStringList *add_magic_cookie(
     AvahiServer *s,
     AvahiStringList *strlst) {

diff --git a/avahi-core/publish.h b/avahi-core/publish.h
index 9d728740d803d9883864673b44d3c60bbded7da8..51c3be79189102c9ac864e971225df855007ffaa 100644 (file)
--- a/avahi-core/publish.h
+++ b/avahi-core/publish.h
@@ -96,16 +96,6 @@ int avahi_server_add(
     AvahiRecord *r            /**< The record to add. This function increases the reference counter of this object. */);
     
 
-/** Add a PTR RR to the server. See avahi_server_add() for more information. */
-int avahi_server_add_ptr(
-    AvahiServer *s,
-    AvahiSEntryGroup *g,
-    AvahiIfIndex interface,
-    AvahiProtocol protocol,
-    AvahiPublishFlags flags,
-    uint32_t ttl,             /**< DNS TTL for this record */
-    const char *name,       /**< PTR record name */
-    const char *dest        /**< pointer destination */  );
 
 /** Add a PTR RR to the server. See avahi_server_add() for more information. */
 int avahi_server_add_txt(

diff --git a/avahi-core/server.h b/avahi-core/server.h
index 10218368044a1d151e8e02486769ca7e4e046155..8b3b9dae2a9b3d57acdcfecb0a6eda5bc2a2e55f 100644 (file)
--- a/avahi-core/server.h
+++ b/avahi-core/server.h
@@ -180,6 +180,17 @@ void avahi_server_increase_host_rr_pending(AvahiServer *s);
 
 int avahi_server_set_errno(AvahiServer *s, int error);
 
+int avahi_server_add_ptr(
+    AvahiServer *s,
+    AvahiSEntryGroup *g,
+    AvahiIfIndex interface,
+    AvahiProtocol protocol,
+    AvahiPublishFlags flags,
+    uint32_t ttl,          
+    const char *name,      
+    const char *dest);
+
+
 #define AVAHI_CHECK_VALIDITY_RETURN_NULL(server, expression, error) { \
         if (!(expression)) { \
             avahi_server_set_errno((server), (error)); \