[Midnightbsd-cvs] src [7267] trunk/lib/libmport/bundle_read.c: fix bundle read after libarchive update

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Aug 18 19:14:54 EDT 2015


Revision: 7267
          http://svnweb.midnightbsd.org/src/?rev=7267
Author:   laffer1
Date:     2015-08-18 19:14:53 -0400 (Tue, 18 Aug 2015)
Log Message:
-----------
fix bundle read after libarchive update

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

Modified: trunk/lib/libmport/bundle_read.c
===================================================================
--- trunk/lib/libmport/bundle_read.c	2015-08-18 23:13:58 UTC (rev 7266)
+++ trunk/lib/libmport/bundle_read.c	2015-08-18 23:14:53 UTC (rev 7267)
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__MBSDID("$MidnightBSD: src/lib/libmport/bundle_read.c,v 1.6 2011/07/24 15:59:08 laffer1 Exp $");
+__MBSDID("$MidnightBSD$");
 
 #include "mport.h"
 #include "mport_private.h"
@@ -61,7 +61,7 @@
   
   if (archive_read_support_format_tar(bundle->archive) != ARCHIVE_OK)
     RETURN_ERROR(MPORT_ERR_FATAL, archive_error_string(bundle->archive));
-  if (archive_read_support_compression_xz(bundle->archive) != ARCHIVE_OK)
+  if (archive_read_support_filter_xz(bundle->archive) != ARCHIVE_OK)
     RETURN_ERROR(MPORT_ERR_FATAL, archive_error_string(bundle->archive));
   
   if (archive_read_open_filename(bundle->archive, bundle->filename, 10240) != ARCHIVE_OK) {
@@ -81,7 +81,7 @@
 {
   int ret = MPORT_OK;
     
-  if (archive_read_finish(bundle->archive) != ARCHIVE_OK)
+  if (archive_read_free(bundle->archive) != ARCHIVE_OK)
     ret = SET_ERROR(MPORT_ERR_FATAL, archive_error_string(bundle->archive));
 
   if (bundle->stub_attached && (mport != NULL)) {



More information about the Midnightbsd-cvs mailing list