From 22ba1b39888c427233421b29fcc46d6164c503c1 Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Sun, 15 Nov 2020 11:54:07 +0900 Subject: [PATCH] seq: user_client: just return when character device is not opened It's programming mistake when operating without opening character device. This commit uses GLib macro just return in the case with warnings. Signed-off-by: Takashi Sakamoto --- src/seq/user-client.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/seq/user-client.c b/src/seq/user-client.c index 8cffe27..5b5338b 100644 --- a/src/seq/user-client.c +++ b/src/seq/user-client.c @@ -214,15 +214,11 @@ void alsaseq_user_client_get_protocol_version(ALSASeqUserClient *self, g_return_if_fail(ALSASEQ_IS_USER_CLIENT(self)); priv = alsaseq_user_client_get_instance_private(self); + g_return_if_fail(priv->fd >= 0); g_return_if_fail(proto_ver_triplet != NULL); g_return_if_fail(error == NULL || *error == NULL); - if (priv->fd < 0) { - generate_error(error, ENXIO); - return; - } - *proto_ver_triplet = (const guint16 *)priv->proto_ver_triplet; } @@ -592,15 +588,11 @@ void alsaseq_user_client_create_source(ALSASeqUserClient *self, g_return_if_fail(ALSASEQ_IS_USER_CLIENT(self)); priv = alsaseq_user_client_get_instance_private(self); + g_return_if_fail(priv->fd >= 0); g_return_if_fail(gsrc != NULL); g_return_if_fail(error == NULL || *error == NULL); - if (priv->fd < 0) { - generate_error(error, ENXIO); - return; - } - buf = g_malloc0(page_size); *gsrc = g_source_new(&funcs, sizeof(*src)); -- 2.47.3