svn commit: r201099 - head/lib/libarchive

Tim Kientzle kientzle at FreeBSD.org
Mon Dec 28 03:03:01 UTC 2009


Author: kientzle
Date: Mon Dec 28 03:03:00 2009
New Revision: 201099
URL: http://svn.freebsd.org/changeset/base/201099

Log:
  Use new ino64 interface.

Modified:
  head/lib/libarchive/archive_write.c

Modified: head/lib/libarchive/archive_write.c
==============================================================================
--- head/lib/libarchive/archive_write.c	Mon Dec 28 02:58:14 2009	(r201098)
+++ head/lib/libarchive/archive_write.c	Mon Dec 28 03:03:00 2009	(r201099)
@@ -312,7 +312,6 @@ archive_write_open(struct archive *_a, v
 	struct archive_write *a = (struct archive_write *)_a;
 	int ret;
 
-	ret = ARCHIVE_OK;
 	__archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC,
 	    ARCHIVE_STATE_NEW, "archive_write_open");
 	archive_clear_error(&a->archive);
@@ -423,7 +422,7 @@ _archive_write_header(struct archive *_a
 	if (a->skip_file_dev != 0 &&
 	    archive_entry_dev(entry) == a->skip_file_dev &&
 	    a->skip_file_ino != 0 &&
-	    archive_entry_ino(entry) == a->skip_file_ino) {
+	    archive_entry_ino64(entry) == a->skip_file_ino) {
 		archive_set_error(&a->archive, 0,
 		    "Can't add archive to itself");
 		return (ARCHIVE_FAILED);


More information about the svn-src-all mailing list