Introduce virDirOpenQuiet

A helper function that does not report any errors.

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index a5b2f03eb970af280d252af163753f2c504c5573..ef30f7f7365b07346d115e91ab262535854b02a7 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1497,6 +1497,7 @@ virDirClose;
 virDirCreate;
 virDirOpen;
 virDirOpenIfExists;
+virDirOpenQuiet;
 virDirRead;
 virFileAbsPath;
 virFileAccessibleAs;

diff --git a/src/util/virfile.c b/src/util/virfile.c
index ed044ba9c65d2afc92cbbd417e6437ffb102224e..84df1824d803ca51c47f904a2b95082b8b561603 100644 (file)
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -2723,10 +2723,13 @@ virFileRemove(const char *path,
 #endif /* WIN32 */
 
 static int
-virDirOpenInternal(DIR **dirp, const char *name, bool ignoreENOENT)
+virDirOpenInternal(DIR **dirp, const char *name, bool ignoreENOENT, bool quiet)
 {
     *dirp = opendir(name);
     if (!*dirp) {
+        if (quiet)
+            return -1;
+
         if (ignoreENOENT && errno == ENOENT)
             return 0;
         virReportSystemError(errno, _("cannot open directory '%s'"), name);
@@ -2746,7 +2749,7 @@ virDirOpenInternal(DIR **dirp, const char *name, bool ignoreENOENT)
 int
 virDirOpen(DIR **dirp, const char *name)
 {
-    return virDirOpenInternal(dirp, name, false);
+    return virDirOpenInternal(dirp, name, false, false);
 }
 
 /**
@@ -2761,7 +2764,23 @@ virDirOpen(DIR **dirp, const char *name)
 int
 virDirOpenIfExists(DIR **dirp, const char *name)
 {
-    return virDirOpenInternal(dirp, name, true);
+    return virDirOpenInternal(dirp, name, true, false);
+}
+
+/**
+ * virDirOpenQuiet
+ * @dirp: directory stream
+ * @name: path of the directory
+ *
+ * Returns 1 on success.
+ *        -1 on failure.
+ *
+ * Does not report any errors and errno is preserved.
+ */
+int
+virDirOpenQuiet(DIR **dirp, const char *name)
+{
+    return virDirOpenInternal(dirp, name, false, true);
 }
 
 /**

diff --git a/src/util/virfile.h b/src/util/virfile.h
index 42c65f2d1be3b1b24af022fe2d94278e10af33aa..b4ae6ea5f1922bfc4d269f74c193b34394a62d4c 100644 (file)
--- a/src/util/virfile.h
+++ b/src/util/virfile.h
@@ -234,6 +234,8 @@ int virDirOpen(DIR **dirp, const char *dirname)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK;
 int virDirOpenIfExists(DIR **dirp, const char *dirname)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK;
+int virDirOpenQuiet(DIR **dirp, const char *dirname)
+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK;
 int virDirRead(DIR *dirp, struct dirent **ent, const char *dirname)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK;
 void virDirClose(DIR **dirp)