fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 15:58:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm-core, core: merge NMLoggingError into NMManagerError

Browse source 
NMManagerError has other operation-specific errors (like
NM_MANAGER_ERROR_ALREADY_ASLEEP_OR_AWAKE), so it makes sense to move
NM_LOGGING_ERROR_UNKNOWN_LEVEL and NM_LOGGING_ERROR_UNKNOWN_DOMAIN
there too rather than having them in their own tiny error domain.
This commit is contained in:
Dan Winship 2014-10-16 16:47:30 -04:00
parent 862d4efeac
commit 115f8bead8
4 changed files with 7 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libnm-core/nm-errors.h
View file

@ -149,6 +149,8 @@ GQuark nm_device_error_quark (void);
* sleep/wake state. * sleep/wake state.
* @NM_MANAGER_ERROR_ALREADY_ENABLED_OR_DISABLED: The network is already * @NM_MANAGER_ERROR_ALREADY_ENABLED_OR_DISABLED: The network is already
* enabled/disabled. * enabled/disabled.
* @NM_MANAGER_ERROR_UNKNOWN_LOG_LEVEL: Unknown log level in SetLogging
* @NM_MANAGER_ERROR_UNKNOWN_LOG_DOMAIN: Unknown log domain in SetLogging
* *
* Errors related to the main "network management" interface of NetworkManager. * Errors related to the main "network management" interface of NetworkManager.
* These may be returned from #NMClient methods that invoke D-Bus operations on * These may be returned from #NMClient methods that invoke D-Bus operations on
@ -166,6 +168,8 @@ typedef enum {
NM_MANAGER_ERROR_DEPENDENCY_FAILED, /*< nick=DependencyFailed >*/ NM_MANAGER_ERROR_DEPENDENCY_FAILED, /*< nick=DependencyFailed >*/
NM_MANAGER_ERROR_ALREADY_ASLEEP_OR_AWAKE, /*< nick=AlreadyAsleepOrAwake >*/ NM_MANAGER_ERROR_ALREADY_ASLEEP_OR_AWAKE, /*< nick=AlreadyAsleepOrAwake >*/
NM_MANAGER_ERROR_ALREADY_ENABLED_OR_DISABLED, /*< nick=AlreadyEnabledOrDisabled >*/ NM_MANAGER_ERROR_ALREADY_ENABLED_OR_DISABLED, /*< nick=AlreadyEnabledOrDisabled >*/
NM_MANAGER_ERROR_UNKNOWN_LOG_LEVEL, /*< nick=UnknownLogLevel >*/
NM_MANAGER_ERROR_UNKNOWN_LOG_DOMAIN, /*< nick=UnknownLogDomain >*/
} NMManagerError; } NMManagerError;
GQuark nm_manager_error_quark (void); GQuark nm_manager_error_quark (void);

17
src/nm-logging.c
View file

@ -36,6 +36,7 @@
#include "nm-glib-compat.h" #include "nm-glib-compat.h"
#include "nm-logging.h" #include "nm-logging.h"
#include "nm-errors.h"
static void static void
nm_log_handler (const gchar *log_domain, nm_log_handler (const gchar *log_domain,
@ -123,18 +124,6 @@ static const LogDesc domain_descs[] = {
/************************************************************************/ /************************************************************************/
GQuark
nm_logging_error_quark (void)
{
static GQuark ret = 0;
if (ret == 0)
ret = g_quark_from_static_string ("nm_logging_error");
return ret;
}
/************************************************************************/
static void static void
_ensure_initialized () _ensure_initialized ()
{ {
@ -156,7 +145,7 @@ match_log_level (const char *level,
} }
} }
g_set_error (error, NM_LOGGING_ERROR, NM_LOGGING_ERROR_UNKNOWN_LEVEL, g_set_error (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_UNKNOWN_LOG_LEVEL,
_("Unknown log level '%s'"), level); _("Unknown log level '%s'"), level);
return FALSE; return FALSE;
} }
@ -238,7 +227,7 @@ nm_logging_setup (const char *level,
if (!bits) { if (!bits) {
if (!bad_domains) { if (!bad_domains) {
g_set_error (error, NM_LOGGING_ERROR, NM_LOGGING_ERROR_UNKNOWN_DOMAIN, g_set_error (error, NM_MANAGER_ERROR, NM_MANAGER_ERROR_UNKNOWN_LOG_DOMAIN,
_("Unknown log domain '%s'"), *iter); _("Unknown log domain '%s'"), *iter);
return FALSE; return FALSE;
} }

9
src/nm-logging.h
View file

@ -86,15 +86,6 @@ enum {
LOGL_MAX LOGL_MAX
}; };
typedef enum {
NM_LOGGING_ERROR_UNKNOWN_LEVEL = 0, /*< nick=UnknownLevel >*/
NM_LOGGING_ERROR_UNKNOWN_DOMAIN = 1, /*< nick=UnknownDomain >*/
} NMLoggingError;
#define NM_LOGGING_ERROR (nm_logging_error_quark ())
GQuark nm_logging_error_quark (void);
#define nm_log_err(domain, ...) nm_log (LOGL_ERR, (domain), __VA_ARGS__) #define nm_log_err(domain, ...) nm_log (LOGL_ERR, (domain), __VA_ARGS__)
#define nm_log_warn(domain, ...) nm_log (LOGL_WARN, (domain), __VA_ARGS__) #define nm_log_warn(domain, ...) nm_log (LOGL_WARN, (domain), __VA_ARGS__)
#define nm_log_info(domain, ...) nm_log (LOGL_INFO, (domain), __VA_ARGS__) #define nm_log_info(domain, ...) nm_log (LOGL_INFO, (domain), __VA_ARGS__)

1
src/nm-manager.c
View file

@ -5250,6 +5250,5 @@ nm_manager_class_init (NMManagerClass *manager_class)
&dbus_glib_nm_manager_object_info); &dbus_glib_nm_manager_object_info);
dbus_g_error_domain_register (NM_MANAGER_ERROR, NM_DBUS_INTERFACE, NM_TYPE_MANAGER_ERROR); dbus_g_error_domain_register (NM_MANAGER_ERROR, NM_DBUS_INTERFACE, NM_TYPE_MANAGER_ERROR);
dbus_g_error_domain_register (NM_LOGGING_ERROR, "org.freedesktop.NetworkManager.Logging", NM_TYPE_LOGGING_ERROR);
} }