Drop ARCHIVE_FORMAT_MTREE_V1 and ARCHIVE_FORMAT_MTREE_V2,

just use ARCHIVE_FORMAT_MTREE.

SVN-Revision: 153

diff --git a/libarchive/archive.h b/libarchive/archive.h
index 3f9f6e1cf67a9a0b0990befff5055a3f8db63484..e7bb5f0e5687da1f10eff01d12ecde2a55db9cf1 100644 (file)
--- a/libarchive/archive.h
+++ b/libarchive/archive.h
@@ -247,8 +247,6 @@ typedef int archive_close_callback(struct archive *, void *_client_data);
 #define        ARCHIVE_FORMAT_AR_GNU                   (ARCHIVE_FORMAT_AR | 1)
 #define        ARCHIVE_FORMAT_AR_BSD                   (ARCHIVE_FORMAT_AR | 2)
 #define        ARCHIVE_FORMAT_MTREE                    0x80000
-#define        ARCHIVE_FORMAT_MTREE_V1                 (ARCHIVE_FORMAT_MTREE | 1)
-#define        ARCHIVE_FORMAT_MTREE_V2                 (ARCHIVE_FORMAT_MTREE | 2)
 
 /*-
  * Basic outline for reading an archive:

diff --git a/libarchive/archive_read_support_format_mtree.c b/libarchive/archive_read_support_format_mtree.c
index 33597e0de6b89c59a3b556c7f33546e8a05585c0..9cd5881d5338110d1ea5dddd69acd1f21c7cc507 100644 (file)
--- a/libarchive/archive_read_support_format_mtree.c
+++ b/libarchive/archive_read_support_format_mtree.c
@@ -408,7 +408,7 @@ read_mtree(struct archive_read *a, struct mtree *mtree)
        struct mtree_entry *last_entry;
        int r;
 
-       mtree->archive_format = ARCHIVE_FORMAT_MTREE_V1;
+       mtree->archive_format = ARCHIVE_FORMAT_MTREE;
        mtree->archive_format_name = "mtree";
 
        global = NULL;

diff --git a/libarchive/test/test_read_format_mtree.c b/libarchive/test/test_read_format_mtree.c
index 954f0222ad1468523ee3048f17bd938f831da1d1..da1f67fc230ecf9f2c8d1cac3b647ebff06fe452 100644 (file)
--- a/libarchive/test/test_read_format_mtree.c
+++ b/libarchive/test/test_read_format_mtree.c
@@ -60,7 +60,7 @@ DEFINE_TEST(test_read_format_mtree)
        assertEqualIntA(a, ARCHIVE_OK,
            archive_read_open_memory(a, archive, sizeof(archive)));
        assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
-       assertEqualInt(archive_format(a), ARCHIVE_FORMAT_MTREE_V1);
+       assertEqualInt(archive_format(a), ARCHIVE_FORMAT_MTREE);
        assertEqualString(archive_entry_pathname(ae), "file");
        assertEqualInt(archive_entry_uid(ae), 18);
        assert(S_ISREG(archive_entry_mode(ae)));