From owner-svn-src-stable@freebsd.org  Tue Aug  8 05:15:21 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 CF80DDC22CF;
 Tue,  8 Aug 2017 05:15:21 +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 9D8D56F77E;
 Tue,  8 Aug 2017 05:15:21 +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 v785FKGP097341;
 Tue, 8 Aug 2017 05:15:20 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v785FK1W097339;
 Tue, 8 Aug 2017 05:15:20 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201708080515.v785FK1W097339@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, 8 Aug 2017 05:15:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r322215 - in stable/11/tools/tools: bootparttest
 zfsboottest
X-SVN-Group: stable-11
X-SVN-Commit-Author: ngie
X-SVN-Commit-Paths: in stable/11/tools/tools: bootparttest zfsboottest
X-SVN-Commit-Revision: 322215
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Aug 2017 05:15:21 -0000

Author: ngie
Date: Tue Aug  8 05:15:20 2017
New Revision: 322215
URL: https://svnweb.freebsd.org/changeset/base/322215

Log:
  MFC r321849,r321852:
  
  r321849:
  
  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.
  
  r321852:
  
  Fix up r321849
  
  pager_output should return 0 if no more output needs to be paged; non-zero
  otherwise.
  
  MFC with:	r321849

Modified:
  stable/11/tools/tools/bootparttest/stub.c
  stable/11/tools/tools/zfsboottest/zfsboottest.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/tools/tools/bootparttest/stub.c
==============================================================================
--- stable/11/tools/tools/bootparttest/stub.c	Tue Aug  8 04:59:16 2017	(r322214)
+++ stable/11/tools/tools/bootparttest/stub.c	Tue Aug  8 05:15:20 2017	(r322215)
@@ -44,9 +44,10 @@ Free(void *ptr, const char *file, int line)
 	return (free(ptr));
 }
 
-void
+int
 pager_output(const char *s)
 {
 
 	printf("%s", s);
+	return (0);
 }

Modified: stable/11/tools/tools/zfsboottest/zfsboottest.c
==============================================================================
--- stable/11/tools/tools/zfsboottest/zfsboottest.c	Tue Aug  8 04:59:16 2017	(r322214)
+++ stable/11/tools/tools/zfsboottest/zfsboottest.c	Tue Aug  8 05:15:20 2017	(r322215)
@@ -43,11 +43,12 @@
 
 #define NBBY 8
 
-void
+int
 pager_output(const char *line)
 {
 
 	fprintf(stderr, "%s", line);
+	return (0);
 }
 
 #define ZFS_TEST