fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-04-23 13:20:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

core/logging: change order or domain/level arguments for nm_log()

Browse source 
Now the order of arguments corresponds to nm_logging_enabled().

Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller 2014-07-22 22:15:00 +02:00
parent 60cf1b8fcd
commit 7509d4f80f
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/devices/nm-device.c
View file

@ -4684,7 +4684,7 @@ nm_device_activate_ip6_config_commit (gpointer user_data)
activation_source_clear (self, FALSE, AF_INET6);
iface = nm_device_get_iface (self);
nm_log (LOGD_DEVICE, level, "Activation (%s) Stage 5 of 5 (IPv6 Commit) started...", iface);
nm_log (level, LOGD_DEVICE, "Activation (%s) Stage 5 of 5 (IPv6 Commit) started...", iface);
req = nm_device_get_act_request (self);
g_assert (req);
@ -4729,7 +4729,7 @@ nm_device_activate_ip6_config_commit (gpointer user_data)
nm_device_state_changed (self, NM_DEVICE_STATE_FAILED, reason);
}
nm_log (LOGD_DEVICE, level, "Activation (%s) Stage 5 of 5 (IPv6 Commit) complete.", iface);
nm_log (level, LOGD_DEVICE, "Activation (%s) Stage 5 of 5 (IPv6 Commit) complete.", iface);
return FALSE;
}
@ -4744,7 +4744,7 @@ nm_device_activate_schedule_ip6_config_result (NMDevice *self)
activation_source_schedule (self, nm_device_activate_ip6_config_commit, AF_INET6);
nm_log (LOGD_DEVICE | LOGD_IP6, level,
nm_log (level, LOGD_DEVICE | LOGD_IP6,
"Activation (%s) Stage 5 of 5 (IPv6 Commit) scheduled...",
nm_device_get_iface (self));
}

2
src/nm-logging.c
View file

@ -381,8 +381,8 @@ nm_logging_enabled (guint32 level, guint64 domain)
void
_nm_log (const char *loc,
const char *func,
guint64 domain,
guint32 level,
guint64 domain,
const char *fmt,
...)
{

14
src/nm-logging.h
View file

@ -92,18 +92,18 @@ typedef enum {
GQuark nm_logging_error_quark (void);
#define nm_log_err(domain, ...) nm_log ((domain), LOGL_ERR, __VA_ARGS__)
#define nm_log_warn(domain, ...) nm_log ((domain), LOGL_WARN, __VA_ARGS__)
#define nm_log_info(domain, ...) nm_log ((domain), LOGL_INFO, __VA_ARGS__)
#define nm_log_dbg(domain, ...) nm_log ((domain), LOGL_DEBUG, __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_info(domain, ...) nm_log (LOGL_INFO, (domain), __VA_ARGS__)
#define nm_log_dbg(domain, ...) nm_log (LOGL_DEBUG, (domain), __VA_ARGS__)
#define nm_log(domain, level, ...) \
_nm_log (G_STRLOC, G_STRFUNC, domain, level, __VA_ARGS__)
#define nm_log(level, domain, ...) \
_nm_log (G_STRLOC, G_STRFUNC, (level), (domain), __VA_ARGS__)
void _nm_log (const char *loc,
const char *func,
guint64 domain,
guint32 level,
guint64 domain,
const char *fmt,
...) __attribute__((__format__ (__printf__, 5, 6)));