From owner-svn-src-head@FreeBSD.ORG  Mon Dec 28 03:03:01 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3AE7C1065679;
	Mon, 28 Dec 2009 03:03:01 +0000 (UTC)
	(envelope-from kientzle@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2A93D8FC23;
	Mon, 28 Dec 2009 03:03:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBS331ZX077004;
	Mon, 28 Dec 2009 03:03:01 GMT
	(envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBS3319p077002;
	Mon, 28 Dec 2009 03:03:01 GMT
	(envelope-from kientzle@svn.freebsd.org)
Message-Id: <200912280303.nBS3319p077002@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Mon, 28 Dec 2009 03:03:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r201099 - head/lib/libarchive
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Dec 2009 03:03:01 -0000

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);