From owner-svn-src-all@FreeBSD.ORG  Sat Oct 26 19:59:42 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id A872487D;
 Sat, 26 Oct 2013 19:59:42 +0000 (UTC)
 (envelope-from bdrewery@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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 93E28200B;
 Sat, 26 Oct 2013 19:59:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9QJxgju011438;
 Sat, 26 Oct 2013 19:59:42 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9QJxgRp011437;
 Sat, 26 Oct 2013 19:59:42 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201310261959.r9QJxgRp011437@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Sat, 26 Oct 2013 19:59:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r257193 - head/usr.sbin/pkg
X-SVN-Group: head
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.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <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, 26 Oct 2013 19:59:42 -0000

Author: bdrewery (ports committer)
Date: Sat Oct 26 19:59:42 2013
New Revision: 257193
URL: http://svnweb.freebsd.org/changeset/base/257193

Log:
  Fix build with GCC.
  
  BIO_new_mem_buf takes a void* buf, but internally it never modifies the
  buf. It assigns the buffer to another pointer and then marks it as
  read-only. So deconsting it should be safe here.
  
  Also fix warning about 'buf' possibly being unused in parse_cert()
  
  Approved by:	bapt
  MFC after:	2 days
  X-MFC-With:	r257147

Modified:
  head/usr.sbin/pkg/pkg.c

Modified: head/usr.sbin/pkg/pkg.c
==============================================================================
--- head/usr.sbin/pkg/pkg.c	Sat Oct 26 19:54:28 2013	(r257192)
+++ head/usr.sbin/pkg/pkg.c	Sat Oct 26 19:59:42 2013	(r257193)
@@ -487,7 +487,7 @@ load_public_key_buf(const unsigned char 
 	BIO *bp;
 	char errbuf[1024];
 
-	bp = BIO_new_mem_buf((void *)cert, certlen);
+	bp = BIO_new_mem_buf(__DECONST(void *, cert), certlen);
 
 	if ((pkey = PEM_read_bio_PUBKEY(bp, NULL, NULL, NULL)) == NULL)
 		warnx("%s", ERR_error_string(ERR_get_error(), errbuf));
@@ -573,6 +573,7 @@ parse_cert(int fd) {
 	size_t linecap;
 	ssize_t linelen;
 
+	buf = NULL;
 	my_fd = -1;
 	sc = NULL;
 	line = NULL;