aboutsummaryrefslogtreecommitdiffstats
path: root/libarchive/archive_entry_locale.h
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2016-12-30 01:27:27 +0000
committerMartin Matuska <mm@FreeBSD.org>2016-12-30 01:27:27 +0000
commitdc8e86c53b2b64153a65a95fc8d0ac06c7e08f9a (patch)
treeeb0dc6939db602762104f47188462fb878a2f4f5 /libarchive/archive_entry_locale.h
parentcda329a1ca4579ea4cef22edbcc299737dd8cb76 (diff)
downloadsrc-dc8e86c53b2b64153a65a95fc8d0ac06c7e08f9a.tar.gz
src-dc8e86c53b2b64153a65a95fc8d0ac06c7e08f9a.zip
Update vendor/libarchive to git to 379867ecb330b3a952fb7bfa7bffb7bbd5547205
Vendor changes: PR #771: Add NFSv4 ACL support to pax and restricted pax
Notes
Notes: svn path=/vendor/libarchive/dist/; revision=310796
Diffstat (limited to 'libarchive/archive_entry_locale.h')
-rw-r--r--libarchive/archive_entry_locale.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/libarchive/archive_entry_locale.h b/libarchive/archive_entry_locale.h
index 02e024ae20c1..c7c90088822d 100644
--- a/libarchive/archive_entry_locale.h
+++ b/libarchive/archive_entry_locale.h
@@ -63,9 +63,14 @@ int _archive_entry_uname_l(struct archive_entry *,
const char **, size_t *, struct archive_string_conv *);
#define archive_entry_acl_text_l _archive_entry_acl_text_l
int _archive_entry_acl_text_l(struct archive_entry *, int,
- const char **, size_t *, struct archive_string_conv *);
-
-
+const char **, size_t *, struct archive_string_conv *)
+__attribute__ ((deprecated));
+#define archive_entry_acl_to_text_l _archive_entry_acl_to_text_l
+char *_archive_entry_acl_to_text_l(struct archive_entry *, ssize_t *, int,
+ struct archive_string_conv *);
+#define archive_entry_acl_from_text_l _archive_entry_acl_from_text_l
+int _archive_entry_acl_from_text_l(struct archive_entry *, const char* text,
+ int type, struct archive_string_conv *);
#define archive_entry_copy_gname_l _archive_entry_copy_gname_l
int _archive_entry_copy_gname_l(struct archive_entry *,
const char *, size_t, struct archive_string_conv *);