diff options
| author | Trent Lloyd <lathiat@bur.st> | 2005-08-14 12:06:09 +0000 |
|---|---|---|
| committer | Trent Lloyd <lathiat@bur.st> | 2005-08-14 12:06:09 +0000 |
| commit | 3d2e63d2c5c351dde38b24a45a679ce819ed0e41 (patch) | |
| tree | f3d990a2572bca040761f82167c309851e9c1f1a /avahi-common | |
| parent | 77dc1cb05c8e6d23bd9cea37d4b4644cd76f0f82 (diff) | |
* 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
Diffstat (limited to 'avahi-common')
| -rw-r--r-- | avahi-common/dbus.h | 1 | ||||
| -rw-r--r-- | avahi-common/error.c | 1 | ||||
| -rw-r--r-- | avahi-common/error.h | 11 |
3 files changed, 9 insertions, 4 deletions
diff --git a/avahi-common/dbus.h b/avahi-common/dbus.h index fc8dc02..e3aef6c 100644 --- 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 b845793..0635161 100644 --- 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 c949466..2cdda5f 100644 --- 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 */ |