From e7700c34a3583d5b5c2f85c880e194bb960c16ae Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 17 Oct 2005 19:52:05 +0000 Subject: [PATCH] remove or unexport avahi_server_add_txt_strlst(), avahi_server_add_txt_va(), avahi_server_add_txt(), avahi_server_add_ptr() git-svn-id: file:///home/lennart/svn/public/avahi/trunk@797 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-core/entry.c | 52 -------------------------------------------- avahi-core/publish.h | 10 --------- avahi-core/server.h | 11 ++++++++++ 3 files changed, 11 insertions(+), 62 deletions(-) diff --git a/avahi-core/entry.c b/avahi-core/entry.c index be215dd..f89d613 100644 --- 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 9d72874..51c3be7 100644 --- 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 1021836..8b3b9da 100644 --- 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)); \ -- 2.39.5