Date: Tue, 1 Aug 2017 05:29:36 +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: r321849 - in head/tools/tools: bootparttest zfsboottest Message-ID: <201708010529.v715Ta2p047371@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708010529.v715Ta2p047371>