summaryrefslogtreecommitdiff
path: root/libacl
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@linbit.com>2011-04-04 17:18:38 +0200
committerAndreas Gruenbacher <agruen@linbit.com>2011-04-04 18:42:19 +0200
commitad4ca5aaee96e98b2e8e8a4351fa5e6c58d65216 (patch)
tree4a90e2e2872e52ddf425711f89072dc0495b93a9 /libacl
parent6bf5e24d48077db58b389e90558100fc121b8134 (diff)
downloadacl-ad4ca5aaee96e98b2e8e8a4351fa5e6c58d65216.tar.gz
Minor fixes to the previous commit
* Assign the new libacl version ACL_1.2 to acl_extended_file_nofollow so that package managers will end up with the appropriate dependencies. * Add a manpage entry for acl_extended_file_nofollow which sources ("links to") the acl_extended_file manpage. * Remove the prototype for getxattr/lgetxattr. * Whitespace cleanups.
Diffstat (limited to 'libacl')
-rw-r--r--libacl/__acl_extended_file.c7
-rw-r--r--libacl/__acl_extended_file.h7
-rw-r--r--libacl/acl_extended_file_nofollow.c3
3 files changed, 8 insertions, 9 deletions
diff --git a/libacl/__acl_extended_file.c b/libacl/__acl_extended_file.c
index 629afe9..3e45abd 100644
--- a/libacl/__acl_extended_file.c
+++ b/libacl/__acl_extended_file.c
@@ -1,5 +1,5 @@
/*
- File: acl_extended_file.c
+ File: __acl_extended_file.c
Copyright (C) 2000, 2011
Andreas Gruenbacher, <a.gruenbacher@bestbits.at>
@@ -29,7 +29,9 @@
int
-__acl_extended_file(const char *path_p, getxattr_t fun)
+__acl_extended_file(const char *path_p,
+ ssize_t (*fun)(const char *, const char *,
+ void *, size_t))
{
int base_size = sizeof(acl_ea_header) + 3 * sizeof(acl_ea_entry);
int retval;
@@ -46,4 +48,3 @@ __acl_extended_file(const char *path_p, getxattr_t fun)
return 1;
return 0;
}
-
diff --git a/libacl/__acl_extended_file.h b/libacl/__acl_extended_file.h
index f8881a1..0b0da9e 100644
--- a/libacl/__acl_extended_file.h
+++ b/libacl/__acl_extended_file.h
@@ -1,4 +1,3 @@
-typedef ssize_t (*getxattr_t)(const char *, const char *, void *value,
- size_t size);
-
-int __acl_extended_file(const char *path_p, getxattr_t fun);
+int __acl_extended_file(const char *path_p,
+ ssize_t (*)(const char *, const char *,
+ void *, size_t));
diff --git a/libacl/acl_extended_file_nofollow.c b/libacl/acl_extended_file_nofollow.c
index 8f4711f..c253e4d 100644
--- a/libacl/acl_extended_file_nofollow.c
+++ b/libacl/acl_extended_file_nofollow.c
@@ -1,5 +1,5 @@
/*
- File: acl_extended_file.c
+ File: acl_extended_file_nofollow.c
Copyright (C) 2011
Andreas Gruenbacher, <a.gruenbacher@bestbits.at>
@@ -31,4 +31,3 @@ acl_extended_file_nofollow(const char *path_p)
{
return __acl_extended_file(path_p, lgetxattr);
}
-