From owner-svn-src-head@freebsd.org  Wed Dec  9 19:22:21 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id EDE749D63F3;
 Wed,  9 Dec 2015 19:22:21 +0000 (UTC)
 (envelope-from rodrigc@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 BBD16152D;
 Wed,  9 Dec 2015 19:22:21 +0000 (UTC)
 (envelope-from rodrigc@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB9JMK7V092599;
 Wed, 9 Dec 2015 19:22:20 GMT (envelope-from rodrigc@FreeBSD.org)
Received: (from rodrigc@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB9JMK3t092598;
 Wed, 9 Dec 2015 19:22:20 GMT (envelope-from rodrigc@FreeBSD.org)
Message-Id: <201512091922.tB9JMK3t092598@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rodrigc set sender to
 rodrigc@FreeBSD.org using -f
From: Craig Rodrigues <rodrigc@FreeBSD.org>
Date: Wed, 9 Dec 2015 19:22:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r292023 - head/lib/libopenbsd
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Dec 2015 19:22:22 -0000

Author: rodrigc
Date: Wed Dec  9 19:22:20 2015
New Revision: 292023
URL: https://svnweb.freebsd.org/changeset/base/292023

Log:
  Merge from OpenBSD:
    revision 1.13
    date: 2015/12/09 11:54:12;  author: tb;  state: Exp;  lines: +2 -2
    Add a cast to silence a compiler warning by clang on FreeBSD.
    From Craig Rodrigues.
    ok tedu@

Modified:
  head/lib/libopenbsd/imsg.c

Modified: head/lib/libopenbsd/imsg.c
==============================================================================
--- head/lib/libopenbsd/imsg.c	Wed Dec  9 19:21:00 2015	(r292022)
+++ head/lib/libopenbsd/imsg.c	Wed Dec  9 19:22:20 2015	(r292023)
@@ -1,4 +1,4 @@
-/*	$OpenBSD: imsg.c,v 1.12 2015/12/05 13:06:52 claudio Exp $	*/
+/*	$OpenBSD: imsg.c,v 1.13 2015/12/09 11:54:12 tb Exp $	*/
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -74,7 +74,7 @@ imsg_read(struct imsgbuf *ibuf)
 
 again:
 	if (getdtablecount() + imsg_fd_overhead +
-	    (CMSG_SPACE(sizeof(int))-CMSG_SPACE(0))/sizeof(int)
+	    (int)((CMSG_SPACE(sizeof(int))-CMSG_SPACE(0))/sizeof(int))
 	    >= getdtablesize()) {
 		errno = EAGAIN;
 		free(ifd);