Allow for holes in tapdisk_disk_types.

Signed-off-by: Daniel Stodden <daniel.stodden@citrix.com>

diff --git a/drivers/tapdisk-disktype.c b/drivers/tapdisk-disktype.c
index af8a5aaff49d16361b5219e12d9594527d02da5c..158cd5f104a84f67eb67243e047259382b515596 100644 (file)
--- a/drivers/tapdisk-disktype.c
+++ b/drivers/tapdisk-disktype.c
@@ -154,13 +154,19 @@ const struct tap_disk *tapdisk_disk_drivers[] = {
        0,
 };
 
+#define ARRAY_SIZE(_a) (sizeof(_a)/sizeof((_a)[0]))
+
 int
 tapdisk_disktype_find(const char *name)
 {
-       const disk_info_t *info;
        int i;
 
-       for (i = 0; info = tapdisk_disk_types[i], info != NULL; ++i) {
+       for (i = 0; i < ARRAY_SIZE(tapdisk_disk_types); i++) {
+               const disk_info_t *info = tapdisk_disk_types[i];
+
+               if (!info)
+                       continue;
+
                if (strcmp(name, info->name))
                        continue;