in order to reduce our API size, dropping avahi_entry_group_add_service_va(), avahi_entry_group_update_service_txt_va(), avahi_server_add_service_va(, avahi_server_update_service_txt_va()

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

2 files changed, 4 insertions, 66 deletions

diff --git a/avahi-client/entrygroup.c b/avahi-client/entrygroup.c
index 9d58afb..cd84534 100644
--- a/avahi-client/entrygroup.c
+++ b/avahi-client/entrygroup.c
@@ -477,36 +477,15 @@ int avahi_entry_group_add_service(
     
     va_list va;
     int r;
-
-    assert(group);
-
-    va_start(va, port);
-    r = avahi_entry_group_add_service_va(group, interface, protocol, flags, name, type, domain, host, port, va);
-    va_end(va);
-    return r;
-}
-
-int avahi_entry_group_add_service_va(
-    AvahiEntryGroup *group,
-    AvahiIfIndex interface,
-    AvahiProtocol protocol,
-    AvahiPublishFlags flags,
-    const char *name,
-    const char *type,
-    const char *domain,
-    const char *host,
-    uint16_t port,
-    va_list va) {
-
-    int r;
     AvahiStringList *txt;
 
     assert(group);
 
+    va_start(va, port);
     txt = avahi_string_list_new_va(va);
     r = avahi_entry_group_add_service_strlst(group, interface, protocol, flags, name, type, domain, host, port, txt);
     avahi_string_list_free(txt);
-
+    va_end(va);
     return r;
 }
 
@@ -611,30 +590,13 @@ int avahi_entry_group_update_service_txt(
 
     va_list va;
     int r;
-
-    va_start(va, domain);
-    r = avahi_entry_group_update_service_txt_va(group, interface, protocol, flags, name, type, domain, va);
-    va_end(va);
-    return r;
-}
-
-int avahi_entry_group_update_service_txt_va(
-    AvahiEntryGroup *group,
-    AvahiIfIndex interface,
-    AvahiProtocol protocol,
-    AvahiPublishFlags flags,
-    const char *name,     
-    const char *type,     
-    const char *domain,   
-    va_list va) {
-
-    int r;
     AvahiStringList *txt;
 
+    va_start(va, domain);
     txt = avahi_string_list_new_va(va);
     r = avahi_entry_group_update_service_txt_strlst(group, interface, protocol, flags, name, type, domain, txt);
     avahi_string_list_free(txt);
-
+    va_end(va);
     return r;
 }
 
diff --git a/avahi-client/publish.h b/avahi-client/publish.h
index cdce887..88c4498 100644
--- a/avahi-client/publish.h
+++ b/avahi-client/publish.h
@@ -96,19 +96,6 @@ int avahi_entry_group_add_service_strlst(
     uint16_t port,
     AvahiStringList *txt);
 
-/** Add a service, takes a NULL terminated va_list for text records */
-int avahi_entry_group_add_service_va(
-    AvahiEntryGroup *group,
-    AvahiIfIndex interface,
-    AvahiProtocol protocol,
-    AvahiPublishFlags flags,
-    const char *name,
-    const char *type,
-    const char *domain,
-    const char *host,
-    uint16_t port,
-    va_list va);
-
 /** Add a subtype for a service */
 int avahi_entry_group_add_service_subtype(
     AvahiEntryGroup *group,
@@ -142,17 +129,6 @@ int avahi_entry_group_update_service_txt_strlst(
     const char *domain,   
     AvahiStringList *strlst);
 
-/** Update a TXT record for an existing service */
-int avahi_entry_group_update_service_txt_va(
-    AvahiEntryGroup *g,
-    AvahiIfIndex interface,
-    AvahiProtocol protocol,
-    AvahiPublishFlags flags,
-    const char *name,     
-    const char *type,     
-    const char *domain,   
-    va_list va);
-
 /** Add a host/address pair */
 int avahi_entry_group_add_address(
     AvahiEntryGroup *group,