From: Martin Matuska <martin@matuska.org>
Date: Thu, 16 Mar 2017 11:25:53 +0000 (+0100)
Subject: Do not treat archive_read_disk_entry_setup_acls() as static
X-Git-Tag: v3.3.2~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59257772460f31e38cf5d52d4d9fafd67427dcf2;p=thirdparty%2Flibarchive.git

Do not treat archive_read_disk_entry_setup_acls() as static
---

diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c
index 899cb0626..181698a88 100644
--- a/libarchive/archive_read_disk_entry_from_file.c
+++ b/libarchive/archive_read_disk_entry_from_file.c
@@ -101,10 +101,6 @@ __FBSDID("$FreeBSD");
 #define O_CLOEXEC	0
 #endif
 
-#ifndef ARCHIVE_ACL_SUPPORT
-static int archive_read_disk_entry_setup_acls(struct archive_read_disk *,
-struct archive_entry *, int *fd);
-#endif
 static int setup_mac_metadata(struct archive_read_disk *,
     struct archive_entry *, int *fd);
 static int setup_xattrs(struct archive_read_disk *,
@@ -116,6 +112,18 @@ static int setup_sparse_fiemap(struct archive_read_disk *,
     struct archive_entry *, int *fd);
 #endif
 
+#if !ARCHIVE_ACL_SUPPORT
+int
+archive_read_disk_entry_setup_acls(struct archive_read_disk *a,
+    struct archive_entry *entry, int *fd)
+{
+	(void)a;      /* UNUSED */
+	(void)entry;  /* UNUSED */
+	(void)fd;     /* UNUSED */
+	return (ARCHIVE_OK);
+}
+#endif
+
 int
 archive_read_disk_entry_from_file(struct archive *_a,
     struct archive_entry *entry,
@@ -475,18 +483,6 @@ setup_xattr(struct archive_read_disk *a,
 	return (ARCHIVE_OK);
 }
 
-#ifndef ARCHIVE_ACL_SUPPORT
-static int
-archive_read_disk_entry_setup_acls(struct archive_read_disk *a,
-    struct archive_entry *entry, int *fd)
-{
-	(void)a;      /* UNUSED */
-	(void)entry;  /* UNUSED */
-	(void)fd;     /* UNUSED */
-	return (ARCHIVE_OK);
-}
-#endif
-
 static int
 setup_xattrs(struct archive_read_disk *a,
     struct archive_entry *entry, int *fd)
diff --git a/libarchive/archive_read_disk_private.h b/libarchive/archive_read_disk_private.h
index d434d3979..4996e161e 100644
--- a/libarchive/archive_read_disk_private.h
+++ b/libarchive/archive_read_disk_private.h
@@ -88,10 +88,8 @@ struct archive_read_disk {
 	void	*excluded_cb_data;
 };
 
-#if ARCHIVE_ACL_SUPPORT
 int
 archive_read_disk_entry_setup_acls(struct archive_read_disk *,
     struct archive_entry *, int *);
-#endif
 
 #endif