* add two new configuration file options: "disable-publishing" and "disable-user...

[catta] / avahi-common / dbus.c

diff --git a/avahi-common/dbus.c b/avahi-common/dbus.c
index 93bd8cd7a75b4cba5fd39e96818d0e60b4d8718d..3ea7cbd40e2a8e9c5d146e2bc08784704895589b 100644 (file)
--- a/avahi-common/dbus.c
+++ b/avahi-common/dbus.c
@@ -31,52 +31,77 @@
 #include <avahi-common/dbus.h>
 
 static const char * const table[- AVAHI_ERR_MAX] = {
-        NULL, /* OK */
-        AVAHI_DBUS_ERR_FAILURE,
-        AVAHI_DBUS_ERR_BAD_STATE,
-        AVAHI_DBUS_ERR_INVALID_HOST_NAME,
-        AVAHI_DBUS_ERR_INVALID_DOMAIN_NAME,
-        AVAHI_DBUS_ERR_NO_NETWORK,
-        AVAHI_DBUS_ERR_INVALID_TTL,
-        AVAHI_DBUS_ERR_IS_PATTERN,
-        AVAHI_DBUS_ERR_LOCAL_COLLISION,
-        AVAHI_DBUS_ERR_INVALID_RECORD,
-        AVAHI_DBUS_ERR_INVALID_SERVICE_NAME,
-        AVAHI_DBUS_ERR_INVALID_SERVICE_TYPE,
-        AVAHI_DBUS_ERR_INVALID_PORT,
-        AVAHI_DBUS_ERR_INVALID_KEY,
-        AVAHI_DBUS_ERR_INVALID_ADDRESS,
-        AVAHI_DBUS_ERR_TIMEOUT,
-        AVAHI_DBUS_ERR_TOO_MANY_CLIENTS,
-        AVAHI_DBUS_ERR_TOO_MANY_OBJECTS,
-        AVAHI_DBUS_ERR_TOO_MANY_ENTRIES,
-        AVAHI_DBUS_ERR_OS,
-        AVAHI_DBUS_ERR_ACCESS_DENIED,
-        AVAHI_DBUS_ERR_INVALID_OPERATION,
-        AVAHI_DBUS_ERR_DBUS_ERROR,
-        AVAHI_DBUS_ERR_NOT_CONNECTED,
-        AVAHI_DBUS_ERR_NO_MEMORY,
-        AVAHI_DBUS_ERR_INVALID_OBJECT,
-        AVAHI_DBUS_ERR_NO_DAEMON
-    };
+    AVAHI_DBUS_ERR_OK,
+    AVAHI_DBUS_ERR_FAILURE,
+    AVAHI_DBUS_ERR_BAD_STATE,
+    AVAHI_DBUS_ERR_INVALID_HOST_NAME,
+    AVAHI_DBUS_ERR_INVALID_DOMAIN_NAME,
+    AVAHI_DBUS_ERR_NO_NETWORK,
+    AVAHI_DBUS_ERR_INVALID_TTL,
+    AVAHI_DBUS_ERR_IS_PATTERN,
+    AVAHI_DBUS_ERR_COLLISION,
+    AVAHI_DBUS_ERR_INVALID_RECORD,
+    
+    AVAHI_DBUS_ERR_INVALID_SERVICE_NAME,
+    AVAHI_DBUS_ERR_INVALID_SERVICE_TYPE,
+    AVAHI_DBUS_ERR_INVALID_PORT,
+    AVAHI_DBUS_ERR_INVALID_KEY,
+    AVAHI_DBUS_ERR_INVALID_ADDRESS,
+    AVAHI_DBUS_ERR_TIMEOUT,
+    AVAHI_DBUS_ERR_TOO_MANY_CLIENTS,
+    AVAHI_DBUS_ERR_TOO_MANY_OBJECTS,
+    AVAHI_DBUS_ERR_TOO_MANY_ENTRIES,
+    AVAHI_DBUS_ERR_OS,
+    
+    AVAHI_DBUS_ERR_ACCESS_DENIED,
+    AVAHI_DBUS_ERR_INVALID_OPERATION,
+    AVAHI_DBUS_ERR_DBUS_ERROR,
+    AVAHI_DBUS_ERR_NOT_CONNECTED,
+    AVAHI_DBUS_ERR_NO_MEMORY,
+    AVAHI_DBUS_ERR_INVALID_OBJECT,
+    AVAHI_DBUS_ERR_NO_DAEMON,
+    AVAHI_DBUS_ERR_INVALID_INTERFACE,
+    AVAHI_DBUS_ERR_INVALID_PROTOCOL,
+    AVAHI_DBUS_ERR_INVALID_FLAGS,
+    
+    AVAHI_DBUS_ERR_NOT_FOUND,
+    AVAHI_DBUS_ERR_INVALID_CONFIG,
+    AVAHI_DBUS_ERR_VERSION_MISMATCH,
+    AVAHI_DBUS_ERR_INVALID_SERVICE_SUBTYPE,
+    AVAHI_DBUS_ERR_INVALID_PACKET,
+    AVAHI_DBUS_ERR_INVALID_DNS_ERROR,
+    AVAHI_DBUS_ERR_DNS_FORMERR,
+    AVAHI_DBUS_ERR_DNS_SERVFAIL,
+    AVAHI_DBUS_ERR_DNS_NXDOMAIN,
+    AVAHI_DBUS_ERR_DNS_NOTIMP,
+    
+    AVAHI_DBUS_ERR_DNS_REFUSED,
+    AVAHI_DBUS_ERR_DNS_YXDOMAIN,
+    AVAHI_DBUS_ERR_DNS_YXRRSET,
+    AVAHI_DBUS_ERR_DNS_NXRRSET,
+    AVAHI_DBUS_ERR_DNS_NOTAUTH,
+    AVAHI_DBUS_ERR_DNS_NOTZONE,
+    AVAHI_DBUS_ERR_INVALID_RDATA,
+    AVAHI_DBUS_ERR_INVALID_DNS_CLASS,
+    AVAHI_DBUS_ERR_INVALID_DNS_TYPE,
+    AVAHI_DBUS_ERR_NOT_SUPPORTED,
 
-int
-avahi_error_dbus_to_number (const char *s)
-{
+    AVAHI_DBUS_ERR_NOT_PERMITTED
+};
+
+int avahi_error_dbus_to_number(const char *s) {
     int e;
 
-    assert (s == NULL);
+    assert(s);
 
-    for (e = 0; e > AVAHI_ERR_MAX; e--)
-        if (strcmp (s, table[-e]) == 0)
+    for (e = -1; e > AVAHI_ERR_MAX; e--)
+        if (strcmp(s, table[-e]) == 0)
             return e;
 
     return AVAHI_ERR_DBUS_ERROR;
 }
 
-const char *
-avahi_error_number_to_dbus (int error)
-{
+const char *avahi_error_number_to_dbus(int error) {
     assert(error > AVAHI_ERR_MAX);
     assert(error < 1);