* Improve and reorganise DBus error handling, see avahi-common/dbus.h

[catta] / avahi-common / error.h

diff --git a/avahi-common/error.h b/avahi-common/error.h
index ed7ced9c34b0b596b1f8d7eb2b52c5a9eb17d5ef..b367ffb7188d4b257e2bb42a8d0f304ceec13813 100644 (file)
--- a/avahi-common/error.h
+++ b/avahi-common/error.h
@@ -22,6 +22,12 @@
   USA.
 ***/
 
+/** \file error.h Error codes and auxiliary functions */
+
+#include <avahi-common/cdecl.h>
+
+AVAHI_C_DECL_BEGIN
+
 /** Error codes used by avahi */
 enum { 
     AVAHI_OK = 0,                          /**< OK */
@@ -46,10 +52,27 @@ enum {
     AVAHI_ERR_OS = -19,                    /**< OS error */
     AVAHI_ERR_ACCESS_DENIED = -20,         /**< Access denied */
     AVAHI_ERR_INVALID_OPERATION = -21,     /**< Invalid operation */
-    AVAHI_ERR_MAX = -22
+    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 */
+    AVAHI_ERR_NO_DAEMON = -26,             /**< Daemon not running */
+
+    /****
+     ****    IF YOU ADD A NEW ERROR CODE HERE, PLEASE DON'T FORGET TO ADD
+     ****    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 = -27
 };
 
 /** Return a human readable error string for the specified error code */
 const char *avahi_strerror(int error);
 
+AVAHI_C_DECL_END
+
 #endif