diff options
Diffstat (limited to 'src/logging/nm-logging.c')
| -rw-r--r-- | src/logging/nm-logging.c | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/src/logging/nm-logging.c b/src/logging/nm-logging.c index 078f1527..a2b0ebaf 100644 --- a/src/logging/nm-logging.c +++ b/src/logging/nm-logging.c @@ -23,7 +23,6 @@ #include <dlfcn.h> #include <syslog.h> -#include <execinfo.h> #include <stdio.h> #include <stdlib.h> #include <unistd.h> @@ -47,7 +46,7 @@ static guint32 log_domains = \ LOGD_DHCP4 | LOGD_DHCP6 | LOGD_PPP | LOGD_IP4 | LOGD_IP6 | LOGD_AUTOIP4 | \ LOGD_DNS | LOGD_VPN | LOGD_SHARING | LOGD_SUPPLICANT | LOGD_AGENTS | \ LOGD_SETTINGS | LOGD_SUSPEND | LOGD_CORE | LOGD_DEVICE | LOGD_OLPC_MESH | \ - LOGD_WIMAX; + LOGD_WIMAX | LOGD_INFINIBAND | LOGD_FIREWALL; typedef struct { guint32 num; @@ -88,18 +87,13 @@ static const LogDesc domain_descs[] = { { LOGD_DEVICE, "DEVICE" }, { LOGD_OLPC_MESH, "OLPC" }, { LOGD_WIMAX, "WIMAX" }, + { LOGD_INFINIBAND,"INFINIBAND" }, + { LOGD_FIREWALL, "FIREWALL" }, { 0, NULL } }; /************************************************************************/ -enum { - NM_LOGGING_ERROR_UNKNOWN_LEVEL = 0, - NM_LOGGING_ERROR_UNKNOWN_DOMAIN = 1, -}; - -#define ENUM_ENTRY(NAME, DESC) { NAME, "" #NAME "", DESC } - GQuark nm_logging_error_quark (void) { @@ -110,22 +104,6 @@ nm_logging_error_quark (void) return ret; } -GType -nm_logging_error_get_type (void) -{ - static GType etype = 0; - - if (etype == 0) { - static const GEnumValue values[] = { - ENUM_ENTRY (NM_LOGGING_ERROR_UNKNOWN_LEVEL, "UnknownLevel"), - ENUM_ENTRY (NM_LOGGING_ERROR_UNKNOWN_DOMAIN, "UnknownDomain"), - { 0, 0, 0 } - }; - etype = g_enum_register_static ("NMLoggingError", values); - } - return etype; -} - /************************************************************************/ gboolean |