Rename is_directory() to is_path_directory() in preparation for other stuff.

diff --git a/src/apply-default-acl.c b/src/apply-default-acl.c
index 7058e6263d99f2493772f04733bb9b8eebe11d81..4a6ef765e10379d213661dacf39d8a08636cb20c 100644 (file)
--- a/src/apply-default-acl.c
+++ b/src/apply-default-acl.c
@@ -158,7 +158,7 @@ bool path_accessible(const char* path) {
  *
  * @return true if @c path is a directory, false otherwise.
  */
-bool is_directory(const char* path) {
+bool is_path_directory(const char* path) {
   if (path == NULL) {
     return false;
   }
@@ -456,7 +456,7 @@ int acl_execute_masked(acl_t acl) {
  */
 int any_can_execute_or_dir(const char* path) {
 
-  if (is_directory(path)) {
+  if (is_path_directory(path)) {
     /* That was easy... */
     return ACL_SUCCESS;
   }
@@ -569,7 +569,7 @@ int assign_default_acl(const char* path, acl_t acl) {
     return ACL_ERROR;
   }
 
-  if (!is_directory(path)) {
+  if (!is_path_directory(path)) {
     return ACL_FAILURE;
   }
 
@@ -708,7 +708,7 @@ int apply_default_acl(const char* path, bool no_exec_mask) {
     return ACL_FAILURE;
   }
 
-  if (!is_regular_file(path) && !is_directory(path)) {
+  if (!is_regular_file(path) && !is_path_directory(path)) {
     return ACL_FAILURE;
   }
 
@@ -718,7 +718,7 @@ int apply_default_acl(const char* path, bool no_exec_mask) {
   path_copy[PATH_MAX-1] = 0;
 
   char* parent = dirname(path_copy);
-  if (!is_directory(parent)) {
+  if (!is_path_directory(parent)) {
     /* Make sure dirname() did what we think it did. */
     return ACL_FAILURE;
   }
@@ -967,7 +967,7 @@ int apply_default_acl_nftw_x(const char *target,
  */
 bool apply_default_acl_recursive(const char *target, bool no_exec_mask) {
 
-  if (!is_directory(target)) {
+  if (!is_path_directory(target)) {
     return apply_default_acl(target, no_exec_mask);
   }