diff options
author | kientzle <kientzle@FreeBSD.org> | 2008-09-01 05:38:33 +0000 |
---|---|---|
committer | kientzle <kientzle@FreeBSD.org> | 2008-09-01 05:38:33 +0000 |
commit | da7b4a0824397b1c724cdf9a9b03b642ef8610ae (patch) | |
tree | 33ffbad3b60850d7aaaa2e6c79990403e110b2c2 /lib/libarchive/test/test_read_format_tar.c | |
parent | 4f7f14505ade23cf1713dac8e039845e724b1326 (diff) | |
download | FreeBSD-src-da7b4a0824397b1c724cdf9a9b03b642ef8610ae.zip FreeBSD-src-da7b4a0824397b1c724cdf9a9b03b642ef8610ae.tar.gz |
Style: Use ARCHIVE_VERSION_NUMBER to conditionalize tests on
the particular libarchive version being tested instead of the
deprecated ARCHIVE_API_VERSION and ARCHIVE_VERSION_STAMP macros.
Diffstat (limited to 'lib/libarchive/test/test_read_format_tar.c')
-rw-r--r-- | lib/libarchive/test/test_read_format_tar.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/libarchive/test/test_read_format_tar.c b/lib/libarchive/test/test_read_format_tar.c index bfe0b13..812f90e 100644 --- a/lib/libarchive/test/test_read_format_tar.c +++ b/lib/libarchive/test/test_read_format_tar.c @@ -75,10 +75,10 @@ static void verifyEmpty(void) assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR); assert(0 == archive_read_close(a)); -#if ARCHIVE_API_VERSION > 1 - assert(0 == archive_read_finish(a)); -#else +#if ARCHIVE_VERSION_NUMBER < 2000000 archive_read_finish(a); +#else + assert(0 == archive_read_finish(a)); #endif } @@ -447,10 +447,10 @@ static void verify(unsigned char *d, size_t s, f(ae); assert(0 == archive_read_close(a)); -#if ARCHIVE_API_VERSION > 1 - assert(0 == archive_read_finish(a)); -#else +#if ARCHIVE_VERSION_NUMBER < 2000000 archive_read_finish(a); +#else + assert(0 == archive_read_finish(a)); #endif free(buff); } |