diff options
| author | kientzle <kientzle@FreeBSD.org> | 2008-09-18 04:13:36 +0000 |
|---|---|---|
| committer | kientzle <kientzle@FreeBSD.org> | 2008-09-18 04:13:36 +0000 |
| commit | 97219c55ce56f2fca97d4b2c1d157ade3083c500 (patch) | |
| tree | 1094cdde93905eac047f156aa47b4b0e6ddf7615 /lib | |
| parent | 50e1fe5cffb745ca3d7fb014c14ddcda07f0595f (diff) | |
| download | FreeBSD-src-97219c55ce56f2fca97d4b2c1d157ade3083c500.zip FreeBSD-src-97219c55ce56f2fca97d4b2c1d157ade3083c500.tar.gz | |
Trying to distinguish different "versions" of mtree files was a silly idea.
Submitted by: Joerg Sonnenberger
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libarchive/archive.h | 2 | ||||
| -rw-r--r-- | lib/libarchive/archive_read_support_format_mtree.c | 2 | ||||
| -rw-r--r-- | lib/libarchive/test/test_read_format_mtree.c | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/lib/libarchive/archive.h b/lib/libarchive/archive.h index d383ab5..25bc08a 100644 --- a/lib/libarchive/archive.h +++ b/lib/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/lib/libarchive/archive_read_support_format_mtree.c b/lib/libarchive/archive_read_support_format_mtree.c index 3b82752..a94e488 100644 --- a/lib/libarchive/archive_read_support_format_mtree.c +++ b/lib/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/lib/libarchive/test/test_read_format_mtree.c b/lib/libarchive/test/test_read_format_mtree.c index f900e4c..2b858ad 100644 --- a/lib/libarchive/test/test_read_format_mtree.c +++ b/lib/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))); |
