From ccb9612e8feba25a1daa7afc0fe2452d5f273f42 Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Mon, 16 Nov 2020 11:45:41 +0900 Subject: [PATCH] rawmidi: query: simplify count check Usually, when creating list of something, count decision at first, then generate items of the list. At last, the number of items is checked as the same as the count. However, it's unlikely to have different number of items. This commit simplifies the count check. Signed-off-by: Takashi Sakamoto --- src/rawmidi/query.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/rawmidi/query.c b/src/rawmidi/query.c index 657594d..4327cb7 100644 --- a/src/rawmidi/query.c +++ b/src/rawmidi/query.c @@ -192,12 +192,9 @@ void alsarawmidi_get_device_id_list(guint card_id, guint **entries, udev_device_unref(dev); } } - if (index != count) { - g_warn_if_reached(); - g_free(*entries); - *entries = NULL; - goto end; - } + + g_warn_if_fail(index == count); + *entry_count = count; qsort(*entries, count, sizeof(guint), compare_guint); -- 2.47.3