From 1f8f09778317304171647965c9f49a0edf293eb8 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 28 Nov 2015 08:52:21 -0600 Subject: [PATCH] procfs: Use dirent.h macros when testing directory entry type --- Documentation | 2 +- configs | 2 +- fs/procfs/fs_procfsproc.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation b/Documentation index 3d2cd73b92..9a469c139e 160000 --- a/Documentation +++ b/Documentation @@ -1 +1 @@ -Subproject commit 3d2cd73b92c99a5880354fe11f5d7f29bc8775e8 +Subproject commit 9a469c139e90739c838009ca1e721e466ad42548 diff --git a/configs b/configs index 18c27d6535..60a36debd0 160000 --- a/configs +++ b/configs @@ -1 +1 @@ -Subproject commit 18c27d653564ec78841d6912597155fde62467c7 +Subproject commit 60a36debd08e046a5e1768ebc5ba5fb17a337c83 diff --git a/fs/procfs/fs_procfsproc.c b/fs/procfs/fs_procfsproc.c index 0d4f3b9945..a988227fd7 100644 --- a/fs/procfs/fs_procfsproc.c +++ b/fs/procfs/fs_procfsproc.c @@ -981,9 +981,9 @@ static int proc_open(FAR struct file *filep, FAR const char *relpath, /* The node must be a file, not a directory */ - if (node->dtype != DTYPE_FILE) + if (!DIRENT_ISFILE(node->dtype)) { - fdbg("ERROR: Path \"%s\" is a directory\n", relpath); + fdbg("ERROR: Path \"%s\" is not a regular file\n", relpath); return -EISDIR; } @@ -1238,7 +1238,7 @@ static int proc_opendir(FAR const char *relpath, FAR struct fs_dirent_s *dir) /* The node must be a directory, not a file */ - if (node->dtype != DTYPE_DIRECTORY) + if (!DIRENT_ISDIRECTORY(node->dtype)) { fdbg("ERROR: Path \"%s\" is not a directory\n", relpath); kmm_free(procdir);