From: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Date: Mon, 16 Nov 2020 02:45:41 +0000 (+0900)
Subject: rawmidi: query: simplify count check
X-Git-Tag: v0.1.99~21
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=465aac1e9c10e10c254513e91bcbc264a4a431c7;p=alsa-gobject.git

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 <o-takashi@sakamocchi.jp>
---

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);