diff options
author | Lennart Poettering <lennart@poettering.net> | 2005-08-13 22:04:21 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2005-08-13 22:04:21 +0000 |
commit | 8b5cd6ffd9137b14b7ed678f10a551e3911e4a40 (patch) | |
tree | 58574af05d4632561961d3df07cc0a3052211be8 /avahi-core/iface.c | |
parent | 7f5fd7ab759d8881e04f9edf31decdb000498fd1 (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/iface.c')
-rw-r--r-- | avahi-core/iface.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/avahi-core/iface.c b/avahi-core/iface.c index 8671044..81b8375 100644 --- a/avahi-core/iface.c +++ b/avahi-core/iface.c @@ -54,32 +54,32 @@ static void update_address_rr(AvahiInterfaceMonitor *m, AvahiInterfaceAddress *a /* Fill the entry group */ if (!a->entry_group) - a->entry_group = avahi_entry_group_new(m->server, avahi_host_rr_entry_group_callback, NULL); + a->entry_group = avahi_s_entry_group_new(m->server, avahi_host_rr_entry_group_callback, NULL); if (!a->entry_group) /* OOM */ return; - if (avahi_entry_group_is_empty(a->entry_group)) { + if (avahi_s_entry_group_is_empty(a->entry_group)) { if (avahi_server_add_address(m->server, a->entry_group, a->interface->hardware->index, a->interface->protocol, 0, NULL, &a->address) < 0) { avahi_log_warn(__FILE__": avahi_server_add_address() failed: %s", avahi_strerror(m->server->error)); - avahi_entry_group_free(a->entry_group); + avahi_s_entry_group_free(a->entry_group); a->entry_group = NULL; return; } - avahi_entry_group_commit(a->entry_group); + avahi_s_entry_group_commit(a->entry_group); } } else { /* Clear the entry group */ - if (a->entry_group && !avahi_entry_group_is_empty(a->entry_group)) { + if (a->entry_group && !avahi_s_entry_group_is_empty(a->entry_group)) { - if (avahi_entry_group_get_state(a->entry_group) == AVAHI_ENTRY_GROUP_REGISTERING) + if (avahi_s_entry_group_get_state(a->entry_group) == AVAHI_ENTRY_GROUP_REGISTERING) avahi_server_decrease_host_rr_pending(m->server); - avahi_entry_group_reset(a->entry_group); + avahi_s_entry_group_reset(a->entry_group); } } } @@ -109,12 +109,12 @@ static void update_hw_interface_rr(AvahiInterfaceMonitor *m, AvahiHwInterface *h m->server->state == AVAHI_SERVER_REGISTERING)) { if (!hw->entry_group) - hw->entry_group = avahi_entry_group_new(m->server, avahi_host_rr_entry_group_callback, NULL); + hw->entry_group = avahi_s_entry_group_new(m->server, avahi_host_rr_entry_group_callback, NULL); if (!hw->entry_group) return; /* OOM */ - if (avahi_entry_group_is_empty(hw->entry_group)) { + if (avahi_s_entry_group_is_empty(hw->entry_group)) { char *name; char *t; @@ -129,22 +129,22 @@ static void update_hw_interface_rr(AvahiInterfaceMonitor *m, AvahiHwInterface *h if (avahi_server_add_service(m->server, hw->entry_group, hw->index, AVAHI_PROTO_UNSPEC, name, "_workstation._tcp", NULL, NULL, 9, NULL) < 0) { avahi_log_warn(__FILE__": avahi_server_add_service() failed."); - avahi_entry_group_free(hw->entry_group); + avahi_s_entry_group_free(hw->entry_group); hw->entry_group = NULL; } else - avahi_entry_group_commit(hw->entry_group); + avahi_s_entry_group_commit(hw->entry_group); avahi_free(name); } } else { - if (hw->entry_group && !avahi_entry_group_is_empty(hw->entry_group)) { + if (hw->entry_group && !avahi_s_entry_group_is_empty(hw->entry_group)) { - if (avahi_entry_group_get_state(hw->entry_group) == AVAHI_ENTRY_GROUP_REGISTERING) + if (avahi_s_entry_group_get_state(hw->entry_group) == AVAHI_ENTRY_GROUP_REGISTERING) avahi_server_decrease_host_rr_pending(m->server); - avahi_entry_group_reset(hw->entry_group); + avahi_s_entry_group_reset(hw->entry_group); } } } @@ -158,7 +158,7 @@ static void free_address(AvahiInterfaceMonitor *m, AvahiInterfaceAddress *a) { AVAHI_LLIST_REMOVE(AvahiInterfaceAddress, address, a->interface->addresses, a); if (a->entry_group) - avahi_entry_group_free(a->entry_group); + avahi_s_entry_group_free(a->entry_group); avahi_free(a); } @@ -198,7 +198,7 @@ static void free_hw_interface(AvahiInterfaceMonitor *m, AvahiHwInterface *hw, in free_interface(m, hw->interfaces, send_goodbye); if (hw->entry_group) - avahi_entry_group_free(hw->entry_group); + avahi_s_entry_group_free(hw->entry_group); AVAHI_LLIST_REMOVE(AvahiHwInterface, hardware, m->hw_interfaces, hw); avahi_hashmap_remove(m->hashmap, &hw->index); |