From owner-svn-src-all@freebsd.org  Tue Aug  1 06:51:04 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 7AC7FDB76E9;
 Tue,  1 Aug 2017 06:51:04 +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 4A2EB670A0;
 Tue,  1 Aug 2017 06:51:04 +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 v716p3I2082581;
 Tue, 1 Aug 2017 06:51:03 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v716p3MW082483;
 Tue, 1 Aug 2017 06:51:03 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201708010651.v716p3MW082483@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 06:51:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r321852 - 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: 321852
X-SVN-Commit-Repository: base
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.23
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: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Aug 2017 06:51:04 -0000

Author: ngie
Date: Tue Aug  1 06:51:03 2017
New Revision: 321852
URL: https://svnweb.freebsd.org/changeset/base/321852

Log:
  Fix up r321849
  
  pager_output should return 0 if no more output needs to be paged; non-zero
  otherwise.
  
  MFC after:	1 week
  MFC with:	r321849
  Reported by:	avg

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:39:40 2017	(r321851)
+++ head/tools/tools/bootparttest/stub.c	Tue Aug  1 06:51:03 2017	(r321852)
@@ -48,5 +48,6 @@ int
 pager_output(const char *s)
 {
 
-	return (printf("%s", s));
+	printf("%s", s);
+	return (0);
 }

Modified: head/tools/tools/zfsboottest/zfsboottest.c
==============================================================================
--- head/tools/tools/zfsboottest/zfsboottest.c	Tue Aug  1 05:39:40 2017	(r321851)
+++ head/tools/tools/zfsboottest/zfsboottest.c	Tue Aug  1 06:51:03 2017	(r321852)
@@ -47,7 +47,8 @@ int
 pager_output(const char *line)
 {
 
-	return (fprintf(stderr, "%s", line));
+	fprintf(stderr, "%s", line);
+	return (0);
 }
 
 #define ZFS_TEST