From: Takashi Sakamoto Date: Sun, 15 Nov 2020 14:04:32 +0000 (+0900) Subject: hwdep: check whether method argument for GError is available X-Git-Tag: v0.1.99~32 X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=f28e149c0bcedf10e6f49dad46f91fbbb0f96f6c;p=alsa-gobject.git hwdep: check whether method argument for GError is available In Rules for use of GError, the check of arguments for GError may be preferable to avoid to unexpected function call. This commit adds the check. Reference: https://developer.gnome.org/glib/stable/glib-Error-Reporting.html Signed-off-by: Takashi Sakamoto --- diff --git a/src/hwdep/query.c b/src/hwdep/query.c index daefd18..1291628 100644 --- a/src/hwdep/query.c +++ b/src/hwdep/query.c @@ -147,6 +147,7 @@ void alsahwdep_get_device_id_list(guint card_id, guint **entries, g_return_if_fail(entries != NULL); g_return_if_fail(entry_count != NULL); + g_return_if_fail(error == NULL || *error == NULL); prepare_udev_enum(&enumerator, error); if (*error != NULL) @@ -224,6 +225,8 @@ void alsahwdep_get_hwdep_sysname(guint card_id, guint device_id, struct udev *ctx; struct udev_device *dev; + g_return_if_fail(error == NULL || *error == NULL); + length = strlen(HWDEP_SYSNAME_TEMPLATE) + calculate_digits(card_id) + calculate_digits(device_id) + 1; name = g_malloc0(length); @@ -269,6 +272,8 @@ void alsahwdep_get_hwdep_devnode(guint card_id, guint device_id, struct udev_device *dev; const char *node; + g_return_if_fail(error == NULL || *error == NULL); + length = strlen(HWDEP_SYSNAME_TEMPLATE) + calculate_digits(card_id) + calculate_digits(device_id) + 1; name = g_malloc0(length); @@ -370,6 +375,7 @@ void alsahwdep_get_device_info(guint card_id, guint device_id, struct snd_hwdep_info *info; g_return_if_fail(device_info != NULL); + g_return_if_fail(error == NULL || *error == NULL); *device_info = g_object_new(ALSAHWDEP_TYPE_DEVICE_INFO, NULL); hwdep_device_info_refer_private(*device_info, &info);