colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

active-connection: make use of logging macro _LOGD()

Browse Source
This commit is contained in:
Thomas Haller
2015-08-11 13:20:37 +02:00
parent c6cbd652ba
commit 97c971b4e4
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/nm-active-connection.c
View File

@@ -504,15 +504,15 @@ check_master_ready (NMActiveConnection *self)
NMActiveConnectionState master_state = NM_ACTIVE_CONNECTION_STATE_UNKNOWN; NMActiveConnectionState master_state = NM_ACTIVE_CONNECTION_STATE_UNKNOWN;
if (priv->state != NM_ACTIVE_CONNECTION_STATE_ACTIVATING) { if (priv->state != NM_ACTIVE_CONNECTION_STATE_ACTIVATING) {
nm_log_dbg (LOGD_DEVICE, "(%p): not signalling master-ready (not activating)", self); _LOGD ("not signalling master-ready (not activating)");
return; return;
} }
if (!priv->master) { if (!priv->master) {
nm_log_dbg (LOGD_DEVICE, "(%p): not signalling master-ready (no master)", self); _LOGD ("not signalling master-ready (no master)");
return; return;
} }
if (priv->master_ready) { if (priv->master_ready) {
nm_log_dbg (LOGD_DEVICE, "(%p): not signalling master-ready (already signaled)", self); _LOGD ("not signalling master-ready (already signaled)");
return; return;
} }
@@ -522,12 +522,12 @@ check_master_ready (NMActiveConnection *self)
* or higher states. * or higher states.
*/ */
master_state = nm_active_connection_get_state (priv->master); master_state = nm_active_connection_get_state (priv->master);
nm_log_dbg (LOGD_DEVICE, "(%p): master ActiveConnection [%p] state now '%s' (%d)", _LOGD ("master ActiveConnection [%p] state now '%s' (%d)",
self, priv->master, state_to_string (master_state), master_state); priv->master, state_to_string (master_state), master_state);
if ( master_state == NM_ACTIVE_CONNECTION_STATE_ACTIVATING if ( master_state == NM_ACTIVE_CONNECTION_STATE_ACTIVATING
|| master_state == NM_ACTIVE_CONNECTION_STATE_ACTIVATED) { || master_state == NM_ACTIVE_CONNECTION_STATE_ACTIVATED) {
nm_log_dbg (LOGD_DEVICE, "(%p): signalling master-ready", self); _LOGD ("signalling master-ready");
priv->master_ready = TRUE; priv->master_ready = TRUE;
g_object_notify (G_OBJECT (self), NM_ACTIVE_CONNECTION_INT_MASTER_READY); g_object_notify (G_OBJECT (self), NM_ACTIVE_CONNECTION_INT_MASTER_READY);
@@ -551,8 +551,8 @@ master_state_cb (NMActiveConnection *master,
check_master_ready (self); check_master_ready (self);
nm_log_dbg (LOGD_DEVICE, "(%p): master ActiveConnection [%p] state now '%s' (%d)", _LOGD ("master ActiveConnection [%p] state now '%s' (%d)",
self, master, state_to_string (master_state), master_state); master, state_to_string (master_state), master_state);
if ( master_state >= NM_ACTIVE_CONNECTION_STATE_DEACTIVATING if ( master_state >= NM_ACTIVE_CONNECTION_STATE_DEACTIVATING
&& !priv->master_ready) { && !priv->master_ready) {
@@ -589,8 +589,8 @@ nm_active_connection_set_master (NMActiveConnection *self, NMActiveConnection *m
g_return_if_fail (priv->device != nm_active_connection_get_device (master)); g_return_if_fail (priv->device != nm_active_connection_get_device (master));
} }
nm_log_dbg (LOGD_DEVICE, "(%p): master ActiveConnection is [%p] %s", _LOGD ("master ActiveConnection is [%p] %s",
self, master, nm_active_connection_get_id (master)); master, nm_active_connection_get_id (master));
priv->master = g_object_ref (master); priv->master = g_object_ref (master);
g_signal_connect (priv->master, g_signal_connect (priv->master,