* Split out error code handling to avahi-common/error.[ch]

 * Redefine states/evvents in avahi-common/defs.h not to have -1 values
   - Update avahi-utils/avahi/__init__.py to reflect this


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

2 files changed, 12 insertions, 11 deletions

diff --git a/avahi-common/Makefile.am b/avahi-common/Makefile.am
index d7c15e8..6788f31 100644
--- a/avahi-common/Makefile.am
+++ b/avahi-common/Makefile.am
@@ -57,7 +57,8 @@ libavahi_common_la_SOURCES = \
 	strlst.c strlst.h \
 	alternative.c alternative.h \
 	rr.c rr.h \
-	util.c util.h
+	util.c util.h \
+	error.c error.h
 libavahi_common_la_CFLAGS = $(AM_CFLAGS)
 libavahi_common_la_LIBADD = $(AM_LDADD)
 
diff --git a/avahi-common/defs.h b/avahi-common/defs.h
index 6cef4a3..7c96b23 100644
--- a/avahi-common/defs.h
+++ b/avahi-common/defs.h
@@ -28,10 +28,10 @@ AVAHI_C_DECL_BEGIN
 
 /** States of an entry group object */
 typedef enum {
-    AVAHI_ENTRY_GROUP_UNCOMMITED = -1,   /**< The group has not yet been commited, the user must still call avahi_entry_group_commit() */
-    AVAHI_ENTRY_GROUP_REGISTERING = 0,   /**< The entries of the group are currently being registered */
-    AVAHI_ENTRY_GROUP_ESTABLISHED,       /**< The entries have successfully been established */
-    AVAHI_ENTRY_GROUP_COLLISION          /**< A name collision for one of the entries in the group has been detected, the entries have been withdrawn */ 
+    AVAHI_ENTRY_GROUP_UNCOMMITED,    /**< The group has not yet been commited, the user must still call avahi_entry_group_commit() */
+    AVAHI_ENTRY_GROUP_REGISTERING,   /**< The entries of the group are currently being registered */
+    AVAHI_ENTRY_GROUP_ESTABLISHED,   /**< The entries have successfully been established */
+    AVAHI_ENTRY_GROUP_COLLISION      /**< A name collision for one of the entries in the group has been detected, the entries have been withdrawn */ 
 } AvahiEntryGroupState;
 
 /** The type of domain to browse for */
@@ -46,20 +46,20 @@ typedef enum {
 
 /** Type of callback event when browsing */
 typedef enum {
-    AVAHI_BROWSER_NEW = 0,            /**< The object is new on the network */
-    AVAHI_BROWSER_REMOVE = -1         /**< The object has been removed from the network */
+    AVAHI_BROWSER_NEW,            /**< The object is new on the network */
+    AVAHI_BROWSER_REMOVE          /**< The object has been removed from the network */
 } AvahiBrowserEvent;
 
 /** Type of callback event when resolving */
 typedef enum {
-    AVAHI_RESOLVER_FOUND = 0,         /**< RR found, resolving successful */
-    AVAHI_RESOLVER_TIMEOUT = -1       /**< Noone responded within the timeout, resolving failed */
+    AVAHI_RESOLVER_FOUND,         /**< RR found, resolving successful */
+    AVAHI_RESOLVER_TIMEOUT        /**< Noone responded within the timeout, resolving failed */
 } AvahiResolverEvent;
 
 /** States of a server object */
 typedef enum {
-    AVAHI_SERVER_INVALID = -1,     /**< Invalid state (initial) */ 
-    AVAHI_SERVER_REGISTERING = 0,  /**< Host RRs are being registered */
+    AVAHI_SERVER_INVALID,          /**< Invalid state (initial) */ 
+    AVAHI_SERVER_REGISTERING,      /**< Host RRs are being registered */
     AVAHI_SERVER_RUNNING,          /**< All host RRs have been established */
     AVAHI_SERVER_COLLISION         /**< There is a collision with a host RR. All host RRs have been withdrawn, the user should set a new host name via avahi_server_set_host_name() */
 } AvahiServerState;