X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-client%2Fentrygroup.c;h=cd845343c2ccd4cce4ede7b2ef0adafe4d5c386b;hb=2a2ee0be70b99239f2cf99ea5b663eda965599f8;hp=0b7d2176874efbc19facda0e89224441161f6a0a;hpb=3adbda2cd5be48b7c630325f0f92e315d7eb2cfb;p=catta

diff --git a/avahi-client/entrygroup.c b/avahi-client/entrygroup.c
index 0b7d217..cd84534 100644
--- a/avahi-client/entrygroup.c
+++ b/avahi-client/entrygroup.c
@@ -336,7 +336,6 @@ static int append_string_list(DBusMessage *message, AvahiStringList *txt) {
     AvahiStringList *p;
 
     assert(message);
-    assert(txt);
 
     dbus_message_iter_init_append(message, &iter);
 
@@ -477,37 +476,16 @@ 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,31 +589,14 @@ 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;
 }