summaryrefslogtreecommitdiffstats
path: root/avahi-core/announce.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2005-08-13 22:04:21 +0000
committerLennart Poettering <lennart@poettering.net>2005-08-13 22:04:21 +0000
commit8b5cd6ffd9137b14b7ed678f10a551e3911e4a40 (patch)
tree58574af05d4632561961d3df07cc0a3052211be8 /avahi-core/announce.c
parent7f5fd7ab759d8881e04f9edf31decdb000498fd1 (diff)
Rename some server side objects/symbols so that they do not conflict with the same things on the client side. i.e. AvahiEntryGroup -> AvahiSEntryGroup
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@310 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-core/announce.c')
-rw-r--r--avahi-core/announce.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/avahi-core/announce.c b/avahi-core/announce.c
index b6ded71..c6edd83 100644
--- a/avahi-core/announce.c
+++ b/avahi-core/announce.c
@@ -67,7 +67,7 @@ static void set_timeout(AvahiAnnouncement *a, const struct timeval *tv) {
static void next_state(AvahiAnnouncement *a);
-void avahi_entry_group_check_probed(AvahiEntryGroup *g, int immediately) {
+void avahi_s_entry_group_check_probed(AvahiSEntryGroup *g, int immediately) {
AvahiEntry *e;
assert(g);
assert(!g->dead);
@@ -77,7 +77,7 @@ void avahi_entry_group_check_probed(AvahiEntryGroup *g, int immediately) {
if (g->state != AVAHI_ENTRY_GROUP_REGISTERING || g->n_probing > 0)
return;
- avahi_entry_group_change_state(g, AVAHI_ENTRY_GROUP_ESTABLISHED);
+ avahi_s_entry_group_change_state(g, AVAHI_ENTRY_GROUP_ESTABLISHED);
if (g->dead)
return;
@@ -116,7 +116,7 @@ static void next_state(AvahiAnnouncement *a) {
assert(a->entry->group);
- avahi_entry_group_check_probed(a->entry->group, 1);
+ avahi_s_entry_group_check_probed(a->entry->group, 1);
} else if (a->state == AVAHI_PROBING) {
@@ -311,7 +311,7 @@ void avahi_announce_entry(AvahiServer *s, AvahiEntry *e) {
avahi_interface_monitor_walk(s->monitor, e->interface, e->protocol, announce_walk_callback, e);
}
-void avahi_announce_group(AvahiServer *s, AvahiEntryGroup *g) {
+void avahi_announce_group(AvahiServer *s, AvahiSEntryGroup *g) {
AvahiEntry *e;
assert(s);