[Midnightbsd-cvs] src [7266] trunk/lib/libmport/merge_primative.c: update deprected functions from libarchive 3.

[laffer1 at midnightbsd.org]

Revision: 7266
          http://svnweb.midnightbsd.org/src/?rev=7266
Author:   laffer1
Date:     2015-08-18 19:13:58 -0400 (Tue, 18 Aug 2015)
Log Message:
-----------
update deprected functions from libarchive 3.

Modified Paths:
--------------
    trunk/lib/libmport/merge_primative.c

Modified: trunk/lib/libmport/merge_primative.c
===================================================================
--- trunk/lib/libmport/merge_primative.c	2015-08-18 23:08:22 UTC (rev 7265)
+++ trunk/lib/libmport/merge_primative.c	2015-08-18 23:13:58 UTC (rev 7266)
@@ -467,23 +467,23 @@
 
   if (archive_read_support_format_tar(a) != ARCHIVE_OK)
     RETURN_ERROR(MPORT_ERR_FATAL, archive_error_string(a));
-  if (archive_read_support_compression_xz(a))
+  if (archive_read_support_filter_xz(a))
     RETURN_ERROR(MPORT_ERR_FATAL, archive_error_string(a));
     
   if (archive_read_open_filename(a, filename, 10240) != ARCHIVE_OK) {
     SET_ERRORX(MPORT_ERR_FATAL, "Could not open %s: %s", filename, archive_error_string(a));
-    archive_read_finish(a);
+    archive_read_free(a);
     RETURN_CURRENT_ERROR;
   }
   
   if (archive_read_next_header(a, &entry) != ARCHIVE_OK) {
     SET_ERROR(MPORT_ERR_FATAL, archive_error_string(a));
-    archive_read_finish(a);
+    archive_read_free(a);
     RETURN_CURRENT_ERROR;
   }
   
   if (strcmp(archive_entry_pathname(entry), MPORT_STUB_DB_FILE) != 0) {
-    archive_read_finish(a);
+    archive_read_free(a);
     RETURN_ERROR(MPORT_ERR_FATAL, "Invalid bundle file: stub database is not the first file");
   }
     
@@ -491,11 +491,11 @@
   
   if (archive_read_extract(a, entry, 0) != ARCHIVE_OK) {
     SET_ERROR(MPORT_ERR_FATAL, archive_error_string(a));
-    archive_read_finish(a);
+    archive_read_free(a);
     RETURN_CURRENT_ERROR;
   }
   
-  if (archive_read_finish(a) != ARCHIVE_OK)
+  if (archive_read_free(a) != ARCHIVE_OK)
     RETURN_ERROR(MPORT_ERR_FATAL, archive_error_string(a));
     
   return MPORT_OK;