[PATCH acl] libacl: rename internal __apply_mask_to_mode with __acl_ prefix

[Mike Frysinger]

While this is already using a __ prefix to avoid symbol collisions
when static linking, move it to __acl_ to align with all the other
symbols we internalize.
---
 libacl/__apply_mask_to_mode.c | 4 ++--
 libacl/libacl.h               | 2 +-
 libacl/perm_copy_fd.c         | 2 +-
 libacl/perm_copy_file.c       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libacl/__apply_mask_to_mode.c b/libacl/__apply_mask_to_mode.c
index 70fb6e61e5cc..a281d48b4594 100644
--- a/libacl/__apply_mask_to_mode.c
+++ b/libacl/__apply_mask_to_mode.c
@@ -1,5 +1,5 @@
 /*
-  File: __apply_mask_to_mode.c
+  File: __acl_apply_mask_to_mode.c
   (Linux Access Control List Management)
 
   Copyright (C) 1999-2002
@@ -27,7 +27,7 @@
     defined (HAVE_ACL_GET_ENTRY) && defined(HAVE_ACL_GET_TAG_TYPE) && \
     defined (HAVE_ACL_GET_PERMSET) && defined(HAVE_ACL_GET_PERM)
 int
-__apply_mask_to_mode(mode_t *mode, acl_t acl)
+__acl_apply_mask_to_mode(mode_t *mode, acl_t acl)
 {
        acl_entry_t entry;
        int entry_id=ACL_FIRST_ENTRY;
diff --git a/libacl/libacl.h b/libacl/libacl.h
index 7cb7e3322a32..1e4152c5c8f1 100644
--- a/libacl/libacl.h
+++ b/libacl/libacl.h
@@ -142,7 +142,7 @@ extern void __acl_free_acl_obj(acl_obj *acl_obj_p) hidden;
 extern char *__acl_to_any_text(acl_t acl, ssize_t *len_p,
                               const char *prefix, char separator,
                               const char *suffix, int options) hidden;
-extern int __apply_mask_to_mode(mode_t *mode, acl_t acl) hidden;
+extern int __acl_apply_mask_to_mode(mode_t *mode, acl_t acl) hidden;
 
 #define FOREACH_ACL_ENTRY(entry_obj_p, acl_obj_p) \
        for( (entry_obj_p) = (acl_obj_p)->anext; \
diff --git a/libacl/perm_copy_fd.c b/libacl/perm_copy_fd.c
index 701bed2532e4..f85b38f55942 100644
--- a/libacl/perm_copy_fd.c
+++ b/libacl/perm_copy_fd.c
@@ -176,7 +176,7 @@ perm_copy_fd (const char *src_path, int src_fd,
 
        if (acl_set_fd (dst_fd, acl) != 0) {
                int saved_errno = errno;
-               __apply_mask_to_mode(&st.st_mode, acl);
+               __acl_apply_mask_to_mode(&st.st_mode, acl);
                ret = fchmod (dst_fd, st.st_mode);
                if ((errno != ENOSYS && errno != ENOTSUP) ||
                    acl_entries (acl) != 3) {
diff --git a/libacl/perm_copy_file.c b/libacl/perm_copy_file.c
index ba59d3647952..4e5e63a3a701 100644
--- a/libacl/perm_copy_file.c
+++ b/libacl/perm_copy_file.c
@@ -189,7 +189,7 @@ perm_copy_file (const char *src_path, const char *dst_path,
 
        if (acl_set_file (dst_path, ACL_TYPE_ACCESS, acl) != 0) {
                int saved_errno = errno;
-               __apply_mask_to_mode(&st.st_mode, acl);
+               __acl_apply_mask_to_mode(&st.st_mode, acl);
                ret = chmod (dst_path, st.st_mode);
                if ((errno != ENOSYS && errno != ENOTSUP) ||
                    acl_entries (acl) != 3) {
-- 
2.43.0