From owner-svn-src-all@FreeBSD.ORG Sat May 30 21:23:42 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 03FDA5D7;
Sat, 30 May 2015 21:23:42 +0000 (UTC)
(envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id E7E591AFB;
Sat, 30 May 2015 21:23:41 +0000 (UTC)
(envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4ULNfLW035620;
Sat, 30 May 2015 21:23:41 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4ULNfRG035619;
Sat, 30 May 2015 21:23:41 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201505302123.t4ULNfRG035619@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sat, 30 May 2015 21:23:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r283787 - stable/10/usr.sbin/pkg
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 May 2015 21:23:42 -0000
Author: bapt
Date: Sat May 30 21:23:41 2015
New Revision: 283787
URL: https://svnweb.freebsd.org/changeset/base/283787
Log:
MFC: r257701 (by bdrewery)
Remove condition which can never be true as the previous loop
is never exited while remote == NULL.
Modified:
stable/10/usr.sbin/pkg/pkg.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.sbin/pkg/pkg.c
==============================================================================
--- stable/10/usr.sbin/pkg/pkg.c Sat May 30 20:39:19 2015 (r283786)
+++ stable/10/usr.sbin/pkg/pkg.c Sat May 30 21:23:41 2015 (r283787)
@@ -238,9 +238,6 @@ fetch_to_fd(const char *url, char *path)
}
}
- if (remote == NULL)
- goto fetchfail;
-
while (done < st.size) {
if ((r = fread(buf, 1, sizeof(buf), remote)) < 1)
break;