From de3f0bd54eea747b8e8f3fe06cdd11518753f1ed Mon Sep 17 00:00:00 2001
From: Joel Uckelman <juckelman@strozfriedberg.co.uk>
Date: Wed, 7 Jul 2021 18:46:08 +0100
Subject: [PATCH] Type cases should be in the same order as defined in the
enum, for best efficiency.
---
tsk/img/img_open.cpp | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/tsk/img/img_open.cpp b/tsk/img/img_open.cpp
index 6f879e3ca..f9f2e6727 100644
--- a/tsk/img/img_open.cpp
+++ b/tsk/img/img_open.cpp
@@ -230,18 +230,6 @@ tsk_img_open(int num_img,
return NULL;
}
-#if HAVE_LIBVHDI
- case TSK_IMG_TYPE_VHD_VHD:
- img_info = vhdi_open(num_img, images, a_ssize);
- break;
-#endif
-
-#if HAVE_LIBVMDK
- case TSK_IMG_TYPE_VMDK_VMDK:
- img_info = vmdk_open(num_img, images, a_ssize);
- break;
-#endif
-
case TSK_IMG_TYPE_RAW:
img_info = raw_open(num_img, images, a_ssize);
break;
@@ -261,6 +249,18 @@ tsk_img_open(int num_img,
break;
#endif
+#if HAVE_LIBVMDK
+ case TSK_IMG_TYPE_VMDK_VMDK:
+ img_info = vmdk_open(num_img, images, a_ssize);
+ break;
+#endif
+
+#if HAVE_LIBVHDI
+ case TSK_IMG_TYPE_VHD_VHD:
+ img_info = vhdi_open(num_img, images, a_ssize);
+ break;
+#endif
+
default:
tsk_error_reset();
tsk_error_set_errno(TSK_ERR_IMG_UNSUPTYPE);
--
GitLab