* Add a free function for AvahiEntryGroup in C api

 * Modify the browser free functions to return/set errors.

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@320 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/avahi-client/browser.c b/avahi-client/browser.c
index 6e0ed5d364bc6200f39e09d8f21fe907bd586c35..ab7a9219c7c0c8f3878de09b2686c4bcbd3f48fc 100644 (file)
--- a/avahi-client/browser.c
+++ b/avahi-client/browser.c
@@ -88,25 +88,29 @@ dbus_error:
     return NULL;
 }
 
-void
+int
 avahi_domain_browser_free (AvahiDomainBrowser *b)
 {
+    AvahiClient *client = b->client;
     DBusMessage *message = NULL;
 
     if (b == NULL || b->path == NULL)
-        return;
+        return avahi_client_set_errno (client, AVAHI_ERR_INVALID_OBJECT);
 
     message = dbus_message_new_method_call (AVAHI_DBUS_NAME,
             b->path,
             AVAHI_DBUS_INTERFACE_DOMAIN_BROWSER, "Free");
 
-    dbus_connection_send (b->client->bus, message, NULL);
+    if (message == NULL)
+        return avahi_client_set_errno (client, AVAHI_ERR_DBUS_ERROR);
+
+    dbus_connection_send (client->bus, message, NULL);
 
-    AVAHI_LLIST_REMOVE(AvahiDomainBrowser, domain_browsers, b->client->domain_browsers, b);
+    AVAHI_LLIST_REMOVE(AvahiDomainBrowser, domain_browsers, client->domain_browsers, b);
 
     free (b);
 
-    return;
+    return avahi_client_set_errno (client, AVAHI_OK);
 }
 
 char*
@@ -207,25 +211,29 @@ dbus_error:
     return NULL;
 }
 
-void
+int
 avahi_service_type_browser_free (AvahiServiceTypeBrowser *b)
 {
+    AvahiClient *client = b->client;
     DBusMessage *message = NULL;
 
     if (b == NULL || b->path == NULL)
-        return;
+        return avahi_client_set_errno (client, AVAHI_ERR_INVALID_OBJECT);
 
     message = dbus_message_new_method_call (AVAHI_DBUS_NAME,
             b->path,
             AVAHI_DBUS_INTERFACE_SERVICE_TYPE_BROWSER, "Free");
 
+    if (message == NULL)
+        return avahi_client_set_errno (client, AVAHI_ERR_DBUS_ERROR);
+
     dbus_connection_send (b->client->bus, message, NULL);
 
     AVAHI_LLIST_REMOVE(AvahiServiceTypeBrowser, service_type_browsers, b->client->service_type_browsers, b);
 
     free (b);
 
-    return;
+    return avahi_client_set_errno (client, AVAHI_OK);
 }
 
 char*
@@ -334,27 +342,29 @@ dbus_error:
     return NULL;
 }
     
-void
+int
 avahi_service_browser_free (AvahiServiceBrowser *b)
 {
+    AvahiClient *client = b->client;
     DBusMessage *message = NULL;
-
+    
     if (b == NULL || b->path == NULL)
-        return;
-
-    printf ("Freeing %s\n", b->path);
+        return avahi_client_set_errno (client, AVAHI_ERR_INVALID_OBJECT);
 
     message = dbus_message_new_method_call (AVAHI_DBUS_NAME,
             b->path,
             AVAHI_DBUS_INTERFACE_SERVICE_BROWSER, "Free");
 
+    if (message == NULL)
+        return avahi_client_set_errno (client, AVAHI_ERR_DBUS_ERROR);
+
     dbus_connection_send (b->client->bus, message, NULL);
 
     AVAHI_LLIST_REMOVE(AvahiServiceBrowser, service_browsers, b->client->service_browsers, b);
 
     free (b);
 
-    return;
+    return avahi_client_set_errno (client, AVAHI_OK);
 }
 
 char*

diff --git a/avahi-client/client.h b/avahi-client/client.h
index 824f1e905cf32b1e7d11107e5cc06089b202a1b7..16e9998ce534e0233aa9b5397ea58aa54b74be12 100644 (file)
--- a/avahi-client/client.h
+++ b/avahi-client/client.h
@@ -84,6 +84,9 @@ char* avahi_client_get_host_name_fqdn (AvahiClient*);
 /** Create a new AvahiEntryGroup object */
 AvahiEntryGroup* avahi_entry_group_new (AvahiClient*, AvahiEntryGroupCallback callback, void *user_data);
 
+/** Clean up and free an AvahiEntryGroup object */
+int avahi_entry_group_free (AvahiEntryGroup *);
+
 /** Commit an AvahiEntryGroup */
 int avahi_entry_group_commit (AvahiEntryGroup*);
 
@@ -130,7 +133,7 @@ AvahiDomainBrowser* avahi_domain_browser_new (AvahiClient *client,
 char* avahi_domain_browser_path (AvahiDomainBrowser *);
 
 /** Cleans up and frees an AvahiDomainBrowser object */
-void avahi_domain_browser_free (AvahiDomainBrowser *);
+int avahi_domain_browser_free (AvahiDomainBrowser *);
 
 /** Browse for service types on the local network */
 AvahiServiceTypeBrowser* avahi_service_type_browser_new (
@@ -145,7 +148,7 @@ AvahiServiceTypeBrowser* avahi_service_type_browser_new (
 char* avahi_service_type_browser_path (AvahiServiceTypeBrowser *);
 
 /** Cleans up and frees an AvahiServiceTypeBrowser object */
-void avahi_service_type_browser_free (AvahiServiceTypeBrowser *);
+int avahi_service_type_browser_free (AvahiServiceTypeBrowser *);
 
 /** Browse for services of a type on the local network */
 AvahiServiceBrowser* avahi_service_browser_new (
@@ -161,7 +164,7 @@ AvahiServiceBrowser* avahi_service_browser_new (
 char* avahi_service_browser_path (AvahiServiceBrowser *);
 
 /* Cleans up and frees an AvahiServiceBrowser object */
-void avahi_service_browser_free (AvahiServiceBrowser *);
+int avahi_service_browser_free (AvahiServiceBrowser *);
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 AVAHI_C_DECL_END

diff --git a/avahi-client/entrygroup.c b/avahi-client/entrygroup.c
index ea56ee2591fc362ebeb76657ab20d59dcfc138ef..8120e490da54bf57b21c16f4d2412612dd14788d 100644 (file)
--- a/avahi-client/entrygroup.c
+++ b/avahi-client/entrygroup.c
@@ -113,6 +113,28 @@ fail:
     return NULL;
 }
 
+int
+avahi_entry_group_free (AvahiEntryGroup *group)
+{
+    AvahiClient *client = group->client;
+    DBusMessage *message;
+
+    if (group == NULL || group->path == NULL)
+        return avahi_client_set_errno (client, AVAHI_ERR_INVALID_OBJECT);
+
+    message = dbus_message_new_method_call (AVAHI_DBUS_NAME,
+            group->path, AVAHI_DBUS_INTERFACE_ENTRY_GROUP, "Free");
+
+    if (message == NULL)
+        return avahi_client_set_errno (client, AVAHI_ERR_DBUS_ERROR);
+
+    dbus_connection_send (client->bus, message, NULL);
+
+    free (group);
+
+    return avahi_client_set_errno (client, AVAHI_OK);
+}
+
 int
 avahi_entry_group_commit (AvahiEntryGroup *group)
 {

diff --git a/avahi-common/dbus.h b/avahi-common/dbus.h
index fc8dc02a2b18a20f473489a564067410436913e0..e3aef6ca5bb111b6d842c5b3554e276fa4049a17 100644 (file)
--- a/avahi-common/dbus.h
+++ b/avahi-common/dbus.h
@@ -60,6 +60,7 @@ AVAHI_C_DECL_BEGIN
 #define AVAHI_DBUS_ERR_DBUS_ERROR "org.freedesktop.Avahi.DBusError"
 #define AVAHI_DBUS_ERR_NOT_CONNECTED "org.freedesktop.Avahi.NotConnectedError"
 #define AVAHI_DBUS_ERR_NO_MEMORY "org.freedesktop.Avahi.NoMemoryError"
+#define AVAHI_DBUS_ERR_INVALID_OBJECT "org.freedesktop.Avahi.InvalidObject"
 
 AVAHI_C_DECL_END
 

diff --git a/avahi-common/error.c b/avahi-common/error.c
index b84579341487d9db469170ca452a5c9a6663d942..0635161e9275c5ba0251876a1429dd7572b5eea9 100644 (file)
--- a/avahi-common/error.c
+++ b/avahi-common/error.c
@@ -49,6 +49,7 @@ const char *avahi_strerror(int error) {
         "An unexpected DBUS error occured",
         "Could not get a connection to the daemon",
         "Memory exhausted"
+        "The object passed in was not valid"
     };
 
     if (-error < 0 || -error >= -AVAHI_ERR_MAX)

diff --git a/avahi-common/error.h b/avahi-common/error.h
index c94946670b1e130af2aff63503fffc6c61f4ad61..2cdda5f890625249402ef2fc7a850fc362f83205 100644 (file)
--- a/avahi-common/error.h
+++ b/avahi-common/error.h
@@ -55,15 +55,18 @@ enum {
     AVAHI_ERR_DBUS_ERROR = -22,            /**< An unexpected DBUS error occured */
     AVAHI_ERR_NOT_CONNECTED = -23,         /**< Could not get a connection to the daemon */
     AVAHI_ERR_NO_MEMORY = -24,             /**< Memory exhausted */
+    AVAHI_ERR_INVALID_OBJECT = -25,        /**< The object passed to this function was invalid */
 
     /****
      ****    IF YOU ADD A NEW ERROR CODE HERE, PLEASE DON'T FORGET TO ADD
-     ****    IT TO THE STRING ARRAY IN avahi_strerror() AND TO THE ARRAY
-     ****    IN respond_error() IN dbus-protocol.c AND FINALLY TO
-     ****    dbus.h!
+     ****    IT TO THE STRING ARRAY IN avahi_strerror() IN error.c AND
+     ****    TO THE ARRAY IN respond_error() IN dbus-protocol.c
+     ****    AND FINALLY TO dbus.h!
+     ****
+     ****    Also remember to update the MAX value below.
      ****/
     
-    AVAHI_ERR_MAX = -25
+    AVAHI_ERR_MAX = -26
 };
 
 /** Return a human readable error string for the specified error code */

diff --git a/avahi-daemon/dbus-protocol.c b/avahi-daemon/dbus-protocol.c
index c30873eb9fca2cddd5b7af7ee4660662301bfec7..9b83da9c214ff03ab324601340e7878e60119e84 100644 (file)
--- a/avahi-daemon/dbus-protocol.c
+++ b/avahi-daemon/dbus-protocol.c
@@ -349,7 +349,8 @@ static DBusHandlerResult respond_error(DBusConnection *c, DBusMessage *m, gint e
         AVAHI_DBUS_ERR_INVALID_OPERATION,
         AVAHI_DBUS_ERR_DBUS_ERROR,
         AVAHI_DBUS_ERR_NOT_CONNECTED,
-        AVAHI_DBUS_ERR_NO_MEMORY
+        AVAHI_DBUS_ERR_NO_MEMORY,
+        AVAHI_DBUS_ERR_INVALID_OBJECT
     };
 
     g_assert(-error > -AVAHI_OK);