Diff between 44bc8f5572f04f128903beabfc225122bc01bbfc and 37267653ed6add1fbf2f05b2380822e176b8c721

Changed Files

File Additions Deletions Status
proximity/monitor.c +9 -4 modified

Full Patch

diff --git a/proximity/monitor.c b/proximity/monitor.c
index ca19a8f..a6bdf34 100644
--- a/proximity/monitor.c
+++ b/proximity/monitor.c
@@ -181,6 +181,13 @@ static void attio_disconnected_cb(gpointer user_data)
 	monitor->attrib = NULL;
 }
 
+static gboolean level_is_valid(const char *level)
+{
+	return (g_str_equal("none", level) ||
+			g_str_equal("mild", level) ||
+			g_str_equal("high", level));
+}
+
 static DBusMessage *set_link_loss_alert(DBusConnection *conn, DBusMessage *msg,
 						const char *level, void *data)
 {
@@ -189,8 +196,7 @@ static DBusMessage *set_link_loss_alert(DBusConnection *conn, DBusMessage *msg,
 	const char *path = device_get_path(device);
 	bdaddr_t sba, dba;
 
-	if (!g_str_equal("none", level) && !g_str_equal("mild", level) &&
-			!g_str_equal("high", level))
+	if (!level_is_valid(level))
 		return btd_error_invalid_args(msg);
 
 	if (g_strcmp0(monitor->linklosslevel, level) == 0)
@@ -217,8 +223,7 @@ static DBusMessage *set_immediate_alert(DBusConnection *conn, DBusMessage *msg,
 	struct monitor *monitor = data;
 	const gchar *path = device_get_path(monitor->device);
 
-	if (!g_str_equal("none", level) && !g_str_equal("mild", level) &&
-			!g_str_equal("high", level))
+	if (!level_is_valid(level))
 		return btd_error_invalid_args(msg);
 
 	if (g_strcmp0(monitor->immediatelevel, level) == 0)