Rename some server side objects/symbols so that they do not conflict with the same...

[catta] / avahi-core / resolve-address.c

diff --git a/avahi-core/resolve-address.c b/avahi-core/resolve-address.c
index e210285a613b420994e9ac70271eebc8af9e3431..d46483ead98733b73ebd46bfd0039e1bfe1ae4ca 100644 (file)
--- a/avahi-core/resolve-address.c
+++ b/avahi-core/resolve-address.c
@@ -28,24 +28,24 @@
 
 #include "browse.h"
 
-struct AvahiAddressResolver {
+struct AvahiSAddressResolver {
     AvahiServer *server;
     AvahiAddress address;
     
-    AvahiRecordBrowser *record_browser;
+    AvahiSRecordBrowser *record_browser;
 
-    AvahiAddressResolverCallback callback;
+    AvahiSAddressResolverCallback callback;
     void* userdata;
 
     AvahiTimeEvent *time_event;
 
-    AVAHI_LLIST_FIELDS(AvahiAddressResolver, resolver);
+    AVAHI_LLIST_FIELDS(AvahiSAddressResolver, resolver);
 };
 
-static void finish(AvahiAddressResolver *r, AvahiIfIndex interface, AvahiProtocol protocol, AvahiResolverEvent event, AvahiRecord *record) {
+static void finish(AvahiSAddressResolver *r, AvahiIfIndex interface, AvahiProtocol protocol, AvahiResolverEvent event, AvahiRecord *record) {
     assert(r);
     
-    avahi_record_browser_free(r->record_browser);
+    avahi_s_record_browser_free(r->record_browser);
     r->record_browser = NULL;
 
     if (r->time_event) {
@@ -56,8 +56,8 @@ static void finish(AvahiAddressResolver *r, AvahiIfIndex interface, AvahiProtoco
     r->callback(r, interface, protocol, event, &r->address, record ? record->data.ptr.name : NULL, r->userdata);
 }
 
-static void record_browser_callback(AvahiRecordBrowser*rr, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, AvahiRecord *record, void* userdata) {
-    AvahiAddressResolver *r = userdata;
+static void record_browser_callback(AvahiSRecordBrowser*rr, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, AvahiRecord *record, void* userdata) {
+    AvahiSAddressResolver *r = userdata;
 
     assert(rr);
     assert(record);
@@ -72,7 +72,7 @@ static void record_browser_callback(AvahiRecordBrowser*rr, AvahiIfIndex interfac
 }
 
 static void time_event_callback(AvahiTimeEvent *e, void *userdata) {
-    AvahiAddressResolver *r = userdata;
+    AvahiSAddressResolver *r = userdata;
     
     assert(e);
     assert(r);
@@ -80,8 +80,8 @@ static void time_event_callback(AvahiTimeEvent *e, void *userdata) {
     finish(r, -1, AVAHI_PROTO_UNSPEC, AVAHI_RESOLVER_TIMEOUT, NULL);
 }
 
-AvahiAddressResolver *avahi_address_resolver_new(AvahiServer *server, AvahiIfIndex interface, AvahiProtocol protocol, const AvahiAddress *address, AvahiAddressResolverCallback callback, void* userdata) {
-    AvahiAddressResolver *r;
+AvahiSAddressResolver *avahi_s_address_resolver_new(AvahiServer *server, AvahiIfIndex interface, AvahiProtocol protocol, const AvahiAddress *address, AvahiSAddressResolverCallback callback, void* userdata) {
+    AvahiSAddressResolver *r;
     AvahiKey *k;
     char *n;
     struct timeval tv;
@@ -110,7 +110,7 @@ AvahiAddressResolver *avahi_address_resolver_new(AvahiServer *server, AvahiIfInd
         return NULL;
     }
 
-    if (!(r = avahi_new(AvahiAddressResolver, 1))) {
+    if (!(r = avahi_new(AvahiSAddressResolver, 1))) {
         avahi_server_set_errno(server, AVAHI_ERR_NO_MEMORY);
         avahi_key_unref(k);
         return NULL;
@@ -122,34 +122,34 @@ AvahiAddressResolver *avahi_address_resolver_new(AvahiServer *server, AvahiIfInd
     r->userdata = userdata;
 
     r->record_browser = NULL;
-    AVAHI_LLIST_PREPEND(AvahiAddressResolver, resolver, server->address_resolvers, r);
+    AVAHI_LLIST_PREPEND(AvahiSAddressResolver, resolver, server->address_resolvers, r);
 
     avahi_elapse_time(&tv, 1000, 0);
     if (!(r->time_event = avahi_time_event_new(server->time_event_queue, &tv, time_event_callback, r))) {
         avahi_server_set_errno(server, AVAHI_ERR_NO_MEMORY);
-        avahi_address_resolver_free(r);
+        avahi_s_address_resolver_free(r);
         avahi_key_unref(k);
         return NULL;
     }
     
-    r->record_browser = avahi_record_browser_new(server, interface, protocol, k, record_browser_callback, r);
+    r->record_browser = avahi_s_record_browser_new(server, interface, protocol, k, record_browser_callback, r);
     avahi_key_unref(k);
 
     if (!r->record_browser) {
-        avahi_address_resolver_free(r);
+        avahi_s_address_resolver_free(r);
         return NULL;
     }
     
     return r;
 }
 
-void avahi_address_resolver_free(AvahiAddressResolver *r) {
+void avahi_s_address_resolver_free(AvahiSAddressResolver *r) {
     assert(r);
 
-    AVAHI_LLIST_REMOVE(AvahiAddressResolver, resolver, r->server->address_resolvers, r);
+    AVAHI_LLIST_REMOVE(AvahiSAddressResolver, resolver, r->server->address_resolvers, r);
 
     if (r->record_browser)
-        avahi_record_browser_free(r->record_browser);
+        avahi_s_record_browser_free(r->record_browser);
 
     if (r->time_event)
         avahi_time_event_free(r->time_event);