svn commit: r275371 - head/contrib/elftoolchain/elfcopy

[Ed Maste]

Author: emaste
Date: Mon Dec  1 16:10:44 2014
New Revision: 275371
URL: https://svnweb.freebsd.org/changeset/base/275371

Log:
  Track libarchive API change

Modified:
  head/contrib/elftoolchain/elfcopy/archive.c

Modified: head/contrib/elftoolchain/elfcopy/archive.c
==============================================================================
--- head/contrib/elftoolchain/elfcopy/archive.c	Mon Dec  1 16:10:03 2014	(r275370)
+++ head/contrib/elftoolchain/elfcopy/archive.c	Mon Dec  1 16:10:44 2014	(r275371)
@@ -350,12 +350,12 @@ ac_detect_ar(int ifd)
 	r = -1;
 	if ((a = archive_read_new()) == NULL)
 		return (0);
-	archive_read_support_compression_none(a);
+	archive_read_support_filter_none(a);
 	archive_read_support_format_ar(a);
 	if (archive_read_open_fd(a, ifd, 10240) == ARCHIVE_OK)
 		r = archive_read_next_header(a, &entry);
 	archive_read_close(a);
-	archive_read_finish(a);
+	archive_read_free(a);
 
 	return (r == ARCHIVE_OK);
 }
@@ -386,7 +386,7 @@ ac_read_objs(struct elfcopy *ecp, int if
 		err(EXIT_FAILURE, "lseek failed");
 	if ((a = archive_read_new()) == NULL)
 		errx(EXIT_FAILURE, "%s", archive_error_string(a));
-	archive_read_support_compression_none(a);
+	archive_read_support_filter_none(a);
 	archive_read_support_format_ar(a);
 	AC(archive_read_open_fd(a, ifd, 10240));
 	for(;;) {
@@ -435,7 +435,7 @@ ac_read_objs(struct elfcopy *ecp, int if
 		}
 	}
 	AC(archive_read_close(a));
-	ACV(archive_read_finish(a));
+	ACV(archive_read_free(a));
 }
 
 static void
@@ -449,7 +449,7 @@ ac_write_objs(struct elfcopy *ecp, int o
 	if ((a = archive_write_new()) == NULL)
 		errx(EXIT_FAILURE, "%s", archive_error_string(a));
 	archive_write_set_format_ar_svr4(a);
-	archive_write_set_compression_none(a);
+	archive_write_add_filter_none(a);
 	AC(archive_write_open_fd(a, ofd));
 
 	/* Write the archive symbol table, even if it's empty. */
@@ -491,7 +491,7 @@ ac_write_objs(struct elfcopy *ecp, int o
 	}
 
 	AC(archive_write_close(a));
-	ACV(archive_write_finish(a));
+	ACV(archive_write_free(a));
 }
 
 static void