From owner-svn-src-head@FreeBSD.ORG  Sun Apr 12 05:25:43 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 C88011065672
	for <svn-src-head@freebsd.org>; Sun, 12 Apr 2009 05:25:43 +0000 (UTC)
	(envelope-from christoph.mallon@gmx.de)
Received: from mail.gmx.net (mail.gmx.net [213.165.64.20])
	by mx1.freebsd.org (Postfix) with SMTP id 1C1ED8FC12
	for <svn-src-head@freebsd.org>; Sun, 12 Apr 2009 05:25:42 +0000 (UTC)
	(envelope-from christoph.mallon@gmx.de)
Received: (qmail invoked by alias); 12 Apr 2009 05:25:41 -0000
Received: from p54A3DCEC.dip.t-dialin.net (EHLO tron.homeunix.org)
	[84.163.220.236]
	by mail.gmx.net (mp071) with SMTP; 12 Apr 2009 07:25:41 +0200
X-Authenticated: #1673122
X-Provags-ID: V01U2FsdGVkX1+DSj0V+MaDMo1FQIKgXBBcvd31qM5vGtOz2wekEL
	pt7elTfzVRRlpQ
Message-ID: <49E17B54.70903@gmx.de>
Date: Sun, 12 Apr 2009 07:25:40 +0200
From: Christoph Mallon <christoph.mallon@gmx.de>
User-Agent: Thunderbird 2.0.0.19 (X11/20090103)
MIME-Version: 1.0
To: Tim Kientzle <kientzle@FreeBSD.org>
References: <200904120445.n3C4jevv010898@svn.freebsd.org>
In-Reply-To: <200904120445.n3C4jevv010898@svn.freebsd.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
X-Y-GMX-Trusted: 0
X-FuHaFi: 0.54
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org
Subject: Re: svn commit: r190955 - 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: Sun, 12 Apr 2009 05:25:44 -0000

Tim Kientzle schrieb:
> Author: kientzle
> Date: Sun Apr 12 04:45:40 2009
> New Revision: 190955
> URL: http://svn.freebsd.org/changeset/base/190955
> 
> Log:
>   Merge r881 from libarchive.googlecode.com:  The "empty" format
>   should not be recognized if there is a read error.
> 
> Modified:
>   head/lib/libarchive/archive_read_support_format_empty.c
> 
> Modified: head/lib/libarchive/archive_read_support_format_empty.c
> ==============================================================================
> --- head/lib/libarchive/archive_read_support_format_empty.c	Sun Apr 12 03:45:03 2009	(r190954)
> +++ head/lib/libarchive/archive_read_support_format_empty.c	Sun Apr 12 04:45:40 2009	(r190955)
> @@ -60,9 +60,10 @@ static int
>  archive_read_format_empty_bid(struct archive_read *a)
>  {
>  	const void *h;
> +	ssize_t avail;
>  
> -	h = __archive_read_ahead(a, 1, NULL);
> -	if (h != NULL)
> +	h = __archive_read_ahead(a, 1, &avail);
> +	if (avail != 0)
>  		return (-1);
>  	return (1);
>  }

"h" now is write-only - is this intended or should the variable be removed?