From: Tim Kientzle Date: Mon, 8 Feb 2010 07:18:22 +0000 (-0500) Subject: Rename archive_read_finish to archive_read_free and X-Git-Tag: v3.0.0a~1268 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9890b31ffd24646469461978c2ea2cbce07f9d51;p=thirdparty%2Flibarchive.git Rename archive_read_finish to archive_read_free and archive_write_finish to archive_write_free. Update all clients, tests, and documentation to use the new names exclusively. (Though I've not yet run a global search-and-replace against the Wiki. I'll do that shortly.) I've preserved the old names as aliases, scheduled to be removed with libarchive 4.x, so there is no immediate impact to existing code from this change. SVN-Revision: 1891 --- diff --git a/contrib/shar/shar.c b/contrib/shar/shar.c index 12c842553..6d5c206e2 100644 --- a/contrib/shar/shar.c +++ b/contrib/shar/shar.c @@ -269,7 +269,7 @@ shar_write(char **fn, size_t nfn) } } - if (archive_write_finish(a) != ARCHIVE_OK) + if (archive_write_free(a) != ARCHIVE_OK) errx(EXIT_FAILURE, "%s", archive_error_string(a)); if (error != 0) diff --git a/cpio/cpio.c b/cpio/cpio.c index cab7f01d8..616b2ea1c 100644 --- a/cpio/cpio.c +++ b/cpio/cpio.c @@ -545,7 +545,7 @@ mode_out(struct cpio *cpio) fprintf(stderr, "%lu %s\n", (unsigned long)blocks, blocks == 1 ? "block" : "blocks"); } - archive_write_finish(cpio->archive); + archive_write_free(cpio->archive); } /* @@ -881,8 +881,8 @@ mode_in(struct cpio *cpio) fprintf(stderr, "%lu %s\n", (unsigned long)blocks, blocks == 1 ? "block" : "blocks"); } - archive_read_finish(a); - archive_write_finish(ext); + archive_read_free(a); + archive_write_free(ext); exit(cpio->return_value); } @@ -956,7 +956,7 @@ mode_list(struct cpio *cpio) fprintf(stderr, "%lu %s\n", (unsigned long)blocks, blocks == 1 ? "block" : "blocks"); } - archive_read_finish(a); + archive_read_free(a); exit(0); } @@ -1092,7 +1092,7 @@ mode_pass(struct cpio *cpio, const char *destdir) blocks == 1 ? "block" : "blocks"); } - archive_write_finish(cpio->archive); + archive_write_free(cpio->archive); } /* diff --git a/examples/minitar/minitar.c b/examples/minitar/minitar.c index 7e9011183..3e466ae96 100644 --- a/examples/minitar/minitar.c +++ b/examples/minitar/minitar.c @@ -289,7 +289,7 @@ create(const char *filename, int compress, const char **argv) argv++; } archive_write_close(a); - archive_write_finish(a); + archive_write_free(a); } #endif @@ -353,7 +353,7 @@ extract(const char *filename, int do_extract, int flags) msg("\n"); } archive_read_close(a); - archive_read_finish(a); + archive_read_free(a); exit(0); } diff --git a/examples/tarfilter.c b/examples/tarfilter.c index b7e08cfc1..976dd056e 100644 --- a/examples/tarfilter.c +++ b/examples/tarfilter.c @@ -105,9 +105,9 @@ main(int argc, char **argv) if (r != ARCHIVE_EOF) die("Error reading archive"); /* Close the archives. */ - if (archive_read_finish(ina) != ARCHIVE_OK) + if (archive_read_free(ina) != ARCHIVE_OK) die("Error closing input archive"); - if (archive_write_finish(outa) != ARCHIVE_OK) + if (archive_write_free(outa) != ARCHIVE_OK) die("Error closing output archive"); return (0); } diff --git a/examples/untar.c b/examples/untar.c index e77adf701..98338e10d 100644 --- a/examples/untar.c +++ b/examples/untar.c @@ -190,7 +190,7 @@ extract(const char *filename, int do_extract, int flags) msg("\n"); } archive_read_close(a); - archive_read_finish(a); + archive_read_free(a); exit(0); } diff --git a/libarchive/archive.h b/libarchive/archive.h index 8ff934a2e..e2c8b8c1f 100644 --- a/libarchive/archive.h +++ b/libarchive/archive.h @@ -482,8 +482,12 @@ __LA_DECL void archive_read_extract_set_skip_file(struct archive *, /* Close the file and release most resources. */ __LA_DECL int archive_read_close(struct archive *); /* Release all resources and destroy the object. */ -/* Note that archive_read_finish will call archive_read_close for you. */ +/* Note that archive_read_free will call archive_read_close for you. */ +__LA_DECL int archive_read_free(struct archive *); +#if ARCHIVE_VERSION_NUMBER < 4000000 +/* Synonym for archive_read_free() for backwards compatibility. */ __LA_DECL int archive_read_finish(struct archive *); +#endif /*- * To create an archive: @@ -498,7 +502,7 @@ __LA_DECL int archive_read_finish(struct archive *); * - archive_write_header to write the header * - archive_write_data to write the entry data * 5) archive_write_close to close the output - * 6) archive_write_finish to cleanup the writer and release resources + * 6) archive_write_free to cleanup the writer and release resources */ __LA_DECL struct archive *archive_write_new(void); __LA_DECL int archive_write_set_bytes_per_block(struct archive *, @@ -573,10 +577,13 @@ __LA_DECL __LA_SSIZE_T archive_write_data_block(struct archive *, #endif __LA_DECL int archive_write_finish_entry(struct archive *); __LA_DECL int archive_write_close(struct archive *); -/* Libarchive 2.x and later returns an error if this fails. */ -/* It can fail if the archive wasn't already closed, in which case - * archive_write_finish() will implicitly call archive_write_close(). */ +/* This can fail if the archive wasn't already closed, in which case + * archive_write_free() will implicitly call archive_write_close(). */ +__LA_DECL int archive_write_free(struct archive *); +#if ARCHIVE_VERSION_NUMBER < 4000000 +/* Synonym for archive_write_free() for backwards compatibility. */ __LA_DECL int archive_write_finish(struct archive *); +#endif /* * Set write options. @@ -603,7 +610,7 @@ __LA_DECL int archive_write_set_options(struct archive *_a, * - construct an appropriate struct archive_entry structure * - archive_write_header to create the file/dir/etc on disk * - archive_write_data to write the entry data - * 4) archive_write_finish to cleanup the writer and release resources + * 4) archive_write_free to cleanup the writer and release resources * * In particular, you can use this in conjunction with archive_read() * to pull entries out of an archive and create them on disk. diff --git a/libarchive/archive_private.h b/libarchive/archive_private.h index 63384b82f..fba3d62a2 100644 --- a/libarchive/archive_private.h +++ b/libarchive/archive_private.h @@ -58,7 +58,7 @@ struct archive_vtable { int (*archive_close)(struct archive *); - int (*archive_finish)(struct archive *); + int (*archive_free)(struct archive *); int (*archive_write_header)(struct archive *, struct archive_entry *); int (*archive_write_finish_entry)(struct archive *); diff --git a/libarchive/archive_read.3 b/libarchive/archive_read.3 index 742bebfab..51eb52e79 100644 --- a/libarchive/archive_read.3 +++ b/libarchive/archive_read.3 @@ -69,7 +69,7 @@ .Nm archive_read_extract2 , .Nm archive_read_extract_set_progress_callback , .Nm archive_read_close , -.Nm archive_read_finish +.Nm archive_read_free .Nd functions for reading streaming archives .Sh SYNOPSIS .In archive.h @@ -196,7 +196,7 @@ .Ft int .Fn archive_read_close "struct archive *" .Ft int -.Fn archive_read_finish "struct archive *" +.Fn archive_read_free "struct archive *" .Sh DESCRIPTION These functions provide a complete API for reading streaming archives. The general process is to first create the @@ -457,7 +457,7 @@ object and the archive_entry object so that various statistics can be retrieved for the progress display. .It Fn archive_read_close Complete the archive and invoke the close callback. -.It Fn archive_read_finish +.It Fn archive_read_free Invokes .Fn archive_read_close if it was not invoked manually, then release all resources. @@ -591,7 +591,7 @@ list_archive(const char *name) printf("%s\\n",archive_entry_pathname(entry)); archive_read_data_skip(a); } - archive_read_finish(a); + archive_read_free(a); free(mydata); } diff --git a/libarchive/archive_read.c b/libarchive/archive_read.c index abb419eea..9ed61efb9 100644 --- a/libarchive/archive_read.c +++ b/libarchive/archive_read.c @@ -60,7 +60,7 @@ static int choose_format(struct archive_read *); static int cleanup_filters(struct archive_read *); static struct archive_vtable *archive_read_vtable(void); static int _archive_read_close(struct archive *); -static int _archive_read_finish(struct archive *); +static int _archive_read_free(struct archive *); static struct archive_vtable * archive_read_vtable(void) @@ -69,7 +69,7 @@ archive_read_vtable(void) static int inited = 0; if (!inited) { - av.archive_finish = _archive_read_finish; + av.archive_free = _archive_read_free; av.archive_close = _archive_read_close; } return (&av); @@ -779,7 +779,7 @@ cleanup_filters(struct archive_read *a) * Release memory and other resources. */ static int -_archive_read_finish(struct archive *_a) +_archive_read_free(struct archive *_a) { struct archive_read *a = (struct archive_read *)_a; int i; @@ -787,7 +787,7 @@ _archive_read_finish(struct archive *_a) int r = ARCHIVE_OK; __archive_check_magic(_a, ARCHIVE_READ_MAGIC, ARCHIVE_STATE_ANY, - "archive_read_finish"); + "archive_read_free"); if (a->archive.state != ARCHIVE_STATE_CLOSED) r = archive_read_close(&a->archive); diff --git a/libarchive/archive_read_disk.3 b/libarchive/archive_read_disk.3 index b3a09b528..c4c4f6277 100644 --- a/libarchive/archive_read_disk.3 +++ b/libarchive/archive_read_disk.3 @@ -39,7 +39,7 @@ .Nm archive_read_disk_set_gname_lookup , .Nm archive_read_disk_set_standard_lookup , .Nm archive_read_close , -.Nm archive_read_finish +.Nm archive_read_free .Nd functions for reading objects from disk .Sh SYNOPSIS .In archive.h @@ -81,7 +81,7 @@ .Ft int .Fn archive_read_close "struct archive *" .Ft int -.Fn archive_read_finish "struct archive *" +.Fn archive_read_free "struct archive *" .Sh DESCRIPTION These functions provide an API for reading information about objects on disk. @@ -178,7 +178,7 @@ This affects the file ownership fields and ACL values in the object. .It Fn archive_read_close This currently does nothing. -.It Fn archive_write_finish +.It Fn archive_write_free Invokes .Fn archive_write_close if it was not invoked manually, then releases all resources. @@ -213,7 +213,7 @@ file_to_archive(struct archive *a, const char *name) while ((bytes_read = read(fd, buff, sizeof(buff))) > 0) archive_write_data(a, buff, bytes_read); archive_write_finish_entry(a); - archive_read_finish(ard); + archive_read_free(ard); archive_entry_free(entry); } .Ed diff --git a/libarchive/archive_read_disk.c b/libarchive/archive_read_disk.c index 8fad7f137..dc43e179c 100644 --- a/libarchive/archive_read_disk.c +++ b/libarchive/archive_read_disk.c @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_read_disk.c 189429 2009-03-06 04 #include "archive_private.h" #include "archive_read_disk_private.h" -static int _archive_read_finish(struct archive *); +static int _archive_read_free(struct archive *); static int _archive_read_close(struct archive *); static const char *trivial_lookup_gname(void *, gid_t gid); static const char *trivial_lookup_uname(void *, uid_t uid); @@ -45,7 +45,7 @@ archive_read_disk_vtable(void) static int inited = 0; if (!inited) { - av.archive_finish = _archive_read_finish; + av.archive_free = _archive_read_free; av.archive_close = _archive_read_close; } return (&av); @@ -129,7 +129,7 @@ archive_read_disk_new(void) } static int -_archive_read_finish(struct archive *_a) +_archive_read_free(struct archive *_a) { struct archive_read_disk *a = (struct archive_read_disk *)_a; diff --git a/libarchive/archive_read_extract.c b/libarchive/archive_read_extract.c index c2f40c54a..b698916fe 100644 --- a/libarchive/archive_read_extract.c +++ b/libarchive/archive_read_extract.c @@ -172,7 +172,7 @@ archive_read_extract_cleanup(struct archive_read *a) { int ret = ARCHIVE_OK; - ret = archive_write_finish(a->extract->ad); + ret = archive_write_free(a->extract->ad); free(a->extract); a->extract = NULL; return (ret); diff --git a/libarchive/archive_virtual.c b/libarchive/archive_virtual.c index 0bd2d5bc7..836886270 100644 --- a/libarchive/archive_virtual.c +++ b/libarchive/archive_virtual.c @@ -42,17 +42,35 @@ archive_read_close(struct archive *a) return ((a->vtable->archive_close)(a)); } +int +archive_write_free(struct archive *a) +{ + return ((a->vtable->archive_free)(a)); +} + +#if ARCHIVE_VERSION_NUMBER < 4000000 +/* For backwards compatibility; will be removed with libarchive 4.0. */ int archive_write_finish(struct archive *a) { - return ((a->vtable->archive_finish)(a)); + return ((a->vtable->archive_free)(a)); +} +#endif + +int +archive_read_free(struct archive *a) +{ + return ((a->vtable->archive_free)(a)); } +#if ARCHIVE_VERSION_NUMBER < 4000000 +/* For backwards compatibility; will be removed with libarchive 4.0. */ int archive_read_finish(struct archive *a) { - return ((a->vtable->archive_finish)(a)); + return ((a->vtable->archive_free)(a)); } +#endif int archive_write_header(struct archive *a, struct archive_entry *entry) diff --git a/libarchive/archive_write.3 b/libarchive/archive_write.3 index ffe0c9b45..9a27409a6 100644 --- a/libarchive/archive_write.3 +++ b/libarchive/archive_write.3 @@ -55,7 +55,7 @@ .Nm archive_write_data , .Nm archive_write_finish_entry , .Nm archive_write_close , -.Nm archive_write_finish +.Nm archive_write_free .Nd functions for creating archives .Sh SYNOPSIS .In archive.h @@ -125,7 +125,7 @@ .Ft int .Fn archive_write_close "struct archive *" .Ft int -.Fn archive_write_finish "struct archive *" +.Fn archive_write_free "struct archive *" .Sh DESCRIPTION These functions provide a complete API for creating streaming archive files. @@ -363,16 +363,16 @@ and as needed. .It Fn archive_write_close Complete the archive and invoke the close callback. -.It Fn archive_write_finish +.It Fn archive_write_free Invokes .Fn archive_write_close -if it was not invoked manually, then releases all resources. -Note that this function was declared to return -.Ft void -in libarchive 1.x, which made it impossible to detect errors when +if necessary, then releases all resources. +If you need detailed information about .Fn archive_write_close -was invoked implicitly from this function. -This is corrected beginning with libarchive 2.0. +failures, you should be careful to call it separately, as +you cannot obtain error information after +.Fn archive_write_free +returns. .El More information about the .Va struct archive @@ -529,7 +529,7 @@ write_archive(const char *outname, const char **filename) archive_entry_free(entry); filename++; } - archive_write_finish(a); + archive_write_free(a); } int main(int argc, const char **argv) @@ -580,7 +580,7 @@ may include .Fn archive_write_data , .Fn archive_write_close , or -.Fn archive_write_finish . +.Fn archive_write_free . The client callback can call .Fn archive_set_error to provide values that can then be retrieved by diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c index e0d942b07..eba722722 100644 --- a/libarchive/archive_write.c +++ b/libarchive/archive_write.c @@ -60,7 +60,7 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_write.c 201099 2009-12-28 03:03: static struct archive_vtable *archive_write_vtable(void); static int _archive_write_close(struct archive *); -static int _archive_write_finish(struct archive *); +static int _archive_write_free(struct archive *); static int _archive_write_header(struct archive *, struct archive_entry *); static int _archive_write_finish_entry(struct archive *); static ssize_t _archive_write_data(struct archive *, const void *, size_t); @@ -73,7 +73,7 @@ archive_write_vtable(void) if (!inited) { av.archive_close = _archive_write_close; - av.archive_finish = _archive_write_finish; + av.archive_free = _archive_write_free; av.archive_write_header = _archive_write_header; av.archive_write_finish_entry = _archive_write_finish_entry; av.archive_write_data = _archive_write_data; @@ -383,13 +383,13 @@ _archive_write_close(struct archive *_a) * Destroy the archive structure. */ static int -_archive_write_finish(struct archive *_a) +_archive_write_free(struct archive *_a) { struct archive_write *a = (struct archive_write *)_a; int r = ARCHIVE_OK; __archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC, - ARCHIVE_STATE_ANY, "archive_write_finish"); + ARCHIVE_STATE_ANY, "archive_write_free"); if (a->archive.state != ARCHIVE_STATE_CLOSED) r = archive_write_close(&a->archive); diff --git a/libarchive/archive_write_disk.3 b/libarchive/archive_write_disk.3 index 5ed4a5038..7bcecc4e0 100644 --- a/libarchive/archive_write_disk.3 +++ b/libarchive/archive_write_disk.3 @@ -38,7 +38,7 @@ .Nm archive_write_data , .Nm archive_write_finish_entry , .Nm archive_write_close , -.Nm archive_write_finish +.Nm archive_write_free .Nd functions for creating objects on disk .Sh SYNOPSIS .In archive.h @@ -73,7 +73,7 @@ .Ft int .Fn archive_write_close "struct archive *" .Ft int -.Fn archive_write_finish "struct archive *" +.Fn archive_write_free "struct archive *" .Sh DESCRIPTION These functions provide a complete API for creating objects on disk from @@ -239,7 +239,7 @@ The .Nm library maintains a list of all such deferred attributes and sets them when this function is invoked. -.It Fn archive_write_finish +.It Fn archive_write_free Invokes .Fn archive_write_close if it was not invoked manually, then releases all resources. @@ -372,4 +372,4 @@ compact implementation when appropriate. There should be a corresponding .Nm archive_read_disk interface that walks a directory heirarchy and returns archive -entry objects. \ No newline at end of file +entry objects. diff --git a/libarchive/archive_write_disk.c b/libarchive/archive_write_disk.c index 885755107..f734037cb 100644 --- a/libarchive/archive_write_disk.c +++ b/libarchive/archive_write_disk.c @@ -255,7 +255,7 @@ static ssize_t write_data_block(struct archive_write_disk *, static struct archive_vtable *archive_write_disk_vtable(void); static int _archive_write_close(struct archive *); -static int _archive_write_finish(struct archive *); +static int _archive_write_free(struct archive *); static int _archive_write_header(struct archive *, struct archive_entry *); static int _archive_write_finish_entry(struct archive *); static ssize_t _archive_write_data(struct archive *, const void *, size_t); @@ -294,7 +294,7 @@ archive_write_disk_vtable(void) if (!inited) { av.archive_close = _archive_write_close; - av.archive_finish = _archive_write_finish; + av.archive_free = _archive_write_free; av.archive_write_header = _archive_write_header; av.archive_write_finish_entry = _archive_write_finish_entry; av.archive_write_data = _archive_write_data; @@ -1325,7 +1325,7 @@ _archive_write_close(struct archive *_a) } static int -_archive_write_finish(struct archive *_a) +_archive_write_free(struct archive *_a) { struct archive_write_disk *a = (struct archive_write_disk *)_a; int ret; diff --git a/libarchive/libarchive.3 b/libarchive/libarchive.3 index 8c19d008a..c292d386f 100644 --- a/libarchive/libarchive.3 +++ b/libarchive/libarchive.3 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD: src/lib/libarchive/libarchive.3,v 1.11 2007/01/09 08:05:56 kientzle Exp $ .\" -.Dd August 19, 2006 +.Dd February 6, 2010 .Dt LIBARCHIVE 3 .Os .Sh NAME @@ -61,13 +61,14 @@ GNU-format tar archives, .It most common cpio archive formats, .It -ISO9660 CD images (with or without RockRidge extensions), +ISO9660 CD images (including RockRidge and Joliet extensions), .It Zip archives. .El The library automatically detects archives compressed with .Xr gzip 1 , .Xr bzip2 1 , +.Xr xz 1 , or .Xr compress 1 and decompresses them transparently. @@ -87,6 +88,8 @@ archives, .It POSIX octet-oriented cpio archives, .It +Zip archive, +.It two different variants of shar archives. .El Pax interchange format is an extension of the tar archive format that @@ -168,12 +171,12 @@ You can use (which works much like the .Xr read 2 system call) -to read this data from the archive. +to read this data from the archive, or +.Fn archive_read_data_block +which provides a slightly more efficient interface. You may prefer to use the higher-level .Fn archive_read_data_skip , which reads and discards the data for this entry, -.Fn archive_read_data_to_buffer , -which reads the data into an in-memory buffer, .Fn archive_read_data_to_file , which copies the data to the provided file descriptor, or .Fn archive_read_extract , @@ -192,7 +195,7 @@ Once you have finished reading data from the archive, you should call .Fn archive_read_close to close the archive, then call -.Fn archive_read_finish +.Fn archive_read_free to release all resources, including all memory allocated by the library. .Pp The @@ -230,12 +233,34 @@ You can then use to write the actual data. .Pp After all entries have been written, use the -.Fn archive_write_finish +.Fn archive_write_free function to release all resources. .Pp The .Xr archive_write 3 manual page provides more detailed calling information for this API. +.Sh WRITING ENTRIES TO DISK +The +.Xr archive_write_disk 3 +API allows you to write +.Xr archive_entry 3 +objects to disk using the same API used by +.Xr archive_write 3 . +The +.Xr archive_write_disk 3 +API is used internally by +.Fn archive_read_extract ; +using it directly can provide greater control over how entries +get written to disk. +This API also makes it possible to share code between +archive-to-archive copy and archive-to-disk extraction +operations. +.Sh READING ENTRIES FROM DISK +The +.Xr archive_read_disk 3 +provides some support for populating +.Xr archive_entry 3 +objects from information in the filesystem. .Sh DESCRIPTION Detailed descriptions of each function are provided by the corresponding manual pages. @@ -259,7 +284,9 @@ In particular, pax interchange format can easily accommodate pathnames in arbitrary character sets that exceed .Va PATH_MAX . .Sh RETURN VALUES -Most functions return zero on success, non-zero on error. +Most functions return +.Cm ARCHIVE_OK +(zero) on success, non-zero on error. The return value indicates the general severity of the error, ranging from .Cm ARCHIVE_WARN , @@ -329,3 +356,14 @@ stored in an is supported by all formats. For example, cpio formats do not support nanosecond timestamps; old tar formats do not support large device numbers. +.Pp +The +.Xr archive_read_disk 3 +API should support iterating over filesystems; +that would make it possible to share code among +disk-to-archive, archive-to-archive, archive-to-disk, +and disk-to-disk operations. +Currently, it only supports reading the +information for a single file. +(Which is still quite useful, as it hides a lot +of system-specific details.) diff --git a/libarchive/test/test_acl_freebsd.c b/libarchive/test/test_acl_freebsd.c index be502067f..8529ca9fb 100644 --- a/libarchive/test/test_acl_freebsd.c +++ b/libarchive/test/test_acl_freebsd.c @@ -242,7 +242,7 @@ DEFINE_TEST(test_acl_freebsd) /* Close the archive. */ assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* Verify the data on disk. */ assertEqualInt(0, stat("test0", &st)); diff --git a/libarchive/test/test_acl_pax.c b/libarchive/test/test_acl_pax.c index d57b6028d..794bc2da8 100644 --- a/libarchive/test/test_acl_pax.c +++ b/libarchive/test/test_acl_pax.c @@ -441,7 +441,7 @@ DEFINE_TEST(test_acl_pax) /* Close out the archive. */ assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* Write out the data we generated to a file for manual inspection. */ assert(NULL != (f = fopen("testout", "wb"))); @@ -500,5 +500,5 @@ DEFINE_TEST(test_acl_pax) /* Close the archive. */ assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_bad_fd.c b/libarchive/test/test_bad_fd.c index 99b74f12b..34331b8b3 100644 --- a/libarchive/test/test_bad_fd.c +++ b/libarchive/test/test_bad_fd.c @@ -33,5 +33,5 @@ DEFINE_TEST(test_bad_fd) assertA(0 == archive_read_support_compression_all(a)); assertA(ARCHIVE_FATAL == archive_read_open_fd(a, -1, 1024)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_compat_bzip2.c b/libarchive/test/test_compat_bzip2.c index 343f451ae..61caa7c21 100644 --- a/libarchive/test/test_compat_bzip2.c +++ b/libarchive/test/test_compat_bzip2.c @@ -72,7 +72,7 @@ compat_bzip2(const char *name) assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR); assertEqualInt(ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_compat_cpio.c b/libarchive/test/test_compat_cpio.c index 8f97036c4..19ce48d58 100644 --- a/libarchive/test/test_compat_cpio.c +++ b/libarchive/test/test_compat_cpio.c @@ -94,7 +94,7 @@ test_compat_cpio_1(void) assertEqualInt(archive_format(a), ARCHIVE_FORMAT_CPIO_SVR4_NOCRC); assertEqualInt(ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_compat_gtar.c b/libarchive/test/test_compat_gtar.c index 75262601a..d3c32dbbe 100644 --- a/libarchive/test/test_compat_gtar.c +++ b/libarchive/test/test_compat_gtar.c @@ -54,7 +54,7 @@ test_compat_gtar_1(void) /* Read first entry. */ assertEqualIntA(a, ARCHIVE_OK, r = archive_read_next_header(a, &ae)); if (r != ARCHIVE_OK) { - archive_read_finish(a); + archive_read_free(a); return; } assertEqualString( @@ -73,7 +73,7 @@ test_compat_gtar_1(void) /* Read second entry. */ assertEqualIntA(a, ARCHIVE_OK, r = archive_read_next_header(a, &ae)); if (r != ARCHIVE_OK) { - archive_read_finish(a); + archive_read_free(a); return; } assertEqualString( @@ -103,7 +103,7 @@ test_compat_gtar_1(void) assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_GNUTAR); assertEqualInt(ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_compat_gzip.c b/libarchive/test/test_compat_gzip.c index a76b2f8f8..b323e694d 100644 --- a/libarchive/test/test_compat_gzip.c +++ b/libarchive/test/test_compat_gzip.c @@ -50,7 +50,7 @@ verify(const char *name) r = archive_read_support_compression_gzip(a); if (r == ARCHIVE_WARN) { skipping("gzip reading not fully supported on this platform"); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); return; } assertEqualIntA(a, ARCHIVE_OK, r); @@ -64,7 +64,7 @@ verify(const char *name) assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); if (r != ARCHIVE_OK) { - archive_read_finish(a); + archive_read_free(a); return; } assertEqualString(n[i], archive_entry_pathname(ae)); @@ -79,7 +79,7 @@ verify(const char *name) assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR); assertEqualInt(ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_compat_lzma.c b/libarchive/test/test_compat_lzma.c index 6aefbc2eb..f35456338 100644 --- a/libarchive/test/test_compat_lzma.c +++ b/libarchive/test/test_compat_lzma.c @@ -111,7 +111,7 @@ compat_lzma(const char *name) r = archive_read_support_compression_lzma(a); if (r == ARCHIVE_WARN) { skipping("lzma reading not fully supported on this platform"); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); return; } assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); @@ -135,7 +135,7 @@ compat_lzma(const char *name) assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR); assertEqualInt(ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_compat_solaris_tar_acl.c b/libarchive/test/test_compat_solaris_tar_acl.c index ca1506a35..0f2355c14 100644 --- a/libarchive/test/test_compat_solaris_tar_acl.c +++ b/libarchive/test/test_compat_solaris_tar_acl.c @@ -124,5 +124,5 @@ DEFINE_TEST(test_compat_solaris_tar_acl) /* Close the archive. */ assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_compat_tar_hardlink.c b/libarchive/test/test_compat_tar_hardlink.c index 8490c9d97..4708cd3e8 100644 --- a/libarchive/test/test_compat_tar_hardlink.c +++ b/libarchive/test/test_compat_tar_hardlink.c @@ -93,7 +93,7 @@ test_compat_tar_hardlink_1(void) assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR); assertEqualInt(ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } DEFINE_TEST(test_compat_tar_hardlink) diff --git a/libarchive/test/test_compat_xz.c b/libarchive/test/test_compat_xz.c index c3b790ffb..e71c06667 100644 --- a/libarchive/test/test_compat_xz.c +++ b/libarchive/test/test_compat_xz.c @@ -50,7 +50,7 @@ compat_xz(const char *name) r = archive_read_support_compression_xz(a); if (r == ARCHIVE_WARN) { skipping("xz reading not fully supported on this platform"); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); return; } assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); @@ -74,7 +74,7 @@ compat_xz(const char *name) assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR); assertEqualInt(ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_compat_zip.c b/libarchive/test/test_compat_zip.c index d7397efd4..1c5747ddf 100644 --- a/libarchive/test/test_compat_zip.c +++ b/libarchive/test/test_compat_zip.c @@ -64,7 +64,7 @@ test_compat_zip_1(void) assertEqualInt(ARCHIVE_OK, archive_read_close(a)); finish: - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_empty_write.c b/libarchive/test/test_empty_write.c index 669c6032f..5495177f2 100644 --- a/libarchive/test/test_empty_write.c +++ b/libarchive/test/test_empty_write.c @@ -61,7 +61,7 @@ DEFINE_TEST(test_empty_write) /* Close out the archive. */ assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); } /* @@ -91,7 +91,7 @@ DEFINE_TEST(test_empty_write) /* Close out the archive. */ assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); } /* @@ -116,5 +116,5 @@ DEFINE_TEST(test_empty_write) /* Close out the archive. */ assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); } diff --git a/libarchive/test/test_extattr_freebsd.c b/libarchive/test/test_extattr_freebsd.c index 4b19d2762..9f4e9d2ef 100644 --- a/libarchive/test/test_extattr_freebsd.c +++ b/libarchive/test/test_extattr_freebsd.c @@ -123,7 +123,7 @@ DEFINE_TEST(test_extattr_freebsd) assertEqualIntA(a, ARCHIVE_WARN, archive_write_close(a)); else assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* Verify the data on disk. */ assertEqualInt(0, stat("test0", &st)); @@ -166,7 +166,7 @@ DEFINE_TEST(test_extattr_freebsd) assertEqualInt(xsize, 5); assertEqualMem(xval, "12345", xsize); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); archive_entry_free(ae); #endif } diff --git a/libarchive/test/test_fuzz.c b/libarchive/test/test_fuzz.c index e5dede932..86b4d0ce1 100644 --- a/libarchive/test/test_fuzz.c +++ b/libarchive/test/test_fuzz.c @@ -97,7 +97,7 @@ DEFINE_TEST(test_fuzz) archive_read_support_format_raw(a)); r = archive_read_open_filename(a, filename, 16384); if (r != ARCHIVE_OK) { - archive_read_finish(a); + archive_read_free(a); skipping("Cannot uncompress %s", filename); continue; } @@ -108,7 +108,7 @@ DEFINE_TEST(test_fuzz) assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); assertEqualInt(ARCHIVE_OK, - archive_read_finish(a)); + archive_read_free(a)); assert(size > 0); failure("Internal buffer is not big enough for " "uncompressed test file: %s", filename); @@ -156,7 +156,7 @@ DEFINE_TEST(test_fuzz) } archive_read_close(a); } - archive_read_finish(a); + archive_read_free(a); } free(image); free(rawimage); diff --git a/libarchive/test/test_open_fd.c b/libarchive/test/test_open_fd.c index 5e118ad8f..3461535ad 100644 --- a/libarchive/test/test_open_fd.c +++ b/libarchive/test/test_open_fd.c @@ -79,7 +79,7 @@ DEFINE_TEST(test_open_fd) /* Close out the archive. */ assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* * Now, read the data back. @@ -110,7 +110,7 @@ DEFINE_TEST(test_open_fd) /* Verify the end of the archive. */ assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); close(fd); @@ -124,5 +124,5 @@ DEFINE_TEST(test_open_fd) assertEqualIntA(a, ARCHIVE_FATAL, archive_read_open_fd(a, 100, 512)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_open_file.c b/libarchive/test/test_open_file.c index 871249d87..5153f5a92 100644 --- a/libarchive/test/test_open_file.c +++ b/libarchive/test/test_open_file.c @@ -67,7 +67,7 @@ DEFINE_TEST(test_open_file) /* Close out the archive. */ assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); fclose(f); /* @@ -102,7 +102,7 @@ DEFINE_TEST(test_open_file) /* Verify the end of the archive. */ assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); fclose(f); } diff --git a/libarchive/test/test_open_filename.c b/libarchive/test/test_open_filename.c index 07224cde1..e0c785229 100644 --- a/libarchive/test/test_open_filename.c +++ b/libarchive/test/test_open_filename.c @@ -62,7 +62,7 @@ DEFINE_TEST(test_open_filename) /* Close out the archive. */ assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* * Now, read the data back. @@ -93,7 +93,7 @@ DEFINE_TEST(test_open_filename) /* Verify the end of the archive. */ assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); /* * Verify some of the error handling. @@ -104,6 +104,6 @@ DEFINE_TEST(test_open_filename) assertEqualIntA(a, ARCHIVE_FATAL, archive_read_open_filename(a, "nonexistent.tar", 512)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_pax_filename_encoding.c b/libarchive/test/test_pax_filename_encoding.c index 5d1a771cf..e9d8f1974 100644 --- a/libarchive/test/test_pax_filename_encoding.c +++ b/libarchive/test/test_pax_filename_encoding.c @@ -77,7 +77,7 @@ test_pax_filename_encoding_1(void) " characters in it without generating a warning"); assertEqualInt(ARCHIVE_OK, archive_read_next_header(a, &entry)); assertEqualString(filename, archive_entry_pathname(entry)); - archive_read_finish(a); + archive_read_free(a); } /* @@ -152,7 +152,7 @@ test_pax_filename_encoding_2(void) archive_entry_free(entry); assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* * Now read the entries back. @@ -178,7 +178,7 @@ test_pax_filename_encoding_2(void) assertEqualString(longname, archive_entry_pathname(entry)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } /* @@ -278,7 +278,7 @@ test_pax_filename_encoding_3(void) archive_entry_free(entry); assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* * Now read the entries back. @@ -322,7 +322,7 @@ test_pax_filename_encoding_3(void) assertEqualInt(ARCHIVE_EOF, archive_read_next_header(a, &entry)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } DEFINE_TEST(test_pax_filename_encoding) diff --git a/libarchive/test/test_read_compress_program.c b/libarchive/test/test_read_compress_program.c index 4e6c610de..6ef7277ae 100644 --- a/libarchive/test/test_read_compress_program.c +++ b/libarchive/test/test_read_compress_program.c @@ -55,7 +55,7 @@ DEFINE_TEST(test_read_compress_program) assertEqualIntA(a, ARCHIVE_FATAL, archive_read_open_memory(a, archive, sizeof(archive))); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); /* * If we have "gzip -d", try using that. @@ -78,7 +78,7 @@ DEFINE_TEST(test_read_compress_program) assertEqualInt(archive_compression(a), ARCHIVE_COMPRESSION_PROGRAM); assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_read_data_large.c b/libarchive/test/test_read_data_large.c index 4ec0e801e..5756d7bfc 100644 --- a/libarchive/test/test_read_data_large.c +++ b/libarchive/test/test_read_data_large.c @@ -73,7 +73,7 @@ DEFINE_TEST(test_read_data_large) /* Close out the archive. */ assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* Check that archive_read_data can handle 10*10^6 at a pop. */ assert((a = archive_read_new()) != NULL); @@ -86,7 +86,7 @@ DEFINE_TEST(test_read_data_large) failure("Read expected 10MB, but data read didn't match what was written"); assert(0 == memcmp(buff2, buff3, sizeof(buff3))); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); /* Check archive_read_data_into_fd */ assert((a = archive_read_new()) != NULL); @@ -102,7 +102,7 @@ DEFINE_TEST(test_read_data_large) assert(tmpfilefd != 0); assertEqualIntA(a, 0, archive_read_data_into_fd(a, tmpfilefd)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); close(tmpfilefd); f = fopen(tmpfilename, "rb"); diff --git a/libarchive/test/test_read_disk.c b/libarchive/test/test_read_disk.c index d52659bb7..b93ef87ac 100644 --- a/libarchive/test/test_read_disk.c +++ b/libarchive/test/test_read_disk.c @@ -164,7 +164,7 @@ DEFINE_TEST(test_read_disk) &umagic, &uname_lookup, &uname_cleanup)); /* Destroy the archive. */ - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); /* Verify our cleanup functions got called. */ assertEqualInt(gmagic, 0x2468); diff --git a/libarchive/test/test_read_disk_entry_from_file.c b/libarchive/test/test_read_disk_entry_from_file.c index ecca778e2..9fe358dce 100644 --- a/libarchive/test/test_read_disk_entry_from_file.c +++ b/libarchive/test/test_read_disk_entry_from_file.c @@ -76,5 +76,5 @@ DEFINE_TEST(test_read_disk_entry_from_file) /* Destroy the archive. */ archive_entry_free(entry); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_read_extract.c b/libarchive/test/test_read_extract.c index da8499448..bf84055a7 100644 --- a/libarchive/test/test_read_extract.c +++ b/libarchive/test/test_read_extract.c @@ -112,7 +112,7 @@ DEFINE_TEST(test_read_extract) } /* Close out the archive. */ assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* Extract the entries to disk. */ assert((a = archive_read_new()) != NULL); @@ -133,7 +133,7 @@ DEFINE_TEST(test_read_extract) } assertA(ARCHIVE_EOF == archive_read_next_header(a, &ae)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); /* Test the entries on disk. */ /* This first entry was extracted with ARCHIVE_EXTRACT_PERM, diff --git a/libarchive/test/test_read_file_nonexistent.c b/libarchive/test/test_read_file_nonexistent.c index 9494dbab6..acb72a1e3 100644 --- a/libarchive/test/test_read_file_nonexistent.c +++ b/libarchive/test/test_read_file_nonexistent.c @@ -31,7 +31,7 @@ DEFINE_TEST(test_read_file_nonexistent) assertEqualInt(ARCHIVE_OK, archive_read_support_format_all(a)); assertEqualInt(ARCHIVE_FATAL, archive_read_open_filename(a, "notexistent.tar", 512)); - archive_read_finish(a); + archive_read_free(a); } diff --git a/libarchive/test/test_read_format_ar.c b/libarchive/test/test_read_format_ar.c index 35939d071..9094d106a 100644 --- a/libarchive/test/test_read_format_ar.c +++ b/libarchive/test/test_read_format_ar.c @@ -83,5 +83,5 @@ DEFINE_TEST(test_read_format_ar) /* Test EOF */ assertA(1 == archive_read_next_header(a, &ae)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_read_format_cpio_afio.c b/libarchive/test/test_read_format_cpio_afio.c index 0d7b79a23..229758ed6 100644 --- a/libarchive/test/test_read_format_cpio_afio.c +++ b/libarchive/test/test_read_format_cpio_afio.c @@ -109,7 +109,7 @@ DEFINE_TEST(test_read_format_cpio_afio) assertA(archive_compression(a) == ARCHIVE_COMPRESSION_NONE); assertA(archive_format(a) == ARCHIVE_FORMAT_CPIO_AFIO_LARGE); assertEqualInt(ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); - + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); + free(p); } diff --git a/libarchive/test/test_read_format_cpio_bin.c b/libarchive/test/test_read_format_cpio_bin.c index 39a7a3d2f..78146ba19 100644 --- a/libarchive/test/test_read_format_cpio_bin.c +++ b/libarchive/test/test_read_format_cpio_bin.c @@ -54,7 +54,7 @@ DEFINE_TEST(test_read_format_cpio_bin) assertA(archive_compression(a) == ARCHIVE_COMPRESSION_NONE); assertA(archive_format(a) == ARCHIVE_FORMAT_CPIO_BIN_LE); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_read_format_cpio_bin_Z.c b/libarchive/test/test_read_format_cpio_bin_Z.c index 95d9ab2fe..5c0765aa9 100644 --- a/libarchive/test/test_read_format_cpio_bin_Z.c +++ b/libarchive/test/test_read_format_cpio_bin_Z.c @@ -51,7 +51,7 @@ DEFINE_TEST(test_read_format_cpio_bin_Z) archive_format_name(a)); assertEqualInt(archive_format(a), ARCHIVE_FORMAT_CPIO_BIN_LE); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_read_format_cpio_bin_be.c b/libarchive/test/test_read_format_cpio_bin_be.c index 8cd59dc5d..11f829564 100644 --- a/libarchive/test/test_read_format_cpio_bin_be.c +++ b/libarchive/test/test_read_format_cpio_bin_be.c @@ -49,7 +49,7 @@ DEFINE_TEST(test_read_format_cpio_bin_be) assertEqualInt(archive_format(a), ARCHIVE_FORMAT_CPIO_BIN_BE); assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_read_format_cpio_bin_bz2.c b/libarchive/test/test_read_format_cpio_bin_bz2.c index d7022c919..a526ed10a 100644 --- a/libarchive/test/test_read_format_cpio_bin_bz2.c +++ b/libarchive/test/test_read_format_cpio_bin_bz2.c @@ -52,7 +52,7 @@ DEFINE_TEST(test_read_format_cpio_bin_bz2) assert(archive_compression(a) == ARCHIVE_COMPRESSION_BZIP2); assert(archive_format(a) == ARCHIVE_FORMAT_CPIO_BIN_LE); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_read_format_cpio_bin_gz.c b/libarchive/test/test_read_format_cpio_bin_gz.c index 4457fb3c6..ecb6bf120 100644 --- a/libarchive/test/test_read_format_cpio_bin_gz.c +++ b/libarchive/test/test_read_format_cpio_bin_gz.c @@ -42,7 +42,7 @@ DEFINE_TEST(test_read_format_cpio_bin_gz) r = archive_read_support_compression_gzip(a); if (r == ARCHIVE_WARN) { skipping("gzip reading not fully supported on this platform"); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); return; } failure("archive_read_support_compression_gzip"); @@ -55,7 +55,7 @@ DEFINE_TEST(test_read_format_cpio_bin_gz) ARCHIVE_COMPRESSION_GZIP); assertEqualInt(archive_format(a), ARCHIVE_FORMAT_CPIO_BIN_LE); assertEqualInt(ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_read_format_cpio_bin_lzma.c b/libarchive/test/test_read_format_cpio_bin_lzma.c index 035b38856..0c15de99c 100644 --- a/libarchive/test/test_read_format_cpio_bin_lzma.c +++ b/libarchive/test/test_read_format_cpio_bin_lzma.c @@ -45,7 +45,7 @@ DEFINE_TEST(test_read_format_cpio_bin_lzma) r = archive_read_support_compression_lzma(a); if (r == ARCHIVE_WARN) { skipping("lzma reading not fully supported on this platform"); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); return; } assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); @@ -55,6 +55,6 @@ DEFINE_TEST(test_read_format_cpio_bin_lzma) assertEqualInt(archive_compression(a), ARCHIVE_COMPRESSION_LZMA); assertEqualInt(archive_format(a), ARCHIVE_FORMAT_CPIO_BIN_LE); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_read_format_cpio_bin_xz.c b/libarchive/test/test_read_format_cpio_bin_xz.c index 813b343fd..4383e7f51 100644 --- a/libarchive/test/test_read_format_cpio_bin_xz.c +++ b/libarchive/test/test_read_format_cpio_bin_xz.c @@ -55,7 +55,7 @@ DEFINE_TEST(test_read_format_cpio_bin_xz) r = archive_read_support_compression_xz(a); if (r == ARCHIVE_WARN) { skipping("xz reading not fully supported on this platform"); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); return; } assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); @@ -65,6 +65,6 @@ DEFINE_TEST(test_read_format_cpio_bin_xz) assertEqualInt(archive_compression(a), ARCHIVE_COMPRESSION_XZ); assertEqualInt(archive_format(a), ARCHIVE_FORMAT_CPIO_BIN_LE); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_read_format_cpio_odc.c b/libarchive/test/test_read_format_cpio_odc.c index 01538b569..4d42e1729 100644 --- a/libarchive/test/test_read_format_cpio_odc.c +++ b/libarchive/test/test_read_format_cpio_odc.c @@ -58,7 +58,7 @@ DEFINE_TEST(test_read_format_cpio_odc) assertA(archive_compression(a) == ARCHIVE_COMPRESSION_NONE); assertA(archive_format(a) == ARCHIVE_FORMAT_CPIO_POSIX); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.c b/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.c index 3b4170cb7..9c0b92e00 100644 --- a/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.c +++ b/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.c @@ -93,7 +93,7 @@ DEFINE_TEST(test_read_format_cpio_svr4_bzip2_rpm) r = archive_read_support_compression_bzip2(a); if (r == ARCHIVE_WARN) { skipping("bzip2 reading not fully supported on this platform"); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); return; } assertEqualIntA(a, ARCHIVE_OK, r); @@ -122,6 +122,6 @@ DEFINE_TEST(test_read_format_cpio_svr4_bzip2_rpm) assertEqualInt(archive_format(a), ARCHIVE_FORMAT_CPIO_SVR4_NOCRC); assertEqualInt(ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_read_format_cpio_svr4_gzip.c b/libarchive/test/test_read_format_cpio_svr4_gzip.c index 8b19a021b..c81b2e593 100644 --- a/libarchive/test/test_read_format_cpio_svr4_gzip.c +++ b/libarchive/test/test_read_format_cpio_svr4_gzip.c @@ -43,7 +43,7 @@ DEFINE_TEST(test_read_format_cpio_svr4_gzip) r = archive_read_support_compression_gzip(a); if (r == ARCHIVE_WARN) { skipping("gzip reading not fully supported on this platform"); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); return; } assertEqualInt(ARCHIVE_OK, archive_read_support_format_all(a)); @@ -55,7 +55,7 @@ DEFINE_TEST(test_read_format_cpio_svr4_gzip) assertEqualInt(archive_format(a), ARCHIVE_FORMAT_CPIO_SVR4_NOCRC); assertEqualInt(ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c b/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c index eb8a38d9d..1be66670b 100644 --- a/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c +++ b/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c @@ -93,7 +93,7 @@ DEFINE_TEST(test_read_format_cpio_svr4_gzip_rpm) r = archive_read_support_compression_gzip(a); if (r == ARCHIVE_WARN) { skipping("gzip reading not fully supported on this platform"); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); return; } assertEqualIntA(a, ARCHIVE_OK, r); @@ -122,6 +122,6 @@ DEFINE_TEST(test_read_format_cpio_svr4_gzip_rpm) assertEqualInt(archive_format(a), ARCHIVE_FORMAT_CPIO_SVR4_NOCRC); assertEqualInt(ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_read_format_cpio_svr4c_Z.c b/libarchive/test/test_read_format_cpio_svr4c_Z.c index 59f920238..912824c49 100644 --- a/libarchive/test/test_read_format_cpio_svr4c_Z.c +++ b/libarchive/test/test_read_format_cpio_svr4c_Z.c @@ -52,7 +52,7 @@ DEFINE_TEST(test_read_format_cpio_svr4c_Z) failure("archive_format_name(a)=\"%s\"", archive_format_name(a)); assertEqualInt(archive_format(a), ARCHIVE_FORMAT_CPIO_SVR4_CRC); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_read_format_empty.c b/libarchive/test/test_read_format_empty.c index 0dc91ac8b..c16b6bb9f 100644 --- a/libarchive/test/test_read_format_empty.c +++ b/libarchive/test/test_read_format_empty.c @@ -39,5 +39,5 @@ DEFINE_TEST(test_read_format_empty) assertA(archive_compression(a) == ARCHIVE_COMPRESSION_NONE); assertA(archive_format(a) == ARCHIVE_FORMAT_EMPTY); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_read_format_gtar_gz.c b/libarchive/test/test_read_format_gtar_gz.c index 3071b1d0b..4140a8a87 100644 --- a/libarchive/test/test_read_format_gtar_gz.c +++ b/libarchive/test/test_read_format_gtar_gz.c @@ -43,7 +43,7 @@ DEFINE_TEST(test_read_format_gtar_gz) r = archive_read_support_compression_gzip(a); if (r == ARCHIVE_WARN) { skipping("gzip reading not fully supported on this platform"); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); return; } assertEqualInt(ARCHIVE_OK, archive_read_support_format_all(a)); @@ -54,7 +54,7 @@ DEFINE_TEST(test_read_format_gtar_gz) ARCHIVE_COMPRESSION_GZIP); assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_GNUTAR); assertEqualInt(ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_read_format_gtar_lzma.c b/libarchive/test/test_read_format_gtar_lzma.c index ab8e5ff59..9e5777173 100644 --- a/libarchive/test/test_read_format_gtar_lzma.c +++ b/libarchive/test/test_read_format_gtar_lzma.c @@ -49,7 +49,7 @@ DEFINE_TEST(test_read_format_gtar_lzma) r = archive_read_support_compression_lzma(a); if (r == ARCHIVE_WARN) { skipping("lzma reading not fully supported on this platform"); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); return; } @@ -68,7 +68,7 @@ DEFINE_TEST(test_read_format_gtar_lzma) assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_GNUTAR); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); finish: - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_read_format_gtar_sparse.c b/libarchive/test/test_read_format_gtar_sparse.c index 5a5ed2504..8ac594671 100644 --- a/libarchive/test/test_read_format_gtar_sparse.c +++ b/libarchive/test/test_read_format_gtar_sparse.c @@ -195,7 +195,7 @@ verify_archive_file(const char *name, struct archive_contents *ac) struct contents *cts = ac->contents; if (!assertEqualIntA(a, 0, archive_read_next_header(a, &ae))) { - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); return; } failure("Name mismatch in archive %s", name); @@ -233,7 +233,7 @@ verify_archive_file(const char *name, struct archive_contents *ac) failure("%s: Unexpected trailing data", name); assert(actual.o <= expect.o); - archive_read_finish(a); + archive_read_free(a); return; } actual.d++; @@ -255,7 +255,7 @@ verify_archive_file(const char *name, struct archive_contents *ac) assertEqualIntA(a, ARCHIVE_EOF, err); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_read_format_iso_gz.c b/libarchive/test/test_read_format_iso_gz.c index 822b969e3..4b7712d8c 100644 --- a/libarchive/test/test_read_format_iso_gz.c +++ b/libarchive/test/test_read_format_iso_gz.c @@ -46,7 +46,7 @@ DEFINE_TEST(test_read_format_iso_gz) ARCHIVE_COMPRESSION_COMPRESS); assertEqualInt(archive_format(a), ARCHIVE_FORMAT_ISO9660); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_read_format_iso_multi_extent.c b/libarchive/test/test_read_format_iso_multi_extent.c index da4f6124e..6a967f058 100644 --- a/libarchive/test/test_read_format_iso_multi_extent.c +++ b/libarchive/test/test_read_format_iso_multi_extent.c @@ -88,7 +88,7 @@ DEFINE_TEST(test_read_format_iso_multi_extent) /* Close the archive. */ assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_read_format_isojoliet_bz2.c b/libarchive/test/test_read_format_isojoliet_bz2.c index 3efe2a38b..15479c640 100644 --- a/libarchive/test/test_read_format_isojoliet_bz2.c +++ b/libarchive/test/test_read_format_isojoliet_bz2.c @@ -129,6 +129,6 @@ DEFINE_TEST(test_read_format_isojoliet_bz2) /* Close the archive. */ assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_read_format_isojoliet_long.c b/libarchive/test/test_read_format_isojoliet_long.c index e5a8d4eed..d8e520e4e 100644 --- a/libarchive/test/test_read_format_isojoliet_long.c +++ b/libarchive/test/test_read_format_isojoliet_long.c @@ -136,6 +136,6 @@ DEFINE_TEST(test_read_format_isojoliet_long) /* Close the archive. */ assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_read_format_isojoliet_rr.c b/libarchive/test/test_read_format_isojoliet_rr.c index 42fe9a847..3c22fce11 100644 --- a/libarchive/test/test_read_format_isojoliet_rr.c +++ b/libarchive/test/test_read_format_isojoliet_rr.c @@ -154,6 +154,6 @@ DEFINE_TEST(test_read_format_isojoliet_rr) /* Close the archive. */ assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_read_format_isorr_bz2.c b/libarchive/test/test_read_format_isorr_bz2.c index 029d3d2f8..f3fc98382 100644 --- a/libarchive/test/test_read_format_isorr_bz2.c +++ b/libarchive/test/test_read_format_isorr_bz2.c @@ -197,7 +197,7 @@ DEFINE_TEST(test_read_format_isorr_bz2) /* Close the archive. */ assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_read_format_isorr_ce.c b/libarchive/test/test_read_format_isorr_ce.c index 22dd12d51..84b2e7743 100644 --- a/libarchive/test/test_read_format_isorr_ce.c +++ b/libarchive/test/test_read_format_isorr_ce.c @@ -217,7 +217,7 @@ DEFINE_TEST(test_read_format_isorr_ce) /* Close the archive. */ assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_read_format_isorr_new_bz2.c b/libarchive/test/test_read_format_isorr_new_bz2.c index ec665aeea..28c2bacdd 100644 --- a/libarchive/test/test_read_format_isorr_new_bz2.c +++ b/libarchive/test/test_read_format_isorr_new_bz2.c @@ -198,7 +198,7 @@ DEFINE_TEST(test_read_format_isorr_new_bz2) /* Close the archive. */ assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_read_format_isorr_rr_moved.c b/libarchive/test/test_read_format_isorr_rr_moved.c index ef300226e..da33e58ac 100644 --- a/libarchive/test/test_read_format_isorr_rr_moved.c +++ b/libarchive/test/test_read_format_isorr_rr_moved.c @@ -264,7 +264,7 @@ DEFINE_TEST(test_read_format_isorr_rr_moved) /* Close the archive. */ assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_read_format_isozisofs_bz2.c b/libarchive/test/test_read_format_isozisofs_bz2.c index 7fcceb9cd..cd0740449 100644 --- a/libarchive/test/test_read_format_isozisofs_bz2.c +++ b/libarchive/test/test_read_format_isozisofs_bz2.c @@ -181,7 +181,7 @@ DEFINE_TEST(test_read_format_isozisofs_bz2) /* Close the archive. */ assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_read_format_mtree.c b/libarchive/test/test_read_format_mtree.c index ce6e92086..e3a3dd281 100644 --- a/libarchive/test/test_read_format_mtree.c +++ b/libarchive/test/test_read_format_mtree.c @@ -106,7 +106,7 @@ test_read_format_mtree1(void) assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); assertEqualInt(ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } static void @@ -131,7 +131,7 @@ test_read_format_mtree2(void) assertEqualInt(archive_entry_filetype(ae), AE_IFDIR); assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); assertEqualInt(ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_read_format_pax_bz2.c b/libarchive/test/test_read_format_pax_bz2.c index af70b3663..54f6fcd09 100644 --- a/libarchive/test/test_read_format_pax_bz2.c +++ b/libarchive/test/test_read_format_pax_bz2.c @@ -60,7 +60,7 @@ DEFINE_TEST(test_read_format_pax_bz2) assertEqualInt(archive_compression(a), ARCHIVE_COMPRESSION_BZIP2); assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_PAX_INTERCHANGE); assertEqualIntA(a,ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_read_format_raw.c b/libarchive/test/test_read_format_raw.c index cd5f00ee1..a21e4ea96 100644 --- a/libarchive/test/test_read_format_raw.c +++ b/libarchive/test/test_read_format_raw.c @@ -59,7 +59,7 @@ DEFINE_TEST(test_read_format_raw) /* Test EOF */ assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); /* Second, try the same with a compressed file. */ @@ -85,5 +85,5 @@ DEFINE_TEST(test_read_format_raw) /* Test EOF */ assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_read_format_tar.c b/libarchive/test/test_read_format_tar.c index a1a48f5f9..a82009275 100644 --- a/libarchive/test/test_read_format_tar.c +++ b/libarchive/test/test_read_format_tar.c @@ -76,7 +76,7 @@ static void verifyEmpty(void) assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } /* Single entry with a hardlink. */ @@ -444,7 +444,7 @@ static void verify(unsigned char *d, size_t s, f(ae); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); free(buff); } diff --git a/libarchive/test/test_read_format_tar_empty_filename.c b/libarchive/test/test_read_format_tar_empty_filename.c index 467284076..5832fc8bf 100644 --- a/libarchive/test/test_read_format_tar_empty_filename.c +++ b/libarchive/test/test_read_format_tar_empty_filename.c @@ -58,5 +58,5 @@ DEFINE_TEST(test_read_format_tar_empty_filename) assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR); assertEqualInt(ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_read_format_tbz.c b/libarchive/test/test_read_format_tbz.c index 06d8cad47..f64aa7c45 100644 --- a/libarchive/test/test_read_format_tbz.c +++ b/libarchive/test/test_read_format_tbz.c @@ -43,7 +43,7 @@ DEFINE_TEST(test_read_format_tbz) r = archive_read_support_compression_bzip2(a); if (r != ARCHIVE_OK) { skipping("Bzip2 support"); - archive_read_finish(a); + archive_read_free(a); return; } assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); @@ -53,7 +53,7 @@ DEFINE_TEST(test_read_format_tbz) assertEqualInt(archive_compression(a), ARCHIVE_COMPRESSION_BZIP2); assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_read_format_tgz.c b/libarchive/test/test_read_format_tgz.c index f411b4338..e19853664 100644 --- a/libarchive/test/test_read_format_tgz.c +++ b/libarchive/test/test_read_format_tgz.c @@ -43,7 +43,7 @@ DEFINE_TEST(test_read_format_tgz) r = archive_read_support_compression_gzip(a); if (r == ARCHIVE_WARN) { skipping("gzip reading not fully supported on this platform"); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); return; } assertEqualInt(ARCHIVE_OK, archive_read_support_format_all(a)); @@ -54,7 +54,7 @@ DEFINE_TEST(test_read_format_tgz) ARCHIVE_COMPRESSION_GZIP); assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR); assertEqualInt(ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK,archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK,archive_read_free(a)); } diff --git a/libarchive/test/test_read_format_tlz.c b/libarchive/test/test_read_format_tlz.c index 7dd09a0c5..ef1c0ab3c 100644 --- a/libarchive/test/test_read_format_tlz.c +++ b/libarchive/test/test_read_format_tlz.c @@ -46,7 +46,7 @@ DEFINE_TEST(test_read_format_tlz) r = archive_read_support_compression_lzma(a); if (r == ARCHIVE_WARN) { skipping("lzma reading not fully supported on this platform"); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); return; } assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); @@ -56,5 +56,5 @@ DEFINE_TEST(test_read_format_tlz) assertEqualInt(archive_compression(a), ARCHIVE_COMPRESSION_LZMA); assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_read_format_txz.c b/libarchive/test/test_read_format_txz.c index acff175c5..29fdd88c4 100644 --- a/libarchive/test/test_read_format_txz.c +++ b/libarchive/test/test_read_format_txz.c @@ -49,7 +49,7 @@ DEFINE_TEST(test_read_format_txz) r = archive_read_support_compression_xz(a); if (r == ARCHIVE_WARN) { skipping("xz reading not fully supported on this platform"); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); return; } assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); @@ -59,5 +59,5 @@ DEFINE_TEST(test_read_format_txz) assertEqualInt(archive_compression(a), ARCHIVE_COMPRESSION_XZ); assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_read_format_tz.c b/libarchive/test/test_read_format_tz.c index e477fb748..b6a7bc140 100644 --- a/libarchive/test/test_read_format_tz.c +++ b/libarchive/test/test_read_format_tz.c @@ -51,7 +51,7 @@ DEFINE_TEST(test_read_format_tz) failure("archive_format_name(a)=\"%s\"", archive_format_name(a)); assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_read_format_xar.c b/libarchive/test/test_read_format_xar.c index 872918a55..7d6ad4a70 100644 --- a/libarchive/test/test_read_format_xar.c +++ b/libarchive/test/test_read_format_xar.c @@ -636,7 +636,7 @@ static void verify(unsigned char *d, size_t s, * This filter won't be used this test. */ if (ARCHIVE_OK != archive_read_support_compression_bzip2(a)) { skipping("Unsupported bzip2"); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); return; } break; @@ -649,7 +649,7 @@ static void verify(unsigned char *d, size_t s, r = archive_read_support_format_xar(a); if (r == ARCHIVE_WARN) { skipping("xar reading not fully supported on this platform"); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); return; } assert((buff = malloc(100000)) != NULL); @@ -676,7 +676,7 @@ static void verify(unsigned char *d, size_t s, assertEqualInt(ARCHIVE_EOF, archive_read_next_header(a, &ae)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); free(buff); } diff --git a/libarchive/test/test_read_format_zip.c b/libarchive/test/test_read_format_zip.c index 00a40bc12..a4d96f868 100644 --- a/libarchive/test/test_read_format_zip.c +++ b/libarchive/test/test_read_format_zip.c @@ -82,7 +82,7 @@ DEFINE_TEST(test_read_format_zip) assertA(archive_format(a) == ARCHIVE_FORMAT_ZIP); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); finish: - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_read_large.c b/libarchive/test/test_read_large.c index 6083aa519..342876fd2 100644 --- a/libarchive/test/test_read_large.c +++ b/libarchive/test/test_read_large.c @@ -58,7 +58,7 @@ DEFINE_TEST(test_read_large) assertA(0 == archive_write_header(a, entry)); archive_entry_free(entry); assertA((int)sizeof(testdata) == archive_write_data(a, testdata, sizeof(testdata))); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); assert(NULL != (a = archive_read_new())); assertA(0 == archive_read_support_format_all(a)); @@ -66,7 +66,7 @@ DEFINE_TEST(test_read_large) assertA(0 == archive_read_open_memory(a, buff, sizeof(buff))); assertA(0 == archive_read_next_header(a, &entry)); assertA(0 == archive_read_data_into_buffer(a, testdatacopy, sizeof(testdatacopy))); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); assert(0 == memcmp(testdata, testdatacopy, sizeof(testdata))); @@ -83,7 +83,7 @@ DEFINE_TEST(test_read_large) assert(0 < tmpfilefd); assertA(0 == archive_read_data_into_fd(a, tmpfilefd)); close(tmpfilefd); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); f = fopen(tmpfilename, "rb"); assertEqualInt(sizeof(testdatacopy), diff --git a/libarchive/test/test_read_pax_truncated.c b/libarchive/test/test_read_pax_truncated.c index 740d9bd7b..372adff2a 100644 --- a/libarchive/test/test_read_pax_truncated.c +++ b/libarchive/test/test_read_pax_truncated.c @@ -61,7 +61,7 @@ DEFINE_TEST(test_read_pax_truncated) /* Close out the archive. */ assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* Now, read back a truncated version of the archive and * verify that we get an appropriate error. */ @@ -105,7 +105,7 @@ DEFINE_TEST(test_read_pax_truncated) } wrap_up: assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } @@ -146,7 +146,7 @@ DEFINE_TEST(test_read_pax_truncated) } wrap_up2: assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } /* Now, damage the archive in various ways and test the responses. */ @@ -162,7 +162,7 @@ DEFINE_TEST(test_read_pax_truncated) assertA(0 == archive_read_open_memory(a, buff2, used)); assertEqualIntA(a, ARCHIVE_WARN, archive_read_next_header(a, &ae)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); /* Damage the size field in the pax attributes. */ memcpy(buff2, buff, buff_size); @@ -173,7 +173,7 @@ DEFINE_TEST(test_read_pax_truncated) assertA(0 == archive_read_open_memory(a, buff2, used)); assertEqualIntA(a, ARCHIVE_WARN, archive_read_next_header(a, &ae)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); /* Damage the size field in the pax attributes. */ memcpy(buff2, buff, buff_size); @@ -186,7 +186,7 @@ DEFINE_TEST(test_read_pax_truncated) assertA(0 == archive_read_open_memory(a, buff2, used)); assertEqualIntA(a, ARCHIVE_WARN, archive_read_next_header(a, &ae)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); /* Damage the size field in the pax attributes. */ memcpy(buff2, buff, buff_size); @@ -200,7 +200,7 @@ DEFINE_TEST(test_read_pax_truncated) assertA(0 == archive_read_open_memory(a, buff2, used)); assertEqualIntA(a, ARCHIVE_WARN, archive_read_next_header(a, &ae)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); /* Damage the size field in the pax attributes. */ memcpy(buff2, buff, buff_size); @@ -212,7 +212,7 @@ DEFINE_TEST(test_read_pax_truncated) assertA(0 == archive_read_open_memory(a, buff2, used)); assertEqualIntA(a, ARCHIVE_WARN, archive_read_next_header(a, &ae)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); /* Damage the size field in the pax attributes. */ memcpy(buff2, buff, buff_size); @@ -223,7 +223,7 @@ DEFINE_TEST(test_read_pax_truncated) assertA(0 == archive_read_open_memory(a, buff2, used)); assertEqualIntA(a, ARCHIVE_WARN, archive_read_next_header(a, &ae)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); /* Damage the ustar header. */ memcpy(buff2, buff, buff_size); @@ -234,7 +234,7 @@ DEFINE_TEST(test_read_pax_truncated) assertA(0 == archive_read_open_memory(a, buff2, used)); assertEqualIntA(a, ARCHIVE_FATAL, archive_read_next_header(a, &ae)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); /* * TODO: Damage the ustar header in various ways and fixup the diff --git a/libarchive/test/test_read_position.c b/libarchive/test/test_read_position.c index f786f6d4f..cdaa783d6 100644 --- a/libarchive/test/test_read_position.c +++ b/libarchive/test/test_read_position.c @@ -59,7 +59,7 @@ DEFINE_TEST(test_read_position) == (size_t)archive_write_data(a, nulls, sizeof(nulls))); } assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* Read the archive back. */ assert(NULL != (a = archive_read_new())); @@ -90,5 +90,5 @@ DEFINE_TEST(test_read_position) assert(read_position == (intmax_t)archive_read_header_position(a)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); assert(read_position == (intmax_t)archive_read_header_position(a)); - archive_read_finish(a); + archive_read_free(a); } diff --git a/libarchive/test/test_read_truncated.c b/libarchive/test/test_read_truncated.c index 470801222..c7d20c0bd 100644 --- a/libarchive/test/test_read_truncated.c +++ b/libarchive/test/test_read_truncated.c @@ -56,7 +56,7 @@ DEFINE_TEST(test_read_truncated) /* Close out the archive. */ assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* Now, read back a truncated version of the archive and * verify that we get an appropriate error. */ @@ -93,7 +93,7 @@ DEFINE_TEST(test_read_truncated) } wrap_up: assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } @@ -132,6 +132,6 @@ DEFINE_TEST(test_read_truncated) } wrap_up2: assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } } diff --git a/libarchive/test/test_read_uu.c b/libarchive/test/test_read_uu.c index a5de09af7..a0979a810 100644 --- a/libarchive/test/test_read_uu.c +++ b/libarchive/test/test_read_uu.c @@ -119,7 +119,7 @@ test_read_uu_sub(const char *uudata, size_t uusize) archive_format_name(a)); assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } free(buff); } diff --git a/libarchive/test/test_sparse_basic.c b/libarchive/test/test_sparse_basic.c index 3a5486f23..c40ff9760 100644 --- a/libarchive/test/test_sparse_basic.c +++ b/libarchive/test/test_sparse_basic.c @@ -333,5 +333,5 @@ DEFINE_TEST(test_sparse_basic) strcpy(p, "/file3"); verify_sparse_file(a, path, sparse_file3, 0); - archive_read_finish(a); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_tar_filenames.c b/libarchive/test/test_tar_filenames.c index 9ca4d6eea..aead684c4 100644 --- a/libarchive/test/test_tar_filenames.c +++ b/libarchive/test/test_tar_filenames.c @@ -101,7 +101,7 @@ test_filename(const char *prefix, int dlen, int flen) /* Close out the archive. */ assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* * Now, read the data back. @@ -135,7 +135,7 @@ test_filename(const char *prefix, int dlen, int flen) /* Verify the end of the archive. */ assert(1 == archive_read_next_header(a, &ae)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } DEFINE_TEST(test_tar_filenames) diff --git a/libarchive/test/test_tar_large.c b/libarchive/test/test_tar_large.c index 280fea2f2..30f7efe49 100644 --- a/libarchive/test/test_tar_large.c +++ b/libarchive/test/test_tar_large.c @@ -256,7 +256,7 @@ DEFINE_TEST(test_tar_large) /* Close out the archive. */ assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* * Open the same archive for reading. @@ -282,7 +282,7 @@ DEFINE_TEST(test_tar_large) /* Close out the archive. */ assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); free(memdata.buff); free(filedata); diff --git a/libarchive/test/test_ustar_filenames.c b/libarchive/test/test_ustar_filenames.c index 997036703..ffd263c03 100644 --- a/libarchive/test/test_ustar_filenames.c +++ b/libarchive/test/test_ustar_filenames.c @@ -111,7 +111,7 @@ test_filename(const char *prefix, int dlen, int flen) /* Close out the archive. */ assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* * Now, read the data back. @@ -153,7 +153,7 @@ test_filename(const char *prefix, int dlen, int flen) failure("This fails if entries were written that should not have been written. dlen=%d, flen=%d", dlen, flen); assertEqualInt(1, archive_read_next_header(a, &ae)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } DEFINE_TEST(test_ustar_filenames) diff --git a/libarchive/test/test_write_compress.c b/libarchive/test/test_write_compress.c index 2842e07c5..aebcb76f2 100644 --- a/libarchive/test/test_write_compress.c +++ b/libarchive/test/test_write_compress.c @@ -68,7 +68,7 @@ DEFINE_TEST(test_write_compress) assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* * Now, read the data back. @@ -87,7 +87,7 @@ DEFINE_TEST(test_write_compress) assertEqualInt((int)datasize, archive_entry_size(ae)); } assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); free(data); free(buff); diff --git a/libarchive/test/test_write_compress_bzip2.c b/libarchive/test/test_write_compress_bzip2.c index c0c249bce..00ad5ca7f 100644 --- a/libarchive/test/test_write_compress_bzip2.c +++ b/libarchive/test/test_write_compress_bzip2.c @@ -58,7 +58,7 @@ DEFINE_TEST(test_write_compress_bzip2) r = archive_write_set_compression_bzip2(a); if (r == ARCHIVE_FATAL) { skipping("bzip2 writing not supported on this platform"); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); return; } assertEqualIntA(a, ARCHIVE_OK, @@ -80,7 +80,7 @@ DEFINE_TEST(test_write_compress_bzip2) } archive_entry_free(ae); assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); @@ -94,7 +94,7 @@ DEFINE_TEST(test_write_compress_bzip2) assertEqualInt((int)datasize, archive_entry_size(ae)); } assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); /* * Repeat the cycle again, this time setting some compression @@ -125,7 +125,7 @@ DEFINE_TEST(test_write_compress_bzip2) archive_entry_free(ae); } assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* Curiously, this test fails; the test data above compresses * better at default compression than at level 9. */ @@ -147,7 +147,7 @@ DEFINE_TEST(test_write_compress_bzip2) assertEqualInt((int)datasize, archive_entry_size(ae)); } assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); /* * Repeat again, with much lower compression. @@ -173,7 +173,7 @@ DEFINE_TEST(test_write_compress_bzip2) archive_entry_free(ae); } assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* Level 0 really does result in larger data. */ failure("Compression-level=0 wrote %d bytes; default wrote %d bytes", @@ -192,7 +192,7 @@ DEFINE_TEST(test_write_compress_bzip2) assertEqualInt((int)datasize, archive_entry_size(ae)); } assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); /* * Test various premature shutdown scenarios to make sure we @@ -200,25 +200,25 @@ DEFINE_TEST(test_write_compress_bzip2) */ assert((a = archive_write_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_bzip2(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); assert((a = archive_write_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_bzip2(a)); assertEqualInt(ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); assert((a = archive_write_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a)); assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_bzip2(a)); assertEqualInt(ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); assert((a = archive_write_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a)); assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_bzip2(a)); assertEqualIntA(a, ARCHIVE_OK, archive_write_open_memory(a, buff, buffsize, &used2)); assertEqualInt(ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* * Clean up. diff --git a/libarchive/test/test_write_compress_gzip.c b/libarchive/test/test_write_compress_gzip.c index 166647287..47a636c9d 100644 --- a/libarchive/test/test_write_compress_gzip.c +++ b/libarchive/test/test_write_compress_gzip.c @@ -58,7 +58,7 @@ DEFINE_TEST(test_write_compress_gzip) r = archive_write_set_compression_gzip(a); if (r == ARCHIVE_FATAL) { skipping("gzip writing not supported on this platform"); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); return; } assertEqualIntA(a, ARCHIVE_OK, @@ -80,7 +80,7 @@ DEFINE_TEST(test_write_compress_gzip) } archive_entry_free(ae); assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); @@ -103,7 +103,7 @@ DEFINE_TEST(test_write_compress_gzip) } assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); } - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); /* * Repeat the cycle again, this time setting some compression @@ -134,7 +134,7 @@ DEFINE_TEST(test_write_compress_gzip) archive_entry_free(ae); } assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* Curiously, this test fails; the test data above compresses * better at default compression than at level 9. */ @@ -164,7 +164,7 @@ DEFINE_TEST(test_write_compress_gzip) } assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); } - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); /* * Repeat again, with much lower compression. @@ -190,7 +190,7 @@ DEFINE_TEST(test_write_compress_gzip) archive_entry_free(ae); } assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* Level 0 really does result in larger data. */ failure("Compression-level=0 wrote %d bytes; default wrote %d bytes", @@ -216,7 +216,7 @@ DEFINE_TEST(test_write_compress_gzip) } assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); } - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); /* * Test various premature shutdown scenarios to make sure we @@ -224,25 +224,25 @@ DEFINE_TEST(test_write_compress_gzip) */ assert((a = archive_write_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_gzip(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); assert((a = archive_write_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_gzip(a)); assertEqualInt(ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); assert((a = archive_write_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a)); assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_gzip(a)); assertEqualInt(ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); assert((a = archive_write_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a)); assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_gzip(a)); assertEqualIntA(a, ARCHIVE_OK, archive_write_open_memory(a, buff, buffsize, &used2)); assertEqualInt(ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* * Clean up. diff --git a/libarchive/test/test_write_compress_lzma.c b/libarchive/test/test_write_compress_lzma.c index af172a8f3..de663b05b 100644 --- a/libarchive/test/test_write_compress_lzma.c +++ b/libarchive/test/test_write_compress_lzma.c @@ -57,7 +57,7 @@ DEFINE_TEST(test_write_compress_lzma) r = archive_write_set_compression_lzma(a); if (r == ARCHIVE_FATAL) { skipping("lzma writing not supported on this platform"); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); return; } assertEqualIntA(a, ARCHIVE_OK, @@ -79,7 +79,7 @@ DEFINE_TEST(test_write_compress_lzma) } archive_entry_free(ae); assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); @@ -102,7 +102,7 @@ DEFINE_TEST(test_write_compress_lzma) } assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); } - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); /* * Repeat the cycle again, this time setting some compression @@ -133,7 +133,7 @@ DEFINE_TEST(test_write_compress_lzma) archive_entry_free(ae); } assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); assert((a = archive_read_new()) != NULL); @@ -157,7 +157,7 @@ DEFINE_TEST(test_write_compress_lzma) } assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); } - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); /* * Repeat again, with much lower compression. @@ -183,7 +183,7 @@ DEFINE_TEST(test_write_compress_lzma) archive_entry_free(ae); } assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* Level 0 really does result in larger data. */ failure("Compression-level=0 wrote %d bytes; default wrote %d bytes", @@ -209,7 +209,7 @@ DEFINE_TEST(test_write_compress_lzma) } assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); } - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); /* * Test various premature shutdown scenarios to make sure we @@ -217,25 +217,25 @@ DEFINE_TEST(test_write_compress_lzma) */ assert((a = archive_write_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_lzma(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); assert((a = archive_write_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_lzma(a)); assertEqualInt(ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); assert((a = archive_write_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a)); assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_lzma(a)); assertEqualInt(ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); assert((a = archive_write_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a)); assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_lzma(a)); assertEqualIntA(a, ARCHIVE_OK, archive_write_open_memory(a, buff, buffsize, &used2)); assertEqualInt(ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* * Clean up. diff --git a/libarchive/test/test_write_compress_program.c b/libarchive/test/test_write_compress_program.c index 4593610ea..304f4051f 100644 --- a/libarchive/test/test_write_compress_program.c +++ b/libarchive/test/test_write_compress_program.c @@ -49,7 +49,7 @@ DEFINE_TEST(test_write_compress_program) if (r == ARCHIVE_FATAL) { skipping("Write compression via external " "program unsupported on this platform"); - archive_write_finish(a); + archive_write_free(a); return; } assertA(0 == archive_write_set_bytes_per_block(a, blocksize)); @@ -73,7 +73,7 @@ DEFINE_TEST(test_write_compress_program) /* Close out the archive. */ assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* * Now, read the data back through the built-in gzip support. @@ -88,13 +88,13 @@ DEFINE_TEST(test_write_compress_program) if (r != ARCHIVE_OK && !canGunzip()) { skipping("No libz and no gunzip program, " "unable to verify gzip compression"); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); return; } assertEqualIntA(a, ARCHIVE_OK, archive_read_open_memory(a, buff, used)); if (!assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae))) { - archive_read_finish(a); + archive_read_free(a); return; } @@ -110,5 +110,5 @@ DEFINE_TEST(test_write_compress_program) /* Verify the end of the archive. */ assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_write_compress_xz.c b/libarchive/test/test_write_compress_xz.c index caa52f98c..2f32df27f 100644 --- a/libarchive/test/test_write_compress_xz.c +++ b/libarchive/test/test_write_compress_xz.c @@ -58,7 +58,7 @@ DEFINE_TEST(test_write_compress_xz) r = archive_write_set_compression_xz(a); if (r == ARCHIVE_FATAL) { skipping("xz writing not supported on this platform"); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); return; } assertEqualIntA(a, ARCHIVE_OK, @@ -80,7 +80,7 @@ DEFINE_TEST(test_write_compress_xz) } archive_entry_free(ae); assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); assert((a = archive_read_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); @@ -103,7 +103,7 @@ DEFINE_TEST(test_write_compress_xz) } assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); } - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); /* * Repeat the cycle again, this time setting some compression @@ -134,7 +134,7 @@ DEFINE_TEST(test_write_compress_xz) archive_entry_free(ae); } assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* Curiously, this test fails; the test data above compresses * better at default compression than at level 9. */ @@ -165,7 +165,7 @@ DEFINE_TEST(test_write_compress_xz) } assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); } - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); /* * Repeat again, with much lower compression. @@ -191,7 +191,7 @@ DEFINE_TEST(test_write_compress_xz) archive_entry_free(ae); } assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* Level 0 really does result in larger data. */ failure("Compression-level=0 wrote %d bytes; default wrote %d bytes", @@ -217,7 +217,7 @@ DEFINE_TEST(test_write_compress_xz) } assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); } - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); /* * Test various premature shutdown scenarios to make sure we @@ -225,25 +225,25 @@ DEFINE_TEST(test_write_compress_xz) */ assert((a = archive_write_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_xz(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); assert((a = archive_write_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_xz(a)); assertEqualInt(ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); assert((a = archive_write_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a)); assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_xz(a)); assertEqualInt(ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); assert((a = archive_write_new()) != NULL); assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_ustar(a)); assertEqualIntA(a, ARCHIVE_OK, archive_write_set_compression_xz(a)); assertEqualIntA(a, ARCHIVE_OK, archive_write_open_memory(a, buff, buffsize, &used2)); assertEqualInt(ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* * Clean up. diff --git a/libarchive/test/test_write_disk.c b/libarchive/test/test_write_disk.c index 23d5d5a98..9a4475599 100644 --- a/libarchive/test/test_write_disk.c +++ b/libarchive/test/test_write_disk.c @@ -45,7 +45,7 @@ static void create(struct archive_entry *ae, const char *msg) failure("%s", msg); assertEqualIntA(ad, 0, archive_write_header(ad, ae)); assertEqualIntA(ad, 0, archive_write_finish_entry(ad)); - assertEqualInt(0, archive_write_finish(ad)); + assertEqualInt(0, archive_write_free(ad)); /* Test the entries on disk. */ assert(0 == stat(archive_entry_pathname(ae), &st)); @@ -92,7 +92,7 @@ static void create_reg_file(struct archive_entry *ae, const char *msg) assertEqualIntA(ad, 0, archive_write_header(ad, ae)); assertEqualInt(sizeof(data), archive_write_data(ad, data, sizeof(data))); assertEqualIntA(ad, 0, archive_write_finish_entry(ad)); - assertEqualInt(0, archive_write_finish(ad)); + assertEqualInt(0, archive_write_free(ad)); /* Test the entries on disk. */ assertIsReg(archive_entry_pathname(ae), archive_entry_mode(ae) & 0777); @@ -128,7 +128,7 @@ static void create_reg_file2(struct archive_entry *ae, const char *msg) archive_write_data_block(ad, data + i, 1000, i)); } assertEqualIntA(ad, 0, archive_write_finish_entry(ad)); - assertEqualInt(0, archive_write_finish(ad)); + assertEqualInt(0, archive_write_free(ad)); /* Test the entries on disk. */ assertIsReg(archive_entry_pathname(ae), archive_entry_mode(ae) & 0777); @@ -151,7 +151,7 @@ static void create_reg_file3(struct archive_entry *ae, const char *msg) assertEqualIntA(ad, 0, archive_write_header(ad, ae)); assertEqualInt(5, archive_write_data(ad, data, sizeof(data))); assertEqualIntA(ad, 0, archive_write_finish_entry(ad)); - assertEqualInt(0, archive_write_finish(ad)); + assertEqualInt(0, archive_write_free(ad)); /* Test the entry on disk. */ assert(0 == stat(archive_entry_pathname(ae), &st)); @@ -177,7 +177,7 @@ static void create_reg_file4(struct archive_entry *ae, const char *msg) assertEqualInt(ARCHIVE_OK, archive_write_data_block(ad, data, sizeof(data), 0)); assertEqualIntA(ad, 0, archive_write_finish_entry(ad)); - assertEqualInt(0, archive_write_finish(ad)); + assertEqualInt(0, archive_write_free(ad)); /* Test the entry on disk. */ assert(0 == stat(archive_entry_pathname(ae), &st)); @@ -208,7 +208,7 @@ static void create_reg_file_win(struct archive_entry *ae, const char *msg) assertEqualIntA(ad, 0, archive_write_header(ad, ae)); assertEqualInt(sizeof(data), archive_write_data(ad, data, sizeof(data))); assertEqualIntA(ad, 0, archive_write_finish_entry(ad)); - assertEqualInt(0, archive_write_finish(ad)); + assertEqualInt(0, archive_write_free(ad)); /* Test the entries on disk. */ l = strlen(archive_entry_pathname(ae)); diff --git a/libarchive/test/test_write_disk_failures.c b/libarchive/test/test_write_disk_failures.c index 8ca1aa707..c563ce1d3 100644 --- a/libarchive/test/test_write_disk_failures.c +++ b/libarchive/test/test_write_disk_failures.c @@ -59,7 +59,7 @@ DEFINE_TEST(test_write_disk_failures) archive_entry_set_mtime(ae, 123456789, 0); assertEqualIntA(a, ARCHIVE_FAILED, archive_write_header(a, ae)); assertEqualIntA(a, 0, archive_write_finish_entry(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); archive_entry_free(ae); #endif } diff --git a/libarchive/test/test_write_disk_hardlink.c b/libarchive/test/test_write_disk_hardlink.c index 934aa08d5..93e5dc8d4 100644 --- a/libarchive/test/test_write_disk_hardlink.c +++ b/libarchive/test/test_write_disk_hardlink.c @@ -178,7 +178,7 @@ DEFINE_TEST(test_write_disk_hardlink) assertEqualIntA(ad, 0, archive_write_finish_entry(ad)); } archive_entry_free(ae); - assertEqualInt(0, archive_write_finish(ad)); + assertEqualInt(0, archive_write_free(ad)); /* Test the entries on disk. */ diff --git a/libarchive/test/test_write_disk_perms.c b/libarchive/test/test_write_disk_perms.c index f1244bf79..7861735bd 100644 --- a/libarchive/test/test_write_disk_perms.c +++ b/libarchive/test/test_write_disk_perms.c @@ -365,7 +365,7 @@ DEFINE_TEST(test_write_disk_perms) assertEqualIntA(a,ARCHIVE_WARN,archive_write_finish_entry(a)); } - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); archive_entry_free(ae); /* Test the entries on disk. */ diff --git a/libarchive/test/test_write_disk_secure.c b/libarchive/test/test_write_disk_secure.c index 0f0815006..31c5bfd7c 100644 --- a/libarchive/test/test_write_disk_secure.c +++ b/libarchive/test/test_write_disk_secure.c @@ -178,7 +178,7 @@ DEFINE_TEST(test_write_disk_secure) assert(S_ISDIR(st.st_mode)); archive_entry_free(ae); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* Test the entries on disk. */ assert(0 == lstat("dir", &st)); diff --git a/libarchive/test/test_write_disk_sparse.c b/libarchive/test/test_write_disk_sparse.c index 638f0a4b2..d25b6c006 100644 --- a/libarchive/test/test_write_disk_sparse.c +++ b/libarchive/test/test_write_disk_sparse.c @@ -269,12 +269,12 @@ DEFINE_TEST(test_write_disk_sparse) archive_write_disk_set_options(ad, 0); verify_write_data(ad, 0); verify_write_data_block(ad, 0); - assertEqualInt(0, archive_write_finish(ad)); + assertEqualInt(0, archive_write_free(ad)); assert((ad = archive_write_disk_new()) != NULL); archive_write_disk_set_options(ad, ARCHIVE_EXTRACT_SPARSE); verify_write_data(ad, 1); verify_write_data_block(ad, 1); - assertEqualInt(0, archive_write_finish(ad)); + assertEqualInt(0, archive_write_free(ad)); } diff --git a/libarchive/test/test_write_disk_symlink.c b/libarchive/test/test_write_disk_symlink.c index 60d0bdcbb..13089c78d 100644 --- a/libarchive/test/test_write_disk_symlink.c +++ b/libarchive/test/test_write_disk_symlink.c @@ -99,7 +99,7 @@ DEFINE_TEST(test_write_disk_symlink) assertEqualIntA(ad, 0, archive_write_finish_entry(ad)); archive_entry_free(ae); - assertEqualInt(ARCHIVE_OK, archive_write_finish(ad)); + assertEqualInt(ARCHIVE_OK, archive_write_free(ad)); /* Test the entries on disk. */ diff --git a/libarchive/test/test_write_disk_times.c b/libarchive/test/test_write_disk_times.c index 9ecbff69b..568d04c00 100644 --- a/libarchive/test/test_write_disk_times.c +++ b/libarchive/test/test_write_disk_times.c @@ -163,5 +163,5 @@ DEFINE_TEST(test_write_disk_times) skipping("Platform-specific time restore tests"); #endif - archive_write_finish(a); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); } diff --git a/libarchive/test/test_write_format_ar.c b/libarchive/test/test_write_format_ar.c index def40a444..2115c4d4d 100644 --- a/libarchive/test/test_write_format_ar.c +++ b/libarchive/test/test_write_format_ar.c @@ -98,7 +98,7 @@ DEFINE_TEST(test_write_format_ar) archive_entry_free(ae); assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* * Now, read the data back. @@ -133,7 +133,7 @@ DEFINE_TEST(test_write_format_ar) assertEqualMem(buff2, "88877766", 8); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); /* * Then, we try to create a BSD format archive. @@ -162,7 +162,7 @@ DEFINE_TEST(test_write_format_ar) assertEqualIntA(a, 6, archive_write_data(a, "555555", 7)); archive_entry_free(ae); assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* Now, Read the data back */ assert((a = archive_read_new()) != NULL); @@ -185,5 +185,5 @@ DEFINE_TEST(test_write_format_ar) /* Test EOF */ assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } diff --git a/libarchive/test/test_write_format_cpio.c b/libarchive/test/test_write_format_cpio.c index d61689e06..3f3154b1b 100644 --- a/libarchive/test/test_write_format_cpio.c +++ b/libarchive/test/test_write_format_cpio.c @@ -103,7 +103,7 @@ test_format(int (*set_format)(struct archive *)) /* Close out the archive. */ assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* * Damage the second entry to test the search-ahead recovery. @@ -132,7 +132,7 @@ test_format(int (*set_format)(struct archive *)) assertA(0 == archive_read_open_memory(a, buff, used)); if (!assertEqualIntA(a, 0, archive_read_next_header(a, &ae))) { - archive_read_finish(a); + archive_read_free(a); return; } @@ -168,7 +168,7 @@ test_format(int (*set_format)(struct archive *)) /* Verify the end of the archive. */ assertEqualIntA(a, 1, archive_read_next_header(a, &ae)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); free(buff); } diff --git a/libarchive/test/test_write_format_cpio_empty.c b/libarchive/test/test_write_format_cpio_empty.c index 953bf6567..53aaec822 100644 --- a/libarchive/test/test_write_format_cpio_empty.c +++ b/libarchive/test/test_write_format_cpio_empty.c @@ -62,7 +62,7 @@ DEFINE_TEST(test_write_format_cpio_empty) /* Close out the archive. */ assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); failure("Empty cpio archive should be exactly 87 bytes, was %d.", used); assert(used == 87); diff --git a/libarchive/test/test_write_format_cpio_newc.c b/libarchive/test/test_write_format_cpio_newc.c index 62167e206..81c3d22d9 100644 --- a/libarchive/test/test_write_format_cpio_newc.c +++ b/libarchive/test/test_write_format_cpio_newc.c @@ -111,7 +111,7 @@ DEFINE_TEST(test_write_format_cpio_newc) assertEqualIntA(a, 0, archive_write_header(a, entry)); archive_entry_free(entry); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* * Verify the archive format. diff --git a/libarchive/test/test_write_format_cpio_odc.c b/libarchive/test/test_write_format_cpio_odc.c index e45513639..48af04ecf 100644 --- a/libarchive/test/test_write_format_cpio_odc.c +++ b/libarchive/test/test_write_format_cpio_odc.c @@ -123,7 +123,7 @@ DEFINE_TEST(test_write_format_cpio_odc) /* Write of data to symlink should fail == zero bytes get written. */ assertEqualIntA(a, 0, archive_write_data(a, "1234567890", 10)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* * Verify the archive format. diff --git a/libarchive/test/test_write_format_mtree.c b/libarchive/test/test_write_format_mtree.c index 0c6fd1fd1..e99884238 100644 --- a/libarchive/test/test_write_format_mtree.c +++ b/libarchive/test/test_write_format_mtree.c @@ -87,7 +87,7 @@ test_write_format_mtree_sub(int use_set, int dironly) archive_entry_free(ae); } assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); if (use_set) { const char *p; @@ -133,7 +133,7 @@ test_write_format_mtree_sub(int use_set, int dironly) assertEqualInt(8, archive_entry_size(ae)); } assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } DEFINE_TEST(test_write_format_mtree) diff --git a/libarchive/test/test_write_format_pax.c b/libarchive/test/test_write_format_pax.c index d6383be56..78c27ccfd 100644 --- a/libarchive/test/test_write_format_pax.c +++ b/libarchive/test/test_write_format_pax.c @@ -106,7 +106,7 @@ DEFINE_TEST(test_write_format_pax) /* Close out the archive. */ assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualIntA(a, ARCHIVE_OK, archive_write_finish(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_write_free(a)); /* * @@ -193,7 +193,7 @@ DEFINE_TEST(test_write_format_pax) */ assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualIntA(a, ARCHIVE_OK, archive_read_finish(a)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a)); free(buff); } diff --git a/libarchive/test/test_write_format_shar_empty.c b/libarchive/test/test_write_format_shar_empty.c index dd2f10cc1..09cfcd6b7 100644 --- a/libarchive/test/test_write_format_shar_empty.c +++ b/libarchive/test/test_write_format_shar_empty.c @@ -47,7 +47,7 @@ DEFINE_TEST(test_write_format_shar_empty) /* Close out the archive. */ assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); failure("Empty shar archive should be exactly 0 bytes, was %d.", used); assert(used == 0); diff --git a/libarchive/test/test_write_format_tar.c b/libarchive/test/test_write_format_tar.c index b8fd2e728..a02570ca4 100644 --- a/libarchive/test/test_write_format_tar.c +++ b/libarchive/test/test_write_format_tar.c @@ -72,7 +72,7 @@ DEFINE_TEST(test_write_format_tar) /* Close out the archive. */ assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* This calculation gives "the smallest multiple of * the block size that is at least 2048 bytes". */ @@ -102,6 +102,6 @@ DEFINE_TEST(test_write_format_tar) /* Verify the end of the archive. */ assert(1 == archive_read_next_header(a, &ae)); assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); } } diff --git a/libarchive/test/test_write_format_tar_empty.c b/libarchive/test/test_write_format_tar_empty.c index d40026b33..f9e972b40 100644 --- a/libarchive/test/test_write_format_tar_empty.c +++ b/libarchive/test/test_write_format_tar_empty.c @@ -46,7 +46,7 @@ DEFINE_TEST(test_write_format_tar_empty) /* Close out the archive. */ assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); assert(used == 1024); for (i = 0; i < used; i++) { @@ -64,7 +64,7 @@ DEFINE_TEST(test_write_format_tar_empty) /* Close out the archive. */ assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); assertEqualInt((int)used, 1024); for (i = 0; i < used; i++) { diff --git a/libarchive/test/test_write_format_tar_ustar.c b/libarchive/test/test_write_format_tar_ustar.c index 939bfa844..7cfc3e80b 100644 --- a/libarchive/test/test_write_format_tar_ustar.c +++ b/libarchive/test/test_write_format_tar_ustar.c @@ -188,7 +188,7 @@ DEFINE_TEST(test_write_format_tar_ustar) archive_entry_set_nlink(entry, 1); assertEqualIntA(a, 0, archive_write_header(a, entry)); archive_entry_free(entry); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* * Verify the archive format. diff --git a/libarchive/test/test_write_format_zip.c b/libarchive/test/test_write_format_zip.c index 250ddba91..5ef98d3a6 100644 --- a/libarchive/test/test_write_format_zip.c +++ b/libarchive/test/test_write_format_zip.c @@ -111,7 +111,7 @@ DEFINE_TEST(test_write_format_zip) /* Close out the archive. */ assertEqualInt(ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* * Now, read the data back. @@ -175,6 +175,6 @@ DEFINE_TEST(test_write_format_zip) /* Verify the end of the archive. */ assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); assertEqualInt(ARCHIVE_OK, archive_read_close(a)); - assertEqualInt(ARCHIVE_OK, archive_read_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_read_free(a)); free(buff); } diff --git a/libarchive/test/test_write_format_zip_empty.c b/libarchive/test/test_write_format_zip_empty.c index 7e9e68478..55e89fd9d 100644 --- a/libarchive/test/test_write_format_zip_empty.c +++ b/libarchive/test/test_write_format_zip_empty.c @@ -46,7 +46,7 @@ DEFINE_TEST(test_write_format_zip_empty) /* Close out the archive without writing anything. */ assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* Verify the correct format for an empy Zip archive. */ assertEqualInt(used, 22); diff --git a/libarchive/test/test_write_format_zip_no_compression.c b/libarchive/test/test_write_format_zip_no_compression.c index f01c90afa..3f4ffe16f 100644 --- a/libarchive/test/test_write_format_zip_no_compression.c +++ b/libarchive/test/test_write_format_zip_no_compression.c @@ -136,7 +136,7 @@ DEFINE_TEST(test_write_format_zip_no_compression) /* Close the archive . */ assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); /* Remember the end of the archive in memory. */ buffend = buff + used; diff --git a/libarchive/test/test_write_open_memory.c b/libarchive/test/test_write_open_memory.c index e9bead436..efa167ad6 100644 --- a/libarchive/test/test_write_open_memory.c +++ b/libarchive/test/test_write_open_memory.c @@ -64,7 +64,7 @@ DEFINE_TEST(test_write_open_memory) assertA(ARCHIVE_FATAL == archive_write_close(a)); else assertEqualIntA(a, ARCHIVE_OK, archive_write_close(a)); - assertEqualInt(ARCHIVE_OK, archive_write_finish(a)); + assertEqualInt(ARCHIVE_OK, archive_write_free(a)); assert(buff[i] == 0xAE); assert(s <= i); } diff --git a/tar/read.c b/tar/read.c index aaaacac0d..3d8b347d3 100644 --- a/tar/read.c +++ b/tar/read.c @@ -332,7 +332,7 @@ read_archive(struct bsdtar *bsdtar, char mode) fprintf(stdout, "Archive Format: %s, Compression: %s\n", archive_format_name(a), archive_compression_name(a)); - archive_read_finish(a); + archive_read_free(a); } diff --git a/tar/write.c b/tar/write.c index 0d5c65c99..35bb39831 100644 --- a/tar/write.c +++ b/tar/write.c @@ -286,7 +286,7 @@ tar_mode_r(struct bsdtar *bsdtar) archive_error_string(a)); while (0 == archive_read_next_header(a, &entry)) { if (archive_compression(a) != ARCHIVE_COMPRESSION_NONE) { - archive_read_finish(a); + archive_read_free(a); close(bsdtar->fd); lafe_errc(1, 0, "Cannot append to compressed archive."); @@ -296,7 +296,7 @@ tar_mode_r(struct bsdtar *bsdtar) } end_offset = archive_read_header_position(a); - archive_read_finish(a); + archive_read_free(a); /* Re-open archive for writing */ a = archive_write_new(); @@ -384,7 +384,7 @@ tar_mode_u(struct bsdtar *bsdtar) /* Build a list of all entries and their recorded mod times. */ while (0 == archive_read_next_header(a, &entry)) { if (archive_compression(a) != ARCHIVE_COMPRESSION_NONE) { - archive_read_finish(a); + archive_read_free(a); close(bsdtar->fd); lafe_errc(1, 0, "Cannot append to compressed archive."); @@ -398,7 +398,7 @@ tar_mode_u(struct bsdtar *bsdtar) } end_offset = archive_read_header_position(a); - archive_read_finish(a); + archive_read_free(a); /* Re-open archive for writing. */ a = archive_write_new(); @@ -509,7 +509,7 @@ cleanup: free(bsdtar->buff); archive_entry_linkresolver_free(bsdtar->resolver); bsdtar->resolver = NULL; - archive_read_finish(bsdtar->diskreader); + archive_read_free(bsdtar->diskreader); bsdtar->diskreader = NULL; if (bsdtar->option_totals) { @@ -517,7 +517,7 @@ cleanup: tar_i64toa(archive_position_compressed(a))); } - archive_write_finish(a); + archive_write_free(a); } /* @@ -588,7 +588,7 @@ append_archive_filename(struct bsdtar *bsdtar, struct archive *a, filename, archive_error_string(ina)); bsdtar->return_value = 1; } - archive_read_finish(ina); + archive_read_free(ina); return (rc); }