svn commit: r322215 - in stable/11/tools/tools: bootparttest zfsboottest

[Ngie Cooper]

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