From: Tim Kientzle <kientzle@gmail.com>
Date: Sun, 2 May 2010 03:54:02 +0000 (-0400)
Subject: Move the private ACL parser declaration out of the public header.
X-Git-Tag: v3.0.0a~1039
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=297b2992e6a3e354368e3f4ea32eaa1978db7a45;p=thirdparty%2Flibarchive.git

Move the private ACL parser declaration out of the public header.
It should never have been here in the first place.

SVN-Revision: 2354
---

diff --git a/libarchive/archive_entry.h b/libarchive/archive_entry.h
index d23414cdd..44bbbeec1 100644
--- a/libarchive/archive_entry.h
+++ b/libarchive/archive_entry.h
@@ -408,21 +408,6 @@ __LA_DECL const wchar_t	*archive_entry_acl_text_w(struct archive_entry *,
 /* Return a count of entries matching 'want_type' */
 __LA_DECL int	 archive_entry_acl_count(struct archive_entry *, int /* want_type */);
 
-/*
- * Private ACL parser.  This is private because it handles some
- * very weird formats that clients should not be messing with.
- * Clients should only deal with their platform-native formats.
- * Because of the need to support many formats cleanly, new arguments
- * are likely to get added on a regular basis.  Clients who try to use
- * this interface are likely to be surprised when it changes.
- *
- * You were warned!
- *
- * TODO: Move this declaration out of the public header and into
- * a private header.  Warnings above are silly.
- */
-__LA_DECL int		 __archive_entry_acl_parse_w(struct archive_entry *,
-		    const wchar_t *, int /* type */);
 
 /*
  * extended attributes
diff --git a/libarchive/archive_entry_private.h b/libarchive/archive_entry_private.h
index 704075d62..c7c2154c8 100644
--- a/libarchive/archive_entry_private.h
+++ b/libarchive/archive_entry_private.h
@@ -192,5 +192,15 @@ struct archive_entry {
 	char		 strmode[12];
 };
 
+/*
+ * Private ACL parser.  This is private because it handles some
+ * very weird formats that clients should not be messing with.
+ * Clients should only deal with their platform-native formats.
+ * Because of the need to support many formats cleanly, new arguments
+ * are likely to get added on a regular basis.  Clients who try to use
+ * this interface are likely to be surprised when it changes.
+ */
+int		 __archive_entry_acl_parse_w(struct archive_entry *,
+		    const wchar_t *, int /* type */);
 
 #endif /* ARCHIVE_ENTRY_PRIVATE_H_INCLUDED */
diff --git a/libarchive/archive_read_support_format_tar.c b/libarchive/archive_read_support_format_tar.c
index 5719a43d5..557439d09 100644
--- a/libarchive/archive_read_support_format_tar.c
+++ b/libarchive/archive_read_support_format_tar.c
@@ -69,6 +69,7 @@ static size_t wcslen(const wchar_t *s)
 
 #include "archive.h"
 #include "archive_entry.h"
+#include "archive_entry_private.h" /* For ACL parsing routines. */
 #include "archive_private.h"
 #include "archive_read_private.h"