Prohibit opendir in syntax-check

Prefer virDirOpen.

diff --git a/cfg.mk b/cfg.mk
index e93114c83e18d73086cbb696cb6be1c7b2e52749..0475bd953dd44742caaeb3e822eb6ad2cbde6458 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -421,9 +421,9 @@ sc_prohibit_gethostname:
          $(_sc_search_regexp)
 
 sc_prohibit_readdir:
-       @prohibit='\b(read|close)dir *\('                               \
+       @prohibit='\b(read|close|open)dir *\('                          \
        exclude='exempt from syntax-check'                              \
-       halt='use virDirRead and VIR_DIR_CLOSE'                         \
+       halt='use virDirOpen, virDirRead and VIR_DIR_CLOSE'             \
          $(_sc_search_regexp)
 
 sc_prohibit_gettext_noop:
@@ -1265,3 +1265,6 @@ exclude_file_name_regexp--sc_prohibit_dt_without_code = \
 
 exclude_file_name_regexp--sc_prohibit_always-defined_macros = \
   ^tests/virtestmock.c$$
+
+exclude_file_name_regexp--sc_prohibit_readdir = \
+  ^tests/.*mock\.c$$

diff --git a/src/util/virfile.c b/src/util/virfile.c
index 84df1824d803ca51c47f904a2b95082b8b561603..a45279abf8dfb034bc8ecb5fe0c8ed3a260673ca 100644 (file)
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -2725,7 +2725,7 @@ virFileRemove(const char *path,
 static int
 virDirOpenInternal(DIR **dirp, const char *name, bool ignoreENOENT, bool quiet)
 {
-    *dirp = opendir(name);
+    *dirp = opendir(name); /* exempt from syntax-check */
     if (!*dirp) {
         if (quiet)
             return -1;