From 8b5cd6ffd9137b14b7ed678f10a551e3911e4a40 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 13 Aug 2005 22:04:21 +0000 Subject: 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 --- examples/publish-service.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'examples/publish-service.c') diff --git a/examples/publish-service.c b/examples/publish-service.c index 4a78402..6132622 100644 --- a/examples/publish-service.c +++ b/examples/publish-service.c @@ -32,13 +32,13 @@ #include #include -static AvahiEntryGroup *group = NULL; +static AvahiSEntryGroup *group = NULL; static AvahiSimplePoll *simple_poll = NULL; static char *name = NULL; static void create_services(AvahiServer *s); -static void entry_group_callback(AvahiServer *s, AvahiEntryGroup *g, AvahiEntryGroupState state, void *userdata) { +static void entry_group_callback(AvahiServer *s, AvahiSEntryGroup *g, AvahiEntryGroupState state, void *userdata) { assert(s); assert(g == group); @@ -70,7 +70,7 @@ static void create_services(AvahiServer *s) { /* If this is the first time we're called, let's create a new entry group */ if (!group) { - if (!(group = avahi_entry_group_new(s, entry_group_callback, NULL))) { + if (!(group = avahi_s_entry_group_new(s, entry_group_callback, NULL))) { fprintf(stderr, "avahi_entry_group_new() failed: %s\n", avahi_strerror(avahi_server_errno(s))); goto fail; } @@ -94,7 +94,7 @@ static void create_services(AvahiServer *s) { } /* Tell the server to register the service */ - if ((ret = avahi_entry_group_commit(group)) < 0) { + if ((ret = avahi_s_entry_group_commit(group)) < 0) { fprintf(stderr, "Failed to commit entry_group: %s\n", avahi_strerror(ret)); goto fail; } @@ -137,7 +137,7 @@ static void server_callback(AvahiServer *s, AvahiServerState state, void * userd * in AVAHI_SERVER_RUNNING state we will register them * again with the new host name. */ if (group) - avahi_entry_group_reset(group); + avahi_s_entry_group_reset(group); } } @@ -186,7 +186,7 @@ fail: /* Cleanup things */ if (group) - avahi_entry_group_free(group); + avahi_s_entry_group_free(group); if (server) avahi_server_free(server); -- cgit