From 4e2243eb2ac9851861c5ec56613c2a01ce48ca0d Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Sun, 15 Nov 2020 23:04:32 +0900 Subject: [PATCH] hwdep: add checks for method arguments In Rules for use of GError, it's just used for recoverable runtime error, not for programming error. The invalid arguments are a kind of programming error. This commit adds the check for method arguments. Signed-off-by: Takashi Sakamoto --- src/hwdep/query.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/hwdep/query.c b/src/hwdep/query.c index 1291628..4abba68 100644 --- a/src/hwdep/query.c +++ b/src/hwdep/query.c @@ -193,7 +193,7 @@ void alsahwdep_get_device_id_list(guint card_id, guint **entries, } } if (index != count) { - generate_error(error, ENOENT); + g_warn_if_reached(); g_free(*entries); *entries = NULL; goto end; @@ -225,6 +225,7 @@ void alsahwdep_get_hwdep_sysname(guint card_id, guint device_id, struct udev *ctx; struct udev_device *dev; + g_return_if_fail(sysname != NULL); g_return_if_fail(error == NULL || *error == NULL); length = strlen(HWDEP_SYSNAME_TEMPLATE) + calculate_digits(card_id) + @@ -272,6 +273,7 @@ void alsahwdep_get_hwdep_devnode(guint card_id, guint device_id, struct udev_device *dev; const char *node; + g_return_if_fail(devnode != NULL); g_return_if_fail(error == NULL || *error == NULL); length = strlen(HWDEP_SYSNAME_TEMPLATE) + calculate_digits(card_id) + -- 2.47.3