From a19ca08bcf26425ba5e064deb03ac56562518b1b Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 1 Feb 2022 22:38:26 +0100 Subject: [PATCH] core/rfkill: rename rfkill_state_to_desc() to nm_rfkill_state_to_string() --- src/core/nm-rfkill-manager.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/core/nm-rfkill-manager.c b/src/core/nm-rfkill-manager.c index 9dcc9fb866..287c0e6b11 100644 --- a/src/core/nm-rfkill-manager.c +++ b/src/core/nm-rfkill-manager.c @@ -78,15 +78,17 @@ nm_rfkill_type_to_string(NMRfkillType type) } static const char * -rfkill_state_to_desc(NMRfkillState rstate) +nm_rfkill_state_to_string(NMRfkillState state) { - if (rstate == 0) + switch (state) { + case NM_RFKILL_STATE_UNBLOCKED: return "unblocked"; - else if (rstate == 1) + case NM_RFKILL_STATE_SOFT_BLOCKED: return "soft-blocked"; - else if (rstate == 2) + case NM_RFKILL_STATE_HARD_BLOCKED: return "hard-blocked"; - return "unknown"; + } + return nm_assert_unreachable_val("unknown"); } static Killswitch * @@ -229,7 +231,7 @@ recheck_killswitches(NMRfkillManager *self) nm_log_dbg(LOGD_RFKILL, "%s rfkill state now '%s'", nm_rfkill_type_to_string(i), - rfkill_state_to_desc(poll_states[i])); + nm_rfkill_state_to_string(poll_states[i])); priv->rfkill_states[i] = poll_states[i]; g_signal_emit(self, signals[RFKILL_CHANGED], 0, i, priv->rfkill_states[i]);