]> git.alsa-project.org Git - alsa-gobject.git/commitdiff
ctl: query: simplify count check
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>
Sun, 15 Nov 2020 14:04:32 +0000 (23:04 +0900)
committer坂本 貴史 <o-takashi@sakamocchi.jp>
Sun, 15 Nov 2020 23:57:30 +0000 (08:57 +0900)
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>
src/ctl/query.c

index dcd2cd33bf74c5de010f21695cc809631d89f269..3cf99c901bb94c9304ddd52a04ca1644e7be9b7b 100644 (file)
@@ -165,12 +165,9 @@ void alsactl_get_card_id_list(guint **entries, gsize *entry_count,
             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);