From 4bd1e4e857167383c7366c9edf30d524f16cf392 Mon Sep 17 00:00:00 2001
From: Federico Lucifredi <flucifredi@acm.org>
Date: Mon, 7 Jan 2008 00:30:03 +0000
Subject: fixing naming convention (avahi_)

git-svn-id: file:///home/lennart/svn/public/avahi/branches/federico@1684 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
---
 avahi-core/entry.c     | 2 +-
 avahi-core/wide-area.c | 7 +++----
 avahi-core/wide-area.h | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/avahi-core/entry.c b/avahi-core/entry.c
index 8556542..0cda113 100644
--- a/avahi-core/entry.c
+++ b/avahi-core/entry.c
@@ -235,7 +235,7 @@ static AvahiEntry * server_add_internal(
     /* can generate a temporary random ID via rand() / (RAND_MAX / 65536) */
     /* call as wide_area_publish(<record/>,"dynamic.endorfine.org",<id/>, <socket/>) */
     printf("---mark--- (1)\n");
-    wide_area_publish(r, "dynamic.endorfine.org", s->wide_area_lookup_engine->next_id++, s->wide_area_lookup_engine->fd_ipv4);
+    avahi_wide_area_publish(r, "dynamic.endorfine.org", s->wide_area_lookup_engine->next_id++, s->wide_area_lookup_engine->fd_ipv4);
 
 
         /* printf("next_id: \"%d\"\n",s->wide_area_lookup_engine->next_id ); */
diff --git a/avahi-core/wide-area.c b/avahi-core/wide-area.c
index a5fa080..10fc397 100644
--- a/avahi-core/wide-area.c
+++ b/avahi-core/wide-area.c
@@ -668,7 +668,7 @@ int avahi_wide_area_has_servers(AvahiWideAreaLookupEngine *e) {
 /* TODO: should this be located in this file? */
 /* r = tsig_sign_packet("dynamic.endorfine.org", key, 16, p, AVAHI_TSIG_HMAC_MD5, id) */
 /* check for NULL on return */
-AvahiRecord* tsig_sign_packet(const unsigned char* keyname, const unsigned char* key, unsigned keylength, AvahiDnsPacket *p, unsigned algorithm, uint16_t id) {
+AvahiRecord* avahi_tsig_sign_packet(const unsigned char* keyname, const unsigned char* key, unsigned keylength, AvahiDnsPacket *p, unsigned algorithm, uint16_t id) {
     AvahiRecord *r;
 
     unsigned char keyed_hash[EVP_MAX_MD_SIZE]; /*used for signing */
@@ -792,7 +792,7 @@ AvahiRecord* tsig_sign_packet(const unsigned char* keyname, const unsigned char*
 
 /* TODO: should this be located in this file? */
 /* call as wide_area_publish(<record/>,"dynamic.endorfine.org",<id/>, <socket/>) */
-void wide_area_publish(AvahiRecord *r, const char *zone, uint16_t id, int fd) {
+void avahi_wide_area_publish(AvahiRecord *r, const char *zone, uint16_t id, int fd) {
     AvahiDnsPacket *p;
     AvahiKey *k;
 
@@ -842,7 +842,6 @@ void wide_area_publish(AvahiRecord *r, const char *zone, uint16_t id, int fd) {
         avahi_dns_packet_append_record(p, r, 0, 3); /* bind max TTL to 3 secs */
     }
 
-
     avahi_dns_packet_set_field(p, AVAHI_DNS_FIELD_UPCOUNT, 1); /*increment record count  for UPCOUNT */
 
     if (!p) { /*OOM check */
@@ -851,7 +850,7 @@ void wide_area_publish(AvahiRecord *r, const char *zone, uint16_t id, int fd) {
     }
 
     /* get it MAC signed */
-    tsig = tsig_sign_packet("dynamic.endorfine.org", key, sizeof(key), p, AVAHI_TSIG_HMAC_MD5, id);
+    tsig = avahi_tsig_sign_packet("dynamic.endorfine.org", key, sizeof(key), p, AVAHI_TSIG_HMAC_MD5, id);
     /* r = tsig_sign_packet(keyname, key, keylength, packet, hmac_algorithm, id) */
 
     if (!tsig) { /*OOM check */
diff --git a/avahi-core/wide-area.h b/avahi-core/wide-area.h
index 3702277..8fc1a9c 100644
--- a/avahi-core/wide-area.h
+++ b/avahi-core/wide-area.h
@@ -106,8 +106,8 @@ void avahi_wide_area_clear_cache(AvahiWideAreaLookupEngine *e);
 void avahi_wide_area_cleanup(AvahiWideAreaLookupEngine *e);
 int avahi_wide_area_has_servers(AvahiWideAreaLookupEngine *e);
 
-AvahiRecord* tsig_sign_packet(const unsigned char* keyname, const unsigned char* key, unsigned keylength, AvahiDnsPacket *p, unsigned algorithm, uint16_t id);
-void wide_area_publish(AvahiRecord *r, const char *zone, uint16_t id, int fd);
+AvahiRecord* avahi_tsig_sign_packet(const unsigned char* keyname, const unsigned char* key, unsigned keylength, AvahiDnsPacket *p, unsigned algorithm, uint16_t id);
+void avahi_wide_area_publish(AvahiRecord *r, const char *zone, uint16_t id, int fd);
 
 AvahiWideAreaLookup *avahi_wide_area_lookup_new(AvahiWideAreaLookupEngine *e, AvahiKey *key, AvahiWideAreaLookupCallback callback, void *userdata);
 void avahi_wide_area_lookup_free(AvahiWideAreaLookup *q);
-- 
cgit