[PATCH v2] ucm: add existence checks to geti calls

cujomalainey at chromium.org cujomalainey at chromium.org
Fri Jan 13 19:50:19 CET 2023


From: Curtis Malainey <cujomalainey at chromium.org>

Right now in snd_use_case_geti you cannot tell if the item being queried
exists or not when being checked. This also means the only way to check
for the existence of something in the client of the library is to
iterate over the list of mods/devs even if we know exactly the name we
are looking for. We have functions that do exactly this internally so
lets return this information in a logical fashion through geti.

Signed-off-by: Curtis Malainey <cujomalainey at chromium.org>
---
 src/ucm/main.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/ucm/main.c b/src/ucm/main.c
index 2ff4d3f3..adbddc26 100644
--- a/src/ucm/main.c
+++ b/src/ucm/main.c
@@ -1321,6 +1321,9 @@ long device_status(snd_use_case_mgr_t *uc_mgr,
 		if (strcmp(dev->name, device_name) == 0)
 			return 1;
 	}
+	dev = find_device(uc_mgr, uc_mgr->active_verb, device_name, 0);
+	if (!dev)
+		return -ENOENT;
 	return 0;
 }
 
@@ -1335,6 +1338,9 @@ long modifier_status(snd_use_case_mgr_t *uc_mgr,
 		if (strcmp(mod->name, modifier_name) == 0)
 			return 1;
 	}
+	mod = find_modifier(uc_mgr, uc_mgr->active_verb, modifier_name, 0);
+	if (!mod)
+		return -ENOENT;
 	return 0;
 }
 
-- 
2.39.0.314.g84b9a713c41-goog



More information about the Alsa-devel mailing list