From: Laine Stump <laine@laine.org>
Date: Mon, 28 Apr 2014 10:45:15 +0000 (+0300)
Subject: network: use virDirRead in networkMigrateStateFiles
X-Git-Tag: v1.2.4-rc2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4315234445a96272f137a7bba8d4921537eb946;p=thirdparty%2Flibvirt.git

network: use virDirRead in networkMigrateStateFiles

This attempts to follow the same variable name and usage patterns as
the other conversions to virDirRead().
---

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 4e8375dafb..523383374b 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -463,6 +463,7 @@ networkMigrateStateFiles(virNetworkDriverStatePtr driver)
     int ret = -1;
     const char *oldStateDir = LOCALSTATEDIR "/lib/libvirt/network";
     DIR *dir;
+    int direrr;
     struct dirent *entry;
     char *oldPath = NULL, *newPath = NULL;
     char *contents = NULL;
@@ -482,17 +483,7 @@ networkMigrateStateFiles(virNetworkDriverStatePtr driver)
         goto cleanup;
     }
 
-    for (;;) {
-        errno = 0;
-        entry = readdir(dir);
-        if (!entry) {
-            if (errno) {
-                virReportSystemError(errno, _("failed to read directory '%s'"),
-                                     oldStateDir);
-                goto cleanup;
-            }
-            break;
-        }
+    while ((direrr = virDirRead(dir, &entry, oldStateDir)) > 0) {
 
         if (entry->d_type != DT_REG ||
             STREQ(entry->d_name, ".") ||
@@ -520,6 +511,8 @@ networkMigrateStateFiles(virNetworkDriverStatePtr driver)
         VIR_FREE(newPath);
         VIR_FREE(contents);
     }
+    if (direrr < 0)
+       goto cleanup;
 
     ret = 0;
  cleanup: