From: Tim Kientzle <kientzle@gmail.com>
Date: Mon, 27 Jul 2009 04:04:21 +0000 (-0400)
Subject: Prefer AE_* defines for portability.
X-Git-Tag: v2.8.0~496
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=495aa0a88f47daf1b9795fb99838a38daf6b3c08;p=thirdparty%2Flibarchive.git

Prefer AE_* defines for portability.

SVN-Revision: 1287
---

diff --git a/libarchive/test/test_read_extract.c b/libarchive/test/test_read_extract.c
index 152f07744..7d64c414d 100644
--- a/libarchive/test/test_read_extract.c
+++ b/libarchive/test/test_read_extract.c
@@ -96,7 +96,7 @@ DEFINE_TEST(test_read_extract)
 	/* A symlink. */
 	assert((ae = archive_entry_new()) != NULL);
 	archive_entry_copy_pathname(ae, "symlink");
-	archive_entry_set_mode(ae, S_IFLNK | 0755);
+	archive_entry_set_mode(ae, AE_IFLNK | 0755);
 	archive_entry_set_symlink(ae, "file");
 	assertA(0 == archive_write_header(a, ae));
 	archive_entry_free(ae);
diff --git a/libarchive/test/test_write_format_cpio_newc.c b/libarchive/test/test_write_format_cpio_newc.c
index f4dd4dde6..0843ee6cf 100644
--- a/libarchive/test/test_write_format_cpio_newc.c
+++ b/libarchive/test/test_write_format_cpio_newc.c
@@ -99,7 +99,8 @@ DEFINE_TEST(test_write_format_cpio_newc)
 	assert((entry = archive_entry_new()) != NULL);
 	archive_entry_set_mtime(entry, 3, 30);
 	archive_entry_set_pathname(entry, "lnk");
-	archive_entry_set_mode(entry, S_IFLNK | 0664);
+	archive_entry_set_mode(entry, 0664);
+	archive_entry_set_filetype(entry, AE_IFLNK);
 	archive_entry_set_size(entry, 0);
 	archive_entry_set_uid(entry, 83);
 	archive_entry_set_gid(entry, 93);
diff --git a/libarchive/test/test_write_format_cpio_odc.c b/libarchive/test/test_write_format_cpio_odc.c
index 504045d85..7bc3c9927 100644
--- a/libarchive/test/test_write_format_cpio_odc.c
+++ b/libarchive/test/test_write_format_cpio_odc.c
@@ -109,7 +109,8 @@ DEFINE_TEST(test_write_format_cpio_odc)
 	assert((entry = archive_entry_new()) != NULL);
 	archive_entry_set_mtime(entry, 3, 30);
 	archive_entry_set_pathname(entry, "symlink");
-	archive_entry_set_mode(entry, S_IFLNK | 0664);
+	archive_entry_set_mode(entry, 0664);
+	archive_entry_set_filetype(entry, AE_IFLNK);
 	archive_entry_set_symlink(entry,"file");
 	archive_entry_set_size(entry, 0);
 	archive_entry_set_uid(entry, 88);
diff --git a/libarchive/test/test_write_format_tar_ustar.c b/libarchive/test/test_write_format_tar_ustar.c
index 637d27606..0105ad8ca 100644
--- a/libarchive/test/test_write_format_tar_ustar.c
+++ b/libarchive/test/test_write_format_tar_ustar.c
@@ -133,7 +133,8 @@ DEFINE_TEST(test_write_format_tar_ustar)
 	assert((entry = archive_entry_new()) != NULL);
 	archive_entry_set_mtime(entry, 3, 30);
 	archive_entry_set_pathname(entry, "symlink");
-	archive_entry_set_mode(entry, S_IFLNK | 0664);
+	archive_entry_set_mode(entry, 0664);
+	archive_entry_set_filetype(entry, AE_IFLNK);
 	archive_entry_set_symlink(entry,"file");
 	archive_entry_set_size(entry, 0);
 	archive_entry_set_uid(entry, 88);