From: Joerg Sonnenberger <joerg.sonnenberger@gmail.com>
Date: Fri, 25 Jul 2008 02:27:58 +0000 (-0400)
Subject: Drop ARCHIVE_FORMAT_MTREE_V1 and ARCHIVE_FORMAT_MTREE_V2,
X-Git-Tag: v2.6.0~139
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7200debba39625d282acc112e509df27df2a4004;p=thirdparty%2Flibarchive.git

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 3f9f6e1cf..e7bb5f0e5 100644
--- 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 33597e0de..9cd5881d5 100644
--- 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 954f0222a..da1f67fc2 100644
--- 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)));