storage/util: replace unnecessary while loop by if

These while loops exit directly due to break after entering.
Use if instead of these while loops.

Signed-off-by: Jiang Jiacheng <jiangjiacheng@huawei.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c
index 3871718b09036ec2843d250fea7f9abed5280bcf..520fdd03d0340e09c02f55e145427bf0385d3642 100644 (file)
--- a/src/storage/storage_util.c
+++ b/src/storage/storage_util.c
@@ -3784,12 +3784,10 @@ getNewStyleBlockDevice(const char *lun_path,
     if (virDirOpen(&block_dir, block_path) < 0)
         return -1;
 
-    while ((direrr = virDirRead(block_dir, &block_dirent, block_path)) > 0) {
+    if ((direrr = virDirRead(block_dir, &block_dirent, block_path)) > 0) {
         *block_device = g_strdup(block_dirent->d_name);
 
         VIR_DEBUG("Block device is '%s'", *block_device);
-
-        break;
     }
 
     if (direrr < 0)

diff --git a/src/util/virutil.c b/src/util/virutil.c
index 7e246d22d1d72487441f87ce41df347890b63a90..ddc66001cb4f97cbafdcd553ee31f057f8d5ead7 100644 (file)
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -1432,15 +1432,11 @@ virHostHasIOMMU(void)
 {
     g_autoptr(DIR) iommuDir = NULL;
     struct dirent *iommuGroup = NULL;
-    int direrr;
 
     if (virDirOpenQuiet(&iommuDir, "/sys/kernel/iommu_groups/") < 0)
         return false;
 
-    while ((direrr = virDirRead(iommuDir, &iommuGroup, NULL)) > 0)
-        break;
-
-    if (direrr < 0 || !iommuGroup)
+    if (virDirRead(iommuDir, &iommuGroup, NULL) < 0 || !iommuGroup)
         return false;
 
     return true;