From 41f4062e34d1e13c2d93d971334efbad060b6df0 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 24 Jun 2005 19:42:49 +0000 Subject: 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 --- avahi-core/core.h | 18 +++++++++--------- avahi-core/server.c | 12 ++++++------ 2 files changed, 15 insertions(+), 15 deletions(-) (limited to 'avahi-core') diff --git a/avahi-core/core.h b/avahi-core/core.h index 164e71a..02e1db9 100644 --- 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 62f4358..719f9a9 100644 --- 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); -- cgit