From owner-svn-src-head@freebsd.org  Tue Aug  1 05:29:37 2017
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 DAA6EDAE093;
 Tue,  1 Aug 2017 05:29:37 +0000 (UTC)
 (envelope-from ngie@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 A409C64730;
 Tue,  1 Aug 2017 05:29:37 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v715Taur047373;
 Tue, 1 Aug 2017 05:29:36 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v715Ta2p047371;
 Tue, 1 Aug 2017 05:29:36 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201708010529.v715Ta2p047371@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Tue, 1 Aug 2017 05:29:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r321849 - in head/tools/tools: bootparttest zfsboottest
X-SVN-Group: head
X-SVN-Commit-Author: ngie
X-SVN-Commit-Paths: in head/tools/tools: bootparttest zfsboottest
X-SVN-Commit-Revision: 321849
X-SVN-Commit-Repository: base
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.23
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: Tue, 01 Aug 2017 05:29:38 -0000

Author: ngie
Date: Tue Aug  1 05:29:36 2017
New Revision: 321849
URL: https://svnweb.freebsd.org/changeset/base/321849

Log:
  Fix the return type for pager_output(..) in bootparttest and zfsboottest
  
  pager_output(..) has always returned int. For some reason (probably the
  clang 5.0 update), this mismatch now results in an error with CC=clang.
  
  MFC after:	1 week

Modified:
  head/tools/tools/bootparttest/stub.c
  head/tools/tools/zfsboottest/zfsboottest.c

Modified: head/tools/tools/bootparttest/stub.c
==============================================================================
--- head/tools/tools/bootparttest/stub.c	Tue Aug  1 05:26:45 2017	(r321848)
+++ head/tools/tools/bootparttest/stub.c	Tue Aug  1 05:29:36 2017	(r321849)
@@ -44,9 +44,9 @@ Free(void *ptr, const char *file, int line)
 	return (free(ptr));
 }
 
-void
+int
 pager_output(const char *s)
 {
 
-	printf("%s", s);
+	return (printf("%s", s));
 }

Modified: head/tools/tools/zfsboottest/zfsboottest.c
==============================================================================
--- head/tools/tools/zfsboottest/zfsboottest.c	Tue Aug  1 05:26:45 2017	(r321848)
+++ head/tools/tools/zfsboottest/zfsboottest.c	Tue Aug  1 05:29:36 2017	(r321849)
@@ -43,11 +43,11 @@
 
 #define NBBY 8
 
-void
+int
 pager_output(const char *line)
 {
 
-	fprintf(stderr, "%s", line);
+	return (fprintf(stderr, "%s", line));
 }
 
 #define ZFS_TEST