From 97d3d21afe71a41a756f66accce13c4e71e5962c Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Mon, 16 Nov 2020 11:45:41 +0900 Subject: [PATCH] rawmidi: stream_pair: 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/rawmidi/stream-pair.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/rawmidi/stream-pair.c b/src/rawmidi/stream-pair.c index 04fe5d3..77cb257 100644 --- a/src/rawmidi/stream-pair.c +++ b/src/rawmidi/stream-pair.c @@ -254,15 +254,11 @@ void alsarawmidi_stream_pair_get_protocol_version(ALSARawmidiStreamPair *self, g_return_if_fail(ALSARAWMIDI_IS_STREAM_PAIR(self)); priv = alsarawmidi_stream_pair_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; } @@ -574,15 +570,11 @@ void alsarawmidi_stream_pair_create_source(ALSARawmidiStreamPair *self, g_return_if_fail(ALSARAWMIDI_IS_STREAM_PAIR(self)); priv = alsarawmidi_stream_pair_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; - } - access_modes = fcntl(priv->fd, F_GETFL); if (access_modes < 0) { generate_error(error, errno); -- 2.47.3