Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 1 Aug 2017 06:51:03 +0000 (UTC)
From:      Ngie Cooper <ngie@FreeBSD.org>
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
Message-ID:  <201708010651.v716p3MW082483@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708010651.v716p3MW082483>