From beb3eff6ff01d12230e7b21d147392854a07c634 Mon Sep 17 00:00:00 2001 From: Trent Lloyd Date: Tue, 9 Aug 2005 14:18:10 +0000 Subject: * 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 --- avahi-core/core.h | 31 +------------------------------ avahi-core/server.c | 31 ------------------------------- 2 files changed, 1 insertion(+), 61 deletions(-) (limited to 'avahi-core') diff --git a/avahi-core/core.h b/avahi-core/core.h index 59f2852..ec0b981 100644 --- a/avahi-core/core.h +++ b/avahi-core/core.h @@ -56,38 +56,12 @@ AVAHI_C_DECL_END #include #include #include +#include #ifndef DOXYGEN_SHOULD_SKIP_THIS AVAHI_C_DECL_BEGIN #endif -/** Error codes used by avahi */ -enum { - AVAHI_OK = 0, /**< OK */ - AVAHI_ERR_FAILURE = -1, /**< Generic error code */ - AVAHI_ERR_BAD_STATE = -2, /**< Object was in a bad state */ - AVAHI_ERR_INVALID_HOST_NAME = -3, /**< Invalid host name */ - AVAHI_ERR_INVALID_DOMAIN_NAME = -4, /**< Invalid domain name */ - AVAHI_ERR_NO_NETWORK = -5, /**< No suitable network protocol available */ - AVAHI_ERR_INVALID_TTL = -6, /**< Invalid DNS TTL */ - AVAHI_ERR_IS_PATTERN = -7, /**< RR key is pattern */ - AVAHI_ERR_LOCAL_COLLISION = -8, /**< Local name collision */ - AVAHI_ERR_INVALID_RECORD = -9, /**< Invalid RR */ - AVAHI_ERR_INVALID_SERVICE_NAME = -10, /**< Invalid service name */ - AVAHI_ERR_INVALID_SERVICE_TYPE = -11, /**< Invalid service type */ - AVAHI_ERR_INVALID_PORT = -12, /**< Invalid port number */ - AVAHI_ERR_INVALID_KEY = -13, /**< Invalid key */ - AVAHI_ERR_INVALID_ADDRESS = -14, /**< Invalid address */ - AVAHI_ERR_TIMEOUT = -15, /**< Timeout reached */ - AVAHI_ERR_TOO_MANY_CLIENTS = -16, /**< Too many clients */ - AVAHI_ERR_TOO_MANY_OBJECTS = -17, /**< Too many objects */ - AVAHI_ERR_TOO_MANY_ENTRIES = -18, /**< Too many entries */ - AVAHI_ERR_OS = -19, /**< OS error */ - AVAHI_ERR_ACCESS_DENIED = -20, /**< Access denied */ - AVAHI_ERR_INVALID_OPERATION = -21, /**< Invalid operation */ - AVAHI_ERR_MAX = -22 -}; - /** Flags for server entries */ typedef enum { AVAHI_ENTRY_NULL = 0, /**< No special flags */ @@ -593,9 +567,6 @@ AvahiDNSServerBrowser *avahi_dns_server_browser_new( /** Free an AvahiDNSServerBrowser object */ void avahi_dns_server_browser_free(AvahiDNSServerBrowser *b); -/** Return a human readable error string for the specified error code */ -const gchar *avahi_strerror(gint error); - /** Return the last error code */ gint avahi_server_errno(AvahiServer *s); diff --git a/avahi-core/server.c b/avahi-core/server.c index 541c7b7..4d5a4ec 100644 --- a/avahi-core/server.c +++ b/avahi-core/server.c @@ -2294,37 +2294,6 @@ AvahiServerConfig* avahi_server_config_copy(AvahiServerConfig *ret, const AvahiS return ret; } -const gchar *avahi_strerror(gint error) { - g_assert(-error >= 0 && -error < -AVAHI_ERR_MAX); - - const gchar * const msg[- AVAHI_ERR_MAX] = { - "OK", - "Operation failed", - "Bad state", - "Invalid host name", - "Invalid domain name", - "No suitable network protocol available", - "Invalid DNS TTL", - "Resource record key is pattern", - "Local name collision", - "Invalid record", - "Invalid service name", - "Invalid service type", - "Invalid port number", - "Invalid record key", - "Invalid address", - "Timeout reached", - "Too many clients", - "Too many objects", - "Too many entries", - "OS Error", - "Access denied", - "Invalid operation" - }; - - return msg[-error]; -} - gint avahi_server_errno(AvahiServer *s) { g_assert(s); -- cgit