diff options
| author | Martin Matuska <martin@matuska.org> | 2017-03-16 12:25:53 +0100 |
|---|---|---|
| committer | Martin Matuska <martin@matuska.org> | 2017-03-16 12:26:20 +0100 |
| commit | 59257772460f31e38cf5d52d4d9fafd67427dcf2 (patch) | |
| tree | 0ed7a0aa528e507903edcbbbef4f9aa7b17c3b5a | |
| parent | bea9f9cf03b97018f2398df070193835b3822713 (diff) | |
| download | libarchive-59257772460f31e38cf5d52d4d9fafd67427dcf2.tar.gz | |
Do not treat archive_read_disk_entry_setup_acls() as static
| -rw-r--r-- | libarchive/archive_read_disk_entry_from_file.c | 28 | ||||
| -rw-r--r-- | libarchive/archive_read_disk_private.h | 2 |
2 files changed, 12 insertions, 18 deletions
diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c index 899cb062..181698a8 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 d434d397..4996e161 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 |