fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-30 10:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: rename to_str() methods to to_string()

Browse source 
It's more common to name the to-string method *_to_string(). Rename.
This commit is contained in:
Thomas Haller 2021-08-09 14:54:17 +02:00
parent ae117c588d
commit f5dbf476e3
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
5 changed files with 57 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/core/devices/nm-device-utils.c
View file

@ -10,7 +10,7 @@
/*****************************************************************************/
NM_UTILS_LOOKUP_STR_DEFINE(
nm_device_state_queued_state_to_str,
nm_device_state_queued_state_to_string,
NMDeviceState,
NM_UTILS_LOOKUP_DEFAULT(NM_PENDING_ACTIONPREFIX_QUEUED_STATE_CHANGE "???"),
NM_UTILS_LOOKUP_STR_ITEM(NM_DEVICE_STATE_UNKNOWN,
@ -41,14 +41,14 @@ NM_UTILS_LOOKUP_STR_DEFINE(
NM_PENDING_ACTIONPREFIX_QUEUED_STATE_CHANGE "failed"), );
const char *
nm_device_state_to_str(NMDeviceState state)
nm_device_state_to_string(NMDeviceState state)
{
return nm_device_state_queued_state_to_str(state)
return nm_device_state_queued_state_to_string(state)
+ NM_STRLEN(NM_PENDING_ACTIONPREFIX_QUEUED_STATE_CHANGE);
}
NM_UTILS_LOOKUP_STR_DEFINE(
nm_device_state_reason_to_str,
nm_device_state_reason_to_string,
NMDeviceStateReason,
NM_UTILS_LOOKUP_DEFAULT(NULL),
NM_UTILS_LOOKUP_STR_ITEM(NM_DEVICE_STATE_REASON_UNKNOWN, "unknown"),
@ -129,7 +129,7 @@ NM_UTILS_LOOKUP_STR_DEFINE(
"sriov-configuration-failed"),
NM_UTILS_LOOKUP_STR_ITEM(NM_DEVICE_STATE_REASON_PEER_NOT_FOUND, "peer-not-found"), );
NM_UTILS_LOOKUP_STR_DEFINE(nm_device_mtu_source_to_str,
NM_UTILS_LOOKUP_STR_DEFINE(nm_device_mtu_source_to_string,
NMDeviceMtuSource,
NM_UTILS_LOOKUP_DEFAULT_NM_ASSERT("unknown"),
NM_UTILS_LOOKUP_STR_ITEM(NM_DEVICE_MTU_SOURCE_NONE, "none"),
@ -138,7 +138,7 @@ NM_UTILS_LOOKUP_STR_DEFINE(nm_device_mtu_source_to_str,
NM_UTILS_LOOKUP_STR_ITEM(NM_DEVICE_MTU_SOURCE_CONNECTION,
"connection"), );
NM_UTILS_LOOKUP_STR_DEFINE(nm_device_sys_iface_state_to_str,
NM_UTILS_LOOKUP_STR_DEFINE(nm_device_sys_iface_state_to_string,
NMDeviceSysIfaceState,
NM_UTILS_LOOKUP_DEFAULT_NM_ASSERT("unknown"),
NM_UTILS_LOOKUP_STR_ITEM(NM_DEVICE_SYS_IFACE_STATE_EXTERNAL, "external"),
@ -147,7 +147,7 @@ NM_UTILS_LOOKUP_STR_DEFINE(nm_device_sys_iface_state_to_str,
NM_UTILS_LOOKUP_STR_ITEM(NM_DEVICE_SYS_IFACE_STATE_REMOVED,
"removed"), );
NM_UTILS_LOOKUP_STR_DEFINE(nm_device_ip_state_to_str,
NM_UTILS_LOOKUP_STR_DEFINE(nm_device_ip_state_to_string,
NMDeviceIPState,
NM_UTILS_LOOKUP_DEFAULT_WARN("unknown"),
NM_UTILS_LOOKUP_STR_ITEM(NM_DEVICE_IP_STATE_NONE, "none"),

16
src/core/devices/nm-device-utils.h
View file

@ -5,11 +5,11 @@
/*****************************************************************************/
const char *nm_device_state_to_str(NMDeviceState state);
const char *nm_device_state_reason_to_str(NMDeviceStateReason reason);
const char *nm_device_state_to_string(NMDeviceState state);
const char *nm_device_state_reason_to_string(NMDeviceStateReason reason);
#define nm_device_state_reason_to_str_a(reason) \
NM_UTILS_LOOKUP_STR_A(nm_device_state_reason_to_str, reason)
#define nm_device_state_reason_to_string_a(reason) \
NM_UTILS_LOOKUP_STR_A(nm_device_state_reason_to_string, reason)
static inline NMDeviceStateReason
nm_device_state_reason_check(NMDeviceStateReason reason)
@ -41,7 +41,7 @@ nm_device_state_reason_check(NMDeviceStateReason reason)
#define NM_PENDING_ACTIONPREFIX_QUEUED_STATE_CHANGE "queued-state-change-"
#define NM_PENDING_ACTIONPREFIX_ACTIVATION "activation-"
const char *nm_device_state_queued_state_to_str(NMDeviceState state);
const char *nm_device_state_queued_state_to_string(NMDeviceState state);
/*****************************************************************************/
@ -52,7 +52,7 @@ typedef enum {
NM_DEVICE_MTU_SOURCE_CONNECTION,
} NMDeviceMtuSource;
const char *nm_device_mtu_source_to_str(NMDeviceMtuSource mtu_source);
const char *nm_device_mtu_source_to_string(NMDeviceMtuSource mtu_source);
/*****************************************************************************/
@ -69,7 +69,7 @@ typedef enum _nm_packed {
NM_DEVICE_SYS_IFACE_STATE_REMOVED,
} NMDeviceSysIfaceState;
const char *nm_device_sys_iface_state_to_str(NMDeviceSysIfaceState sys_iface_state);
const char *nm_device_sys_iface_state_to_string(NMDeviceSysIfaceState sys_iface_state);
/*****************************************************************************/
@ -81,7 +81,7 @@ typedef enum {
NM_DEVICE_IP_STATE_FAIL,
} NMDeviceIPState;
const char *nm_device_ip_state_to_str(NMDeviceIPState ip_state);
const char *nm_device_ip_state_to_string(NMDeviceIPState ip_state);
/*****************************************************************************/

78
src/core/devices/nm-device.c
View file

@ -2558,8 +2558,8 @@ nm_device_sys_iface_state_set(NMDevice *self, NMDeviceSysIfaceState sys_iface_st
if (priv->sys_iface_state != sys_iface_state) {
_LOGT(LOGD_DEVICE,
"sys-iface-state: %s -> %s",
nm_device_sys_iface_state_to_str(priv->sys_iface_state),
nm_device_sys_iface_state_to_str(sys_iface_state));
nm_device_sys_iface_state_to_string(priv->sys_iface_state),
nm_device_sys_iface_state_to_string(sys_iface_state));
priv->sys_iface_state_ = sys_iface_state;
}
@ -2909,7 +2909,7 @@ _set_ip_state(NMDevice *self, int addr_family, NMDeviceIPState new_state)
"ip%c-state: set to %d (%s)",
nm_utils_addr_family_to_char(addr_family),
(int) new_state,
nm_device_ip_state_to_str(new_state));
nm_device_ip_state_to_string(new_state));
priv->ip_state_x_[IS_IPv4] = new_state;
@ -6448,9 +6448,9 @@ slave_state_changed(NMDevice * slave,
"slave %s state change %d (%s) -> %d (%s)",
nm_device_get_iface(slave),
slave_old_state,
nm_device_state_to_str(slave_old_state),
nm_device_state_to_string(slave_old_state),
slave_new_state,
nm_device_state_to_str(slave_new_state));
nm_device_state_to_string(slave_new_state));
/* Don't try to enslave slaves until the master is ready */
if (priv->state < NM_DEVICE_STATE_CONFIG)
@ -7762,7 +7762,8 @@ recheck_available(gpointer user_data)
now_available ? "" : "not ",
new_state == NM_DEVICE_STATE_UNAVAILABLE ? "no change required for"
: "will transition to",
nm_device_state_to_str(new_state == NM_DEVICE_STATE_UNAVAILABLE ? state : new_state));
nm_device_state_to_string(new_state == NM_DEVICE_STATE_UNAVAILABLE ? state
: new_state));
priv->recheck_available.available_reason = NM_DEVICE_STATE_REASON_NONE;
priv->recheck_available.unavailable_reason = NM_DEVICE_STATE_REASON_NONE;
@ -9379,7 +9380,7 @@ dhcp4_fail(NMDevice *self, NMDhcpState dhcp_state)
_LOGD(LOGD_DHCP4,
"DHCPv4 failed (ip_state %s, was_active %d)",
nm_device_ip_state_to_str(priv->ip_state_4),
nm_device_ip_state_to_string(priv->ip_state_4),
priv->dhcp_data_4.was_active);
/* The client is always left running after a failure. */
@ -9829,7 +9830,7 @@ dhcp6_fail(NMDevice *self, NMDhcpState dhcp_state)
_LOGD(LOGD_DHCP6,
"DHCPv6 failed (ip_state %s, was_active %d)",
nm_device_ip_state_to_str(priv->ip_state_6),
nm_device_ip_state_to_string(priv->ip_state_6),
priv->dhcp_data_6.was_active);
/* The client is always left running after a failure. */
@ -10626,9 +10627,9 @@ _commit_mtu(NMDevice *self, const NMIP4Config *config)
_LOGT(LOGD_DEVICE,
"mtu: value %u from source '%s' (%u), current source '%s' (%u)%s",
(guint) mtu,
nm_device_mtu_source_to_str(source),
nm_device_mtu_source_to_string(source),
(guint) source,
nm_device_mtu_source_to_str(priv->mtu_source),
nm_device_mtu_source_to_string(priv->mtu_source),
(guint) priv->mtu_source,
force ? " (forced)" : "");
}
@ -10811,7 +10812,7 @@ nm_device_commit_mtu(NMDevice *self)
} else
_LOGT(LOGD_DEVICE,
"mtu: commit-mtu... skip due to state %s",
nm_device_state_to_str(state));
nm_device_state_to_string(state));
}
static void
@ -15019,7 +15020,7 @@ _set_unmanaged_flags(NMDevice * self,
flags,
NM_PRINT_FMT_QUOTED(allow_state_transition,
", reason ",
nm_device_state_reason_to_str_a(reason),
nm_device_state_reason_to_string_a(reason),
transition_state ? ", transition-state" : "",
""));
@ -16032,7 +16033,7 @@ nm_device_cleanup(NMDevice *self, NMDeviceStateReason reason, CleanupType cleanu
else
_LOGD(LOGD_DEVICE,
"deactivating device (reason '%s') [%d]",
nm_device_state_reason_to_str_a(reason),
nm_device_state_reason_to_string_a(reason),
reason);
/* Save whether or not we tried IPv6 for later */
@ -16526,20 +16527,20 @@ _set_state_full(NMDevice *self, NMDeviceState state, NMDeviceStateReason reason,
&& (state != NM_DEVICE_STATE_UNAVAILABLE || !priv->firmware_missing)) {
_LOGD(LOGD_DEVICE,
"state change: %s -> %s (reason '%s', sys-iface-state: '%s'%s)",
nm_device_state_to_str(old_state),
nm_device_state_to_str(state),
nm_device_state_reason_to_str_a(reason),
nm_device_sys_iface_state_to_str(priv->sys_iface_state),
nm_device_state_to_string(old_state),
nm_device_state_to_string(state),
nm_device_state_reason_to_string_a(reason),
nm_device_sys_iface_state_to_string(priv->sys_iface_state),
priv->firmware_missing ? ", missing firmware" : "");
return;
}
_LOGI(LOGD_DEVICE,
"state change: %s -> %s (reason '%s', sys-iface-state: '%s')",
nm_device_state_to_str(old_state),
nm_device_state_to_str(state),
nm_device_state_reason_to_str_a(reason),
nm_device_sys_iface_state_to_str(priv->sys_iface_state));
nm_device_state_to_string(old_state),
nm_device_state_to_string(state),
nm_device_state_reason_to_string_a(reason),
nm_device_sys_iface_state_to_string(priv->sys_iface_state));
/* in order to prevent triggering any callback caused
* by the device not having any pending action anymore
@ -16884,8 +16885,8 @@ queued_state_set(gpointer user_data)
_LOGD(LOGD_DEVICE,
"queue-state[%s, reason:%s, id:%u]: %s",
nm_device_state_to_str(priv->queued_state.state),
nm_device_state_reason_to_str_a(priv->queued_state.reason),
nm_device_state_to_string(priv->queued_state.state),
nm_device_state_reason_to_string_a(priv->queued_state.reason),
priv->queued_state.id,
"change state");
@ -16897,7 +16898,7 @@ queued_state_set(gpointer user_data)
new_reason = priv->queued_state.reason;
nm_device_state_changed(self, new_state, new_reason);
nm_device_remove_pending_action(self, nm_device_state_queued_state_to_str(new_state), TRUE);
nm_device_remove_pending_action(self, nm_device_state_queued_state_to_string(new_state), TRUE);
return G_SOURCE_REMOVE;
}
@ -16914,13 +16915,13 @@ nm_device_queue_state(NMDevice *self, NMDeviceState state, NMDeviceStateReason r
if (priv->queued_state.id && priv->queued_state.state == state) {
_LOGD(LOGD_DEVICE,
"queue-state[%s, reason:%s, id:%u]: %s%s%s%s",
nm_device_state_to_str(priv->queued_state.state),
nm_device_state_reason_to_str_a(priv->queued_state.reason),
nm_device_state_to_string(priv->queued_state.state),
nm_device_state_reason_to_string_a(priv->queued_state.reason),
priv->queued_state.id,
"ignore queuing same state change",
NM_PRINT_FMT_QUOTED(priv->queued_state.reason != reason,
" (reason differs: ",
nm_device_state_reason_to_str_a(reason),
nm_device_state_reason_to_string_a(reason),
")",
""));
return;
@ -16928,20 +16929,20 @@ nm_device_queue_state(NMDevice *self, NMDeviceState state, NMDeviceStateReason r
/* Add pending action for the new state before clearing the queued states, so
* that we don't accidentally pop all pending states and reach 'startup complete' */
nm_device_add_pending_action(self, nm_device_state_queued_state_to_str(state), TRUE);
nm_device_add_pending_action(self, nm_device_state_queued_state_to_string(state), TRUE);
/* We should only ever have one delayed state transition at a time */
if (priv->queued_state.id) {
_LOGW(LOGD_DEVICE,
"queue-state[%s, reason:%s, id:%u]: %s",
nm_device_state_to_str(priv->queued_state.state),
nm_device_state_reason_to_str_a(priv->queued_state.reason),
nm_device_state_to_string(priv->queued_state.state),
nm_device_state_reason_to_string_a(priv->queued_state.reason),
priv->queued_state.id,
"replace previously queued state change");
nm_clear_g_source(&priv->queued_state.id);
nm_device_remove_pending_action(
self,
nm_device_state_queued_state_to_str(priv->queued_state.state),
nm_device_state_queued_state_to_string(priv->queued_state.state),
TRUE);
}
@ -16951,8 +16952,8 @@ nm_device_queue_state(NMDevice *self, NMDeviceState state, NMDeviceStateReason r
_LOGD(LOGD_DEVICE,
"queue-state[%s, reason:%s, id:%u]: %s",
nm_device_state_to_str(state),
nm_device_state_reason_to_str_a(reason),
nm_device_state_to_string(state),
nm_device_state_reason_to_string_a(reason),
priv->queued_state.id,
"queue state change");
}
@ -16967,14 +16968,15 @@ queued_state_clear(NMDevice *self)
_LOGD(LOGD_DEVICE,
"queue-state[%s, reason:%s, id:%u]: %s",
nm_device_state_to_str(priv->queued_state.state),
nm_device_state_reason_to_str_a(priv->queued_state.reason),
nm_device_state_to_string(priv->queued_state.state),
nm_device_state_reason_to_string_a(priv->queued_state.reason),
priv->queued_state.id,
"clear queued state change");
nm_clear_g_source(&priv->queued_state.id);
nm_device_remove_pending_action(self,
nm_device_state_queued_state_to_str(priv->queued_state.state),
TRUE);
nm_device_remove_pending_action(
self,
nm_device_state_queued_state_to_string(priv->queued_state.state),
TRUE);
}
NMDeviceState

2
src/core/nm-manager.c
View file

@ -2867,7 +2867,7 @@ recheck_assume_connection(NMManager *self, NMDevice *device)
_LOG2D(LOGD_DEVICE,
device,
"assume: don't assume due to device state %s",
nm_device_state_to_str(state));
nm_device_state_to_string(state));
return FALSE;
}

2
src/core/nm-policy.c
View file

@ -2059,7 +2059,7 @@ device_state_changed(NMDevice * device,
_LOGD(LOGD_DEVICE,
"blocking autoconnect of connection '%s': %s",
nm_settings_connection_get_id(sett_conn),
NM_UTILS_LOOKUP_STR_A(nm_device_state_reason_to_str,
NM_UTILS_LOOKUP_STR_A(nm_device_state_reason_to_string,
nm_device_state_reason_check(reason)));
nm_settings_connection_autoconnect_blocked_reason_set(sett_conn,
blocked_reason,