svn commit: r304951 - stable/11/usr.bin/tar/tests
Author: ngie Date: Sun Aug 28 07:19:33 2016 New Revision: 304951 URL: https://svnweb.freebsd.org/changeset/base/304951 Log: MFC r303804: Fix building usr.bin/tar/tests with PIE symbol building enabled by removing CFLAGS+= -static `CFLAGS+= -static` was a carryover from pre-r289195 with usr.bin/tar/test/Makefile that should have been specified in LDFLAGS There doesn't seem to be an apparent need for static compilation of the test binaries. Obtained-from:opBSD (418a491eed20d2603ddd1f1bd92c2c0d95094002) Modified: stable/11/usr.bin/tar/tests/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.bin/tar/tests/Makefile == --- stable/11/usr.bin/tar/tests/MakefileSun Aug 28 07:17:25 2016 (r304950) +++ stable/11/usr.bin/tar/tests/MakefileSun Aug 28 07:19:33 2016 (r304951) @@ -9,7 +9,6 @@ ATF_TESTS_SH+= functional_test BINDIR=${TESTSDIR} CFLAGS+= -DPLATFORM_CONFIG_H=\"${SRCTOP}/lib/libarchive/config_freebsd.h\" -CFLAGS+= -static CFLAGS+= -I${SRCTOP}/lib/libarchive -I${.OBJDIR} CFLAGS+= -I${_LIBARCHIVEDIR}/tar -I${_LIBARCHIVEDIR}/test_utils ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r304950 - stable/11/lib/libc/tests/resolv
Author: ngie Date: Sun Aug 28 07:17:25 2016 New Revision: 304950 URL: https://svnweb.freebsd.org/changeset/base/304950 Log: MFC r304033: Increase timeout from 10 minutes to 20 minutes for all tests On particular slow networks, it can (on average) take longer to resolve hosts to IP* addresses. 20 minutes seemed reasonable for my work network This will be solved in a more meaningful way (if possible) using concurrency in the near future Modified: stable/11/lib/libc/tests/resolv/resolv_test.c Directory Properties: stable/11/ (props changed) Modified: stable/11/lib/libc/tests/resolv/resolv_test.c == --- stable/11/lib/libc/tests/resolv/resolv_test.c Sun Aug 28 07:16:11 2016(r304949) +++ stable/11/lib/libc/tests/resolv/resolv_test.c Sun Aug 28 07:17:25 2016(r304950) @@ -291,7 +291,7 @@ do { \ ATF_TC(getaddrinfo_test); ATF_TC_HEAD(getaddrinfo_test, tc) { - atf_tc_set_md_var(tc, "timeout", "450"); + atf_tc_set_md_var(tc, "timeout", "1200"); } ATF_TC_BODY(getaddrinfo_test, tc) { @@ -301,7 +301,7 @@ ATF_TC_BODY(getaddrinfo_test, tc) ATF_TC(gethostby_test); ATF_TC_HEAD(gethostby_test, tc) { - atf_tc_set_md_var(tc, "timeout", "450"); + atf_tc_set_md_var(tc, "timeout", "1200"); } ATF_TC_BODY(gethostby_test, tc) { @@ -312,7 +312,7 @@ ATF_TC_BODY(gethostby_test, tc) ATF_TC(getipnodeby_test); ATF_TC_HEAD(getipnodeby_test, tc) { - atf_tc_set_md_var(tc, "timeout", "450"); + atf_tc_set_md_var(tc, "timeout", "1200"); } ATF_TC_BODY(getipnodeby_test, tc) { ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r304949 - stable/11/usr.bin/getconf
Author: ngie Date: Sun Aug 28 07:16:11 2016 New Revision: 304949 URL: https://svnweb.freebsd.org/changeset/base/304949 Log: MFC r303830,r304693,r304694,r304698: r303830: Remove vestigal references to __alpha__ Replace alpha reference in getconf(1) with amd64 [*] PR: 211300 [*] r304693: Clean up trailing whitespace r304694: Add `MIN_HOLE_SIZE` pathconf(2) support to getconf This allows shell programs to programmatically determine whether or not a filesystem supports sparse files r304698: Add support for _PC_ACL_NFS4 as TRUSTEDBSD_ACL_NFS4 The TRUSTEDBSD prefix was chosen for consistency with the other related `_PC_ACL*` prefixed variables. Modified: stable/11/usr.bin/getconf/getconf.c stable/11/usr.bin/getconf/pathconf.gperf Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.bin/getconf/getconf.c == --- stable/11/usr.bin/getconf/getconf.c Sun Aug 28 07:12:47 2016 (r304948) +++ stable/11/usr.bin/getconf/getconf.c Sun Aug 28 07:16:11 2016 (r304949) @@ -109,13 +109,13 @@ main(int argc, char **argv) do_confstr(name, key); else printf("undefined\n"); - } else { + } else { valid = find_sysconf(name, ); if (valid > 0) { do_sysconf(name, key); } else if (valid < 0) { printf("undefined\n"); - } else + } else errx(EX_USAGE, "no such configuration parameter `%s'", name); Modified: stable/11/usr.bin/getconf/pathconf.gperf == --- stable/11/usr.bin/getconf/pathconf.gperfSun Aug 28 07:12:47 2016 (r304948) +++ stable/11/usr.bin/getconf/pathconf.gperfSun Aug 28 07:16:11 2016 (r304949) @@ -24,6 +24,7 @@ FILESIZEBITS, _PC_FILESIZEBITS LINK_MAX, _PC_LINK_MAX MAX_CANON, _PC_MAX_CANON MAX_INPUT, _PC_MAX_INPUT +MIN_HOLE_SIZE, _PC_MIN_HOLE_SIZE NAME_MAX, _PC_NAME_MAX PATH_MAX, _PC_PATH_MAX PIPE_BUF, _PC_PIPE_BUF @@ -34,6 +35,7 @@ POSIX_REC_MIN_XFER_SIZE, _PC_REC_MIN_XFE POSIX_REC_XFER_ALIGN, _PC_REC_XFER_ALIGN SYMLINK_MAX, _PC_SYMLINK_MAX TRUSTEDBSD_ACL_EXTENDED, _PC_ACL_EXTENDED +TRUSTEDBSD_ACL_NFS4, _PC_ACL_NFS4 TRUSTEDBSD_ACL_PATH_MAX, _PC_ACL_PATH_MAX TRUSTEDBSD_CAP_PRESENT, _PC_CAP_PRESENT TRUSTEDBSD_INF_PRESENT, _PC_INF_PRESENT ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r304948 - in stable/11/cddl/usr.sbin/dtrace/tests: common/raise common/safety tools
Author: ngie Date: Sun Aug 28 07:12:47 2016 New Revision: 304948 URL: https://svnweb.freebsd.org/changeset/base/304948 Log: MFC r303900: Highball memory requirement (4GB) with common/{raise,safety} Both test suites require more memory than my amd64 VM using GENERIC-NODEBUG can provide and reliably panic it with OOM issues in dtrace(4). Some of the testcases fail, but this at least bypasses the panic behavior on platforms that don't have enough resources Discussed with: markj Modified: stable/11/cddl/usr.sbin/dtrace/tests/common/raise/Makefile stable/11/cddl/usr.sbin/dtrace/tests/common/safety/Makefile stable/11/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh Directory Properties: stable/11/ (props changed) Modified: stable/11/cddl/usr.sbin/dtrace/tests/common/raise/Makefile == --- stable/11/cddl/usr.sbin/dtrace/tests/common/raise/Makefile Sun Aug 28 07:10:48 2016(r304947) +++ stable/11/cddl/usr.sbin/dtrace/tests/common/raise/Makefile Sun Aug 28 07:12:47 2016(r304948) @@ -20,4 +20,6 @@ CFILES= \ tst.raise3.c \ +TEST_METADATA.t_dtrace_contrib+= required_memory="4g" + .include "../../dtrace.test.mk" Modified: stable/11/cddl/usr.sbin/dtrace/tests/common/safety/Makefile == --- stable/11/cddl/usr.sbin/dtrace/tests/common/safety/Makefile Sun Aug 28 07:10:48 2016(r304947) +++ stable/11/cddl/usr.sbin/dtrace/tests/common/safety/Makefile Sun Aug 28 07:12:47 2016(r304948) @@ -53,4 +53,6 @@ CFILES= \ +TEST_METADATA.t_dtrace_contrib+= required_memory="4g" + .include "../../dtrace.test.mk" Modified: stable/11/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh == --- stable/11/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh Sun Aug 28 07:10:48 2016(r304947) +++ stable/11/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh Sun Aug 28 07:12:47 2016(r304948) @@ -34,15 +34,28 @@ genmakefile() # One-off variable definitions. local special -if [ "$basedir" = proc ]; then +case "$basedir" in +proc) special=" LIBADD.tst.sigwait.exe+= rt " -elif [ "$basedir" = uctf ]; then +;; +raise) + special=" +TEST_METADATA.t_dtrace_contrib+= required_memory=\"4g\" +" +;; +safety) + special=" +TEST_METADATA.t_dtrace_contrib+= required_memory=\"4g\" +" +;; +uctf) special=" WITH_CTF=YES " -fi +;; +esac local makefile=$(mktemp) cat <<__EOF__ > $makefile ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r304947 - stable/11/tests/sys/kern/acct
Author: ngie Date: Sun Aug 28 07:10:48 2016 New Revision: 304947 URL: https://svnweb.freebsd.org/changeset/base/304947 Log: MFC r304238: Only expect :encode_tv_random_million to fail on 64-bit platforms It passes on i386 Modified: stable/11/tests/sys/kern/acct/acct_test.c Directory Properties: stable/11/ (props changed) Modified: stable/11/tests/sys/kern/acct/acct_test.c == --- stable/11/tests/sys/kern/acct/acct_test.c Sun Aug 28 07:09:45 2016 (r304946) +++ stable/11/tests/sys/kern/acct/acct_test.c Sun Aug 28 07:10:48 2016 (r304947) @@ -204,7 +204,10 @@ ATF_TC_BODY(encode_tv_random_million, tc struct timeval tv; long k; - atf_tc_expect_fail("the testcase violates FLT_EPSILON"); +#ifdef __LP64__ + atf_tc_expect_fail("the testcase violates FLT_EPSILON on 64-bit " + "platforms, e.g. amd64"); +#endif ATF_REQUIRE_MSG(unsetenv("TZ") == 0, "unsetting TZ failed; errno=%d", errno); ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r304946 - stable/11/tests/sys/acl
Author: ngie Date: Sun Aug 28 07:09:45 2016 New Revision: 304946 URL: https://svnweb.freebsd.org/changeset/base/304946 Log: MFC r304040: Redirect the output of the testcases to stderr instead of redirecting it to /dev/null This will aid in debugging failures Modified: stable/11/tests/sys/acl/00.sh stable/11/tests/sys/acl/01.sh stable/11/tests/sys/acl/02.sh stable/11/tests/sys/acl/03.sh stable/11/tests/sys/acl/04.sh Directory Properties: stable/11/ (props changed) Modified: stable/11/tests/sys/acl/00.sh == --- stable/11/tests/sys/acl/00.sh Sun Aug 28 07:08:29 2016 (r304945) +++ stable/11/tests/sys/acl/00.sh Sun Aug 28 07:09:45 2016 (r304946) @@ -75,7 +75,7 @@ chmod 600 xxx rm xxx echo "ok 2" -perl $TESTDIR/run $TESTDIR/tools-posix.test > /dev/null +perl $TESTDIR/run $TESTDIR/tools-posix.test >&2 if [ $? -eq 0 ]; then echo "ok 3" Modified: stable/11/tests/sys/acl/01.sh == --- stable/11/tests/sys/acl/01.sh Sun Aug 28 07:08:29 2016 (r304945) +++ stable/11/tests/sys/acl/01.sh Sun Aug 28 07:09:45 2016 (r304946) @@ -76,7 +76,7 @@ chmod 600 xxx rm xxx echo "ok 2" -perl $TESTDIR/run $TESTDIR/tools-nfs4-psarc.test > /dev/null +perl $TESTDIR/run $TESTDIR/tools-nfs4-psarc.test >&2 if [ $? -eq 0 ]; then echo "ok 3" Modified: stable/11/tests/sys/acl/02.sh == --- stable/11/tests/sys/acl/02.sh Sun Aug 28 07:08:29 2016 (r304945) +++ stable/11/tests/sys/acl/02.sh Sun Aug 28 07:09:45 2016 (r304946) @@ -76,9 +76,9 @@ rm xxx echo "ok 2" if [ `sysctl -n vfs.acl_nfs4_old_semantics` = 0 ]; then - perl $TESTDIR/run $TESTDIR/tools-nfs4-psarc.test > /dev/null + perl $TESTDIR/run $TESTDIR/tools-nfs4-psarc.test >&2 else - perl $TESTDIR/run $TESTDIR/tools-nfs4.test > /dev/null + perl $TESTDIR/run $TESTDIR/tools-nfs4.test >&2 fi if [ $? -eq 0 ]; then Modified: stable/11/tests/sys/acl/03.sh == --- stable/11/tests/sys/acl/03.sh Sun Aug 28 07:08:29 2016 (r304945) +++ stable/11/tests/sys/acl/03.sh Sun Aug 28 07:09:45 2016 (r304946) @@ -89,7 +89,7 @@ echo "ok 3" cd $MNTROOT -perl $TESTDIR/run $TESTDIR/tools-crossfs.test > /dev/null +perl $TESTDIR/run $TESTDIR/tools-crossfs.test >&2 if [ $? -eq 0 ]; then echo "ok 4" Modified: stable/11/tests/sys/acl/04.sh == --- stable/11/tests/sys/acl/04.sh Sun Aug 28 07:08:29 2016 (r304945) +++ stable/11/tests/sys/acl/04.sh Sun Aug 28 07:09:45 2016 (r304946) @@ -57,7 +57,7 @@ echo "ok 1" cd $MNT -perl $TESTDIR/run $TESTDIR/tools-nfs4-trivial.test > /dev/null +perl $TESTDIR/run $TESTDIR/tools-nfs4-trivial.test >&2 if [ $? -eq 0 ]; then echo "ok 2" ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r304945 - stable/11/lib/libc/net
Author: ngie Date: Sun Aug 28 07:08:29 2016 New Revision: 304945 URL: https://svnweb.freebsd.org/changeset/base/304945 Log: MFC r304034: Initialize `ai` to NULL and test for `ai` with type-appropriate values Depending on the address family and ai_flags containing AI_V4MAPPED, it might not do a proper DNS lookup on the provided DNS address Convert some `ai` boolean true/false checks to NULL/non-NULL while here. PR: 211790 Modified: stable/11/lib/libc/net/getaddrinfo.c Directory Properties: stable/11/ (props changed) Modified: stable/11/lib/libc/net/getaddrinfo.c == --- stable/11/lib/libc/net/getaddrinfo.cSun Aug 28 05:42:03 2016 (r304944) +++ stable/11/lib/libc/net/getaddrinfo.cSun Aug 28 07:08:29 2016 (r304945) @@ -2249,6 +2249,8 @@ _dns_getaddrinfo(void *rv, void *cb_data struct res_target q, q2; res_state res; + ai = NULL; + hostname = va_arg(ap, char *); pai = va_arg(ap, const struct addrinfo *); @@ -2327,16 +2329,16 @@ _dns_getaddrinfo(void *rv, void *cb_data /* prefer IPv6 */ if (q.next) { ai = getanswer(buf2, q2.n, q2.name, q2.qtype, pai, res); - if (ai) { + if (ai != NULL) { cur->ai_next = ai; while (cur && cur->ai_next) cur = cur->ai_next; } } - if (!ai || pai->ai_family != AF_UNSPEC || + if (ai == NULL || pai->ai_family != AF_UNSPEC || (pai->ai_flags & (AI_ALL | AI_V4MAPPED)) != AI_V4MAPPED) { ai = getanswer(buf, q.n, q.name, q.qtype, pai, res); - if (ai) + if (ai != NULL) cur->ai_next = ai; } free(buf); ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r304809 - head/usr.bin/getconf
Author: ngie Date: Thu Aug 25 17:07:43 2016 New Revision: 304809 URL: https://svnweb.freebsd.org/changeset/base/304809 Log: Add non-TRUSTEDBSD prefixed knobs for the _PC_ACL* and {CAP,INF,MAC}_PRESENT knobs It's not necessarily intuitive that the variables to query contain TRUSTEDBSD in the prefix. Add non-TRUSTEDBSD prefixed knobs for querying things like "_PC_ACL_NFS4". MFC after:1 week Relnotes: yes Reviewed by: wollman Sponsored by: EMC / Isilon Storage Division Differential Revision:https://reviews.freebsd.org/D7618 Modified: head/usr.bin/getconf/pathconf.gperf Modified: head/usr.bin/getconf/pathconf.gperf == --- head/usr.bin/getconf/pathconf.gperf Thu Aug 25 16:35:42 2016 (r304808) +++ head/usr.bin/getconf/pathconf.gperf Thu Aug 25 17:07:43 2016 (r304809) @@ -20,8 +20,14 @@ static const struct map *in_word_set(con %} struct map { const char *name; int key; int valid; }; %% +ACL_EXTENDED, _PC_ACL_EXTENDED +ACL_NFS4, _PC_ACL_NFS4 +ACL_PATH_MAX, _PC_ACL_PATH_MAX +CAP_PRESENT, _PC_CAP_PRESENT FILESIZEBITS, _PC_FILESIZEBITS +INF_PRESENT, _PC_INF_PRESENT LINK_MAX, _PC_LINK_MAX +MAC_PRESENT, _PC_MAC_PRESENT MAX_CANON, _PC_MAX_CANON MAX_INPUT, _PC_MAX_INPUT MIN_HOLE_SIZE, _PC_MIN_HOLE_SIZE ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r304698 - head/usr.bin/getconf
Author: ngie Date: Tue Aug 23 19:41:49 2016 New Revision: 304698 URL: https://svnweb.freebsd.org/changeset/base/304698 Log: Add support for _PC_ACL_NFS4 as TRUSTEDBSD_ACL_NFS4 The TRUSTEDBSD prefix was chosen for consistency with the other related `_PC_ACL*` prefixed variables. MFC after: 3 days Sponsored by: EMC / Isilon Storage Division Modified: head/usr.bin/getconf/pathconf.gperf Modified: head/usr.bin/getconf/pathconf.gperf == --- head/usr.bin/getconf/pathconf.gperf Tue Aug 23 19:37:18 2016 (r304697) +++ head/usr.bin/getconf/pathconf.gperf Tue Aug 23 19:41:49 2016 (r304698) @@ -35,6 +35,7 @@ POSIX_REC_MIN_XFER_SIZE, _PC_REC_MIN_XFE POSIX_REC_XFER_ALIGN, _PC_REC_XFER_ALIGN SYMLINK_MAX, _PC_SYMLINK_MAX TRUSTEDBSD_ACL_EXTENDED, _PC_ACL_EXTENDED +TRUSTEDBSD_ACL_NFS4, _PC_ACL_NFS4 TRUSTEDBSD_ACL_PATH_MAX, _PC_ACL_PATH_MAX TRUSTEDBSD_CAP_PRESENT, _PC_CAP_PRESENT TRUSTEDBSD_INF_PRESENT, _PC_INF_PRESENT ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r304694 - head/usr.bin/getconf
Author: ngie Date: Tue Aug 23 19:28:01 2016 New Revision: 304694 URL: https://svnweb.freebsd.org/changeset/base/304694 Log: Add `MIN_HOLE_SIZE` pathconf(2) support to getconf This allows shell programs to programmatically determine whether or not a filesystem supports sparse files MFC after: 3 days Sponsored by: EMC / Isilon Storage Division Modified: head/usr.bin/getconf/pathconf.gperf Modified: head/usr.bin/getconf/pathconf.gperf == --- head/usr.bin/getconf/pathconf.gperf Tue Aug 23 19:15:01 2016 (r304693) +++ head/usr.bin/getconf/pathconf.gperf Tue Aug 23 19:28:01 2016 (r304694) @@ -24,6 +24,7 @@ FILESIZEBITS, _PC_FILESIZEBITS LINK_MAX, _PC_LINK_MAX MAX_CANON, _PC_MAX_CANON MAX_INPUT, _PC_MAX_INPUT +MIN_HOLE_SIZE, _PC_MIN_HOLE_SIZE NAME_MAX, _PC_NAME_MAX PATH_MAX, _PC_PATH_MAX PIPE_BUF, _PC_PIPE_BUF ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r304693 - head/usr.bin/getconf
Author: ngie Date: Tue Aug 23 19:15:01 2016 New Revision: 304693 URL: https://svnweb.freebsd.org/changeset/base/304693 Log: Clean up trailing whitespace MFC after: 3 days Sponsored by: EMC / Isilon Storage Division Modified: head/usr.bin/getconf/getconf.c Modified: head/usr.bin/getconf/getconf.c == --- head/usr.bin/getconf/getconf.c Tue Aug 23 19:03:11 2016 (r304692) +++ head/usr.bin/getconf/getconf.c Tue Aug 23 19:15:01 2016 (r304693) @@ -109,13 +109,13 @@ main(int argc, char **argv) do_confstr(name, key); else printf("undefined\n"); - } else { + } else { valid = find_sysconf(name, ); if (valid > 0) { do_sysconf(name, key); } else if (valid < 0) { printf("undefined\n"); - } else + } else errx(EX_USAGE, "no such configuration parameter `%s'", name); ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r304553 - stable/10/lib/libc/tests/stdlib
Author: ngie Date: Sun Aug 21 05:08:37 2016 New Revision: 304553 URL: https://svnweb.freebsd.org/changeset/base/304553 Log: Unbreak the build when MK_TESTS != no after r304527 - src.opts.mk should be bsd.own.mk on ^/stable/10 - LIBADD should be DPADD/LDADD on ^/stable/10 Pointyhat to: kib Reported by: Olivier PinterSponsored by: EMC / Isilon Storage Division Modified: stable/10/lib/libc/tests/stdlib/Makefile Modified: stable/10/lib/libc/tests/stdlib/Makefile == --- stable/10/lib/libc/tests/stdlib/MakefileSun Aug 21 00:48:41 2016 (r304552) +++ stable/10/lib/libc/tests/stdlib/MakefileSun Aug 21 05:08:37 2016 (r304553) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include +.include ATF_TESTS_C+= heapsort_test ATF_TESTS_C+= mergesort_test @@ -42,7 +42,8 @@ CFLAGS+= -I${.CURDIR} CXXFLAGS.cxa_thread_atexit_test+= -std=c++11 CXXFLAGS.cxa_thread_atexit_nothr_test+=-std=c++11 -LIBADD.cxa_thread_atexit_test+=pthread +DPADD.cxa_thread_atexit_test+= ${LIBPTHREAD} +LDADD.cxa_thread_atexit_test+= -lpthread .for t in h_getopt h_getopt_long CFLAGS.$t+=-I${LIBNETBSD_SRCDIR} -I${SRCTOP}/contrib/netbsd-tests ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r304238 - head/tests/sys/kern/acct
Author: ngie Date: Tue Aug 16 20:35:36 2016 New Revision: 304238 URL: https://svnweb.freebsd.org/changeset/base/304238 Log: Only expect :encode_tv_random_million to fail on 64-bit platforms It passes on i386 MFC after:1 week Sponsored by: EMC / Isilon Storage Division Modified: head/tests/sys/kern/acct/acct_test.c Directory Properties: head/ (props changed) Modified: head/tests/sys/kern/acct/acct_test.c == --- head/tests/sys/kern/acct/acct_test.cTue Aug 16 20:32:08 2016 (r304237) +++ head/tests/sys/kern/acct/acct_test.cTue Aug 16 20:35:36 2016 (r304238) @@ -204,7 +204,10 @@ ATF_TC_BODY(encode_tv_random_million, tc struct timeval tv; long k; - atf_tc_expect_fail("the testcase violates FLT_EPSILON"); +#ifdef __LP64__ + atf_tc_expect_fail("the testcase violates FLT_EPSILON on 64-bit " + "platforms, e.g. amd64"); +#endif ATF_REQUIRE_MSG(unsetenv("TZ") == 0, "unsetting TZ failed; errno=%d", errno); ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r304211 - stable/9/usr.bin/getconf
Author: ngie Date: Tue Aug 16 08:48:41 2016 New Revision: 304211 URL: https://svnweb.freebsd.org/changeset/base/304211 Log: MFstable/10 r304210: MFstable/11 r304208: MFC r303830: Remove vestigal references to __alpha__ Replace alpha reference in getconf(1) with amd64 [*] PR: 211300 [*] Modified: stable/9/usr.bin/getconf/getconf.1 stable/9/usr.bin/getconf/progenv.gperf Directory Properties: stable/9/ (props changed) stable/9/usr.bin/ (props changed) Modified: stable/9/usr.bin/getconf/getconf.1 == --- stable/9/usr.bin/getconf/getconf.1 Tue Aug 16 08:30:28 2016 (r304210) +++ stable/9/usr.bin/getconf/getconf.1 Tue Aug 16 08:48:41 2016 (r304211) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 18, 2002 +.Dd August 8, 2016 .Dt GETCONF 1 .Os .Sh NAME @@ -122,7 +122,7 @@ Exactly 32-bit integer, long, and pointe .It Li POSIX_V6_LP64_OFF64 Exactly 32-bit integer; exactly 64-bit long, pointer, and file offset. .Sy Supported platforms : -.Tn Alpha , +.Tn AMD64 , .Tn SPARC64 . .It Li POSIX_V6_LPBIG_OFFBIG At least 32-bit integer; at least 64-bit long, pointer, and file offset. Modified: stable/9/usr.bin/getconf/progenv.gperf == --- stable/9/usr.bin/getconf/progenv.gperf Tue Aug 16 08:30:28 2016 (r304210) +++ stable/9/usr.bin/getconf/progenv.gperf Tue Aug 16 08:48:41 2016 (r304211) @@ -30,7 +30,7 @@ static const struct map *in_word_set(con * be updated. (We cheat here and define the supported environments * statically.) */ -#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) +#if defined(__sparc64__) || defined(__amd64__) #definehave_LP64_OFF64 NULL #endif ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r304210 - stable/10/usr.bin/getconf
Author: ngie Date: Tue Aug 16 08:30:28 2016 New Revision: 304210 URL: https://svnweb.freebsd.org/changeset/base/304210 Log: MFstable/11 r304208: MFC r303830: Remove vestigal references to __alpha__ Replace alpha reference in getconf(1) with amd64 [*] PR: 211300 [*] Modified: stable/10/usr.bin/getconf/getconf.1 stable/10/usr.bin/getconf/progenv.gperf Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.bin/getconf/getconf.1 == --- stable/10/usr.bin/getconf/getconf.1 Tue Aug 16 08:27:03 2016 (r304209) +++ stable/10/usr.bin/getconf/getconf.1 Tue Aug 16 08:30:28 2016 (r304210) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 18, 2002 +.Dd August 8, 2016 .Dt GETCONF 1 .Os .Sh NAME @@ -122,7 +122,7 @@ Exactly 32-bit integer, long, and pointe .It Li POSIX_V6_LP64_OFF64 Exactly 32-bit integer; exactly 64-bit long, pointer, and file offset. .Sy Supported platforms : -.Tn Alpha , +.Tn AMD64 , .Tn SPARC64 . .It Li POSIX_V6_LPBIG_OFFBIG At least 32-bit integer; at least 64-bit long, pointer, and file offset. Modified: stable/10/usr.bin/getconf/progenv.gperf == --- stable/10/usr.bin/getconf/progenv.gperf Tue Aug 16 08:27:03 2016 (r304209) +++ stable/10/usr.bin/getconf/progenv.gperf Tue Aug 16 08:30:28 2016 (r304210) @@ -30,7 +30,7 @@ static const struct map *in_word_set(con * be updated. (We cheat here and define the supported environments * statically.) */ -#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) +#if defined(__sparc64__) || defined(__amd64__) #definehave_LP64_OFF64 NULL #endif ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r304208 - stable/11/usr.bin/getconf
Author: ngie Date: Tue Aug 16 08:16:54 2016 New Revision: 304208 URL: https://svnweb.freebsd.org/changeset/base/304208 Log: MFC r303830: Remove vestigal references to __alpha__ Replace alpha reference in getconf(1) with amd64 [*] PR: 211300 [*] Modified: stable/11/usr.bin/getconf/getconf.1 stable/11/usr.bin/getconf/progenv.gperf Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.bin/getconf/getconf.1 == --- stable/11/usr.bin/getconf/getconf.1 Tue Aug 16 07:51:05 2016 (r304207) +++ stable/11/usr.bin/getconf/getconf.1 Tue Aug 16 08:16:54 2016 (r304208) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 18, 2002 +.Dd August 8, 2016 .Dt GETCONF 1 .Os .Sh NAME @@ -122,7 +122,7 @@ Exactly 32-bit integer, long, and pointe .It Li POSIX_V6_LP64_OFF64 Exactly 32-bit integer; exactly 64-bit long, pointer, and file offset. .Sy Supported platforms : -.Tn Alpha , +.Tn AMD64 , .Tn SPARC64 . .It Li POSIX_V6_LPBIG_OFFBIG At least 32-bit integer; at least 64-bit long, pointer, and file offset. Modified: stable/11/usr.bin/getconf/progenv.gperf == --- stable/11/usr.bin/getconf/progenv.gperf Tue Aug 16 07:51:05 2016 (r304207) +++ stable/11/usr.bin/getconf/progenv.gperf Tue Aug 16 08:16:54 2016 (r304208) @@ -30,7 +30,7 @@ static const struct map *in_word_set(con * be updated. (We cheat here and define the supported environments * statically.) */ -#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) +#if defined(__sparc64__) || defined(__amd64__) #definehave_LP64_OFF64 NULL #endif ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r304040 - head/tests/sys/acl
Author: ngie Date: Sat Aug 13 06:26:33 2016 New Revision: 304040 URL: https://svnweb.freebsd.org/changeset/base/304040 Log: Redirect the output of the testcases to stderr instead of redirecting it to /dev/null This will aid in debugging failures MFC after:1 week Sponsored by: EMC / Isilon Storage Division Modified: head/tests/sys/acl/00.sh head/tests/sys/acl/01.sh head/tests/sys/acl/02.sh head/tests/sys/acl/03.sh head/tests/sys/acl/04.sh Modified: head/tests/sys/acl/00.sh == --- head/tests/sys/acl/00.shSat Aug 13 06:16:38 2016(r304039) +++ head/tests/sys/acl/00.shSat Aug 13 06:26:33 2016(r304040) @@ -75,7 +75,7 @@ chmod 600 xxx rm xxx echo "ok 2" -perl $TESTDIR/run $TESTDIR/tools-posix.test > /dev/null +perl $TESTDIR/run $TESTDIR/tools-posix.test >&2 if [ $? -eq 0 ]; then echo "ok 3" Modified: head/tests/sys/acl/01.sh == --- head/tests/sys/acl/01.shSat Aug 13 06:16:38 2016(r304039) +++ head/tests/sys/acl/01.shSat Aug 13 06:26:33 2016(r304040) @@ -76,7 +76,7 @@ chmod 600 xxx rm xxx echo "ok 2" -perl $TESTDIR/run $TESTDIR/tools-nfs4-psarc.test > /dev/null +perl $TESTDIR/run $TESTDIR/tools-nfs4-psarc.test >&2 if [ $? -eq 0 ]; then echo "ok 3" Modified: head/tests/sys/acl/02.sh == --- head/tests/sys/acl/02.shSat Aug 13 06:16:38 2016(r304039) +++ head/tests/sys/acl/02.shSat Aug 13 06:26:33 2016(r304040) @@ -76,9 +76,9 @@ rm xxx echo "ok 2" if [ `sysctl -n vfs.acl_nfs4_old_semantics` = 0 ]; then - perl $TESTDIR/run $TESTDIR/tools-nfs4-psarc.test > /dev/null + perl $TESTDIR/run $TESTDIR/tools-nfs4-psarc.test >&2 else - perl $TESTDIR/run $TESTDIR/tools-nfs4.test > /dev/null + perl $TESTDIR/run $TESTDIR/tools-nfs4.test >&2 fi if [ $? -eq 0 ]; then Modified: head/tests/sys/acl/03.sh == --- head/tests/sys/acl/03.shSat Aug 13 06:16:38 2016(r304039) +++ head/tests/sys/acl/03.shSat Aug 13 06:26:33 2016(r304040) @@ -89,7 +89,7 @@ echo "ok 3" cd $MNTROOT -perl $TESTDIR/run $TESTDIR/tools-crossfs.test > /dev/null +perl $TESTDIR/run $TESTDIR/tools-crossfs.test >&2 if [ $? -eq 0 ]; then echo "ok 4" Modified: head/tests/sys/acl/04.sh == --- head/tests/sys/acl/04.shSat Aug 13 06:16:38 2016(r304039) +++ head/tests/sys/acl/04.shSat Aug 13 06:26:33 2016(r304040) @@ -57,7 +57,7 @@ echo "ok 1" cd $MNT -perl $TESTDIR/run $TESTDIR/tools-nfs4-trivial.test > /dev/null +perl $TESTDIR/run $TESTDIR/tools-nfs4-trivial.test >&2 if [ $? -eq 0 ]; then echo "ok 2" ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r304034 - head/lib/libc/net
Author: ngie Date: Sat Aug 13 02:05:06 2016 New Revision: 304034 URL: https://svnweb.freebsd.org/changeset/base/304034 Log: Initialize `ai` to NULL and test for `ai` with type-appropriate values Depending on the address family and ai_flags containing AI_V4MAPPED, it might not do a proper DNS lookup on the provided DNS address Convert some `ai` boolean true/false checks to NULL/non-NULL while here. MFC after:1 week PR: 211790 Reported by: herbie.robin...@stratus.com Sponsored by: EMC / Isilon Storage Division Modified: head/lib/libc/net/getaddrinfo.c Modified: head/lib/libc/net/getaddrinfo.c == --- head/lib/libc/net/getaddrinfo.c Sat Aug 13 01:49:11 2016 (r304033) +++ head/lib/libc/net/getaddrinfo.c Sat Aug 13 02:05:06 2016 (r304034) @@ -2249,6 +2249,8 @@ _dns_getaddrinfo(void *rv, void *cb_data struct res_target q, q2; res_state res; + ai = NULL; + hostname = va_arg(ap, char *); pai = va_arg(ap, const struct addrinfo *); @@ -2327,16 +2329,16 @@ _dns_getaddrinfo(void *rv, void *cb_data /* prefer IPv6 */ if (q.next) { ai = getanswer(buf2, q2.n, q2.name, q2.qtype, pai, res); - if (ai) { + if (ai != NULL) { cur->ai_next = ai; while (cur && cur->ai_next) cur = cur->ai_next; } } - if (!ai || pai->ai_family != AF_UNSPEC || + if (ai == NULL || pai->ai_family != AF_UNSPEC || (pai->ai_flags & (AI_ALL | AI_V4MAPPED)) != AI_V4MAPPED) { ai = getanswer(buf, q.n, q.name, q.qtype, pai, res); - if (ai) + if (ai != NULL) cur->ai_next = ai; } free(buf); ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r304033 - head/lib/libc/tests/resolv
Author: ngie Date: Sat Aug 13 01:49:11 2016 New Revision: 304033 URL: https://svnweb.freebsd.org/changeset/base/304033 Log: Increase timeout from 10 minutes to 20 minutes for all tests On particular slow networks, it can (on average) take longer to resolve hosts to IP* addresses. 20 minutes seemed reasonable for my work network This will be solved in a more meaningful way (if possible) using concurrency in the near future MFC after: 2 weeks Sponsored by: EMC / Isilon Storage Division Modified: head/lib/libc/tests/resolv/resolv_test.c Modified: head/lib/libc/tests/resolv/resolv_test.c == --- head/lib/libc/tests/resolv/resolv_test.cSat Aug 13 01:40:08 2016 (r304032) +++ head/lib/libc/tests/resolv/resolv_test.cSat Aug 13 01:49:11 2016 (r304033) @@ -291,7 +291,7 @@ do { \ ATF_TC(getaddrinfo_test); ATF_TC_HEAD(getaddrinfo_test, tc) { - atf_tc_set_md_var(tc, "timeout", "450"); + atf_tc_set_md_var(tc, "timeout", "1200"); } ATF_TC_BODY(getaddrinfo_test, tc) { @@ -301,7 +301,7 @@ ATF_TC_BODY(getaddrinfo_test, tc) ATF_TC(gethostby_test); ATF_TC_HEAD(gethostby_test, tc) { - atf_tc_set_md_var(tc, "timeout", "450"); + atf_tc_set_md_var(tc, "timeout", "1200"); } ATF_TC_BODY(gethostby_test, tc) { @@ -312,7 +312,7 @@ ATF_TC_BODY(gethostby_test, tc) ATF_TC(getipnodeby_test); ATF_TC_HEAD(getipnodeby_test, tc) { - atf_tc_set_md_var(tc, "timeout", "450"); + atf_tc_set_md_var(tc, "timeout", "1200"); } ATF_TC_BODY(getipnodeby_test, tc) { ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r303987 - vendor/NetBSD/tests/08.11.2016_18.01
Author: ngie Date: Fri Aug 12 06:19:40 2016 New Revision: 303987 URL: https://svnweb.freebsd.org/changeset/base/303987 Log: Copy snapshot of .../dist to .../08.11.2016_18.01 Added: vendor/NetBSD/tests/08.11.2016_18.01/ - copied from r303986, vendor/NetBSD/tests/dist/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r303986 - in vendor/NetBSD/tests/dist: dev/fss/CVS dev/usb/CVS dev/usb/libhid/CVS dev/usb/t_hid/CVS lib/libusbhid/CVS net/arp/CVS net/if_gif/CVS net/if_pppoe/CVS net/if_tap/CVS net/in_c...
Author: ngie Date: Fri Aug 12 06:16:14 2016 New Revision: 303986 URL: https://svnweb.freebsd.org/changeset/base/303986 Log: Remove CVS directories accidentally added in r303980 Deleted: vendor/NetBSD/tests/dist/dev/fss/CVS/ vendor/NetBSD/tests/dist/dev/usb/CVS/ vendor/NetBSD/tests/dist/dev/usb/libhid/CVS/ vendor/NetBSD/tests/dist/dev/usb/t_hid/CVS/ vendor/NetBSD/tests/dist/lib/libusbhid/CVS/ vendor/NetBSD/tests/dist/net/arp/CVS/ vendor/NetBSD/tests/dist/net/if_gif/CVS/ vendor/NetBSD/tests/dist/net/if_pppoe/CVS/ vendor/NetBSD/tests/dist/net/if_tap/CVS/ vendor/NetBSD/tests/dist/net/in_cksum/CVS/ vendor/NetBSD/tests/dist/net/mcast/CVS/ vendor/NetBSD/tests/dist/net/ndp/CVS/ vendor/NetBSD/tests/dist/sbin/gpt/CVS/ vendor/NetBSD/tests/dist/sys/net/CVS/ vendor/NetBSD/tests/dist/sys/netatalk/CVS/ vendor/NetBSD/tests/dist/sys/netinet/CVS/ vendor/NetBSD/tests/dist/sys/netinet6/CVS/ vendor/NetBSD/tests/dist/usr.bin/gdb/CVS/ vendor/NetBSD/tests/dist/usr.bin/ld/CVS/ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r303980 - in vendor/NetBSD/tests/dist: . bin/cat bin/sh bin/sh/dotcmd crypto/opencrypto dev dev/audio dev/dm dev/fss dev/fss/CVS dev/md dev/scsipi dev/sysmon dev/usb dev/usb/CVS dev/usb...
Author: ngie Date: Fri Aug 12 01:05:07 2016 New Revision: 303980 URL: https://svnweb.freebsd.org/changeset/base/303980 Log: Update ^/vendor/NetBSD/tests/dist to a more recent snapshot Pulled on "Thu Aug 11 18:01:19 PDT 2016" Added: vendor/NetBSD/tests/dist/bin/cat/d_se_output.in (contents, props changed) vendor/NetBSD/tests/dist/bin/cat/d_se_output.out vendor/NetBSD/tests/dist/bin/sh/t_arith.sh (contents, props changed) vendor/NetBSD/tests/dist/bin/sh/t_cmdsub.sh (contents, props changed) vendor/NetBSD/tests/dist/bin/sh/t_option.sh (contents, props changed) vendor/NetBSD/tests/dist/bin/sh/t_redir.sh (contents, props changed) vendor/NetBSD/tests/dist/bin/sh/t_redircloexec.sh (contents, props changed) vendor/NetBSD/tests/dist/bin/sh/t_shift.sh (contents, props changed) vendor/NetBSD/tests/dist/bin/sh/t_varval.sh (contents, props changed) vendor/NetBSD/tests/dist/dev/fss/ vendor/NetBSD/tests/dist/dev/fss/CVS/ vendor/NetBSD/tests/dist/dev/fss/CVS/Entries vendor/NetBSD/tests/dist/dev/fss/CVS/Repository vendor/NetBSD/tests/dist/dev/fss/CVS/Root vendor/NetBSD/tests/dist/dev/fss/CVS/Tag vendor/NetBSD/tests/dist/dev/fss/Makefile (contents, props changed) vendor/NetBSD/tests/dist/dev/fss/t_fss.sh (contents, props changed) vendor/NetBSD/tests/dist/dev/usb/ vendor/NetBSD/tests/dist/dev/usb/CVS/ vendor/NetBSD/tests/dist/dev/usb/CVS/Entries vendor/NetBSD/tests/dist/dev/usb/CVS/Repository vendor/NetBSD/tests/dist/dev/usb/CVS/Root vendor/NetBSD/tests/dist/dev/usb/CVS/Tag vendor/NetBSD/tests/dist/dev/usb/Makefile (contents, props changed) vendor/NetBSD/tests/dist/dev/usb/libhid/ vendor/NetBSD/tests/dist/dev/usb/libhid/CVS/ vendor/NetBSD/tests/dist/dev/usb/libhid/CVS/Entries vendor/NetBSD/tests/dist/dev/usb/libhid/CVS/Repository vendor/NetBSD/tests/dist/dev/usb/libhid/CVS/Root vendor/NetBSD/tests/dist/dev/usb/libhid/CVS/Tag vendor/NetBSD/tests/dist/dev/usb/libhid/Makefile (contents, props changed) vendor/NetBSD/tests/dist/dev/usb/t_hid/ vendor/NetBSD/tests/dist/dev/usb/t_hid.c (contents, props changed) vendor/NetBSD/tests/dist/dev/usb/t_hid/CVS/ vendor/NetBSD/tests/dist/dev/usb/t_hid/CVS/Entries vendor/NetBSD/tests/dist/dev/usb/t_hid/CVS/Repository vendor/NetBSD/tests/dist/dev/usb/t_hid/CVS/Root vendor/NetBSD/tests/dist/dev/usb/t_hid/CVS/Tag vendor/NetBSD/tests/dist/dev/usb/t_hid/Makefile (contents, props changed) vendor/NetBSD/tests/dist/fs/nfs/Makefile.inc (contents, props changed) vendor/NetBSD/tests/dist/include/sys/t_pslist.c (contents, props changed) vendor/NetBSD/tests/dist/kernel/kqueue/t_vnode.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/db/h_lfsr.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/db/t_db_hash_seq.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/hash/t_hmac.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/inet/t_inet_addr.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/stdio/t_open_memstream.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/stdlib/t_strtoi.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sync/cpp_atomic_ops_linkable.cc (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_bind.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_getsockname.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_posix_fallocate.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libc/sys/t_wait.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libm/t_fenv.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libm/t_hypot.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libusbhid/ vendor/NetBSD/tests/dist/lib/libusbhid/CVS/ vendor/NetBSD/tests/dist/lib/libusbhid/CVS/Entries vendor/NetBSD/tests/dist/lib/libusbhid/CVS/Repository vendor/NetBSD/tests/dist/lib/libusbhid/CVS/Root vendor/NetBSD/tests/dist/lib/libusbhid/CVS/Tag vendor/NetBSD/tests/dist/lib/libusbhid/Makefile (contents, props changed) vendor/NetBSD/tests/dist/lib/libusbhid/hid_test_data.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libusbhid/t_usbhid.c (contents, props changed) vendor/NetBSD/tests/dist/lib/libusbhid/test_usb_hid_usages vendor/NetBSD/tests/dist/net/arp/ vendor/NetBSD/tests/dist/net/arp/CVS/ vendor/NetBSD/tests/dist/net/arp/CVS/Entries vendor/NetBSD/tests/dist/net/arp/CVS/Repository vendor/NetBSD/tests/dist/net/arp/CVS/Root vendor/NetBSD/tests/dist/net/arp/CVS/Tag vendor/NetBSD/tests/dist/net/arp/Makefile (contents, props changed) vendor/NetBSD/tests/dist/net/arp/t_arp.sh (contents, props changed) vendor/NetBSD/tests/dist/net/arp/t_dad.sh (contents, props changed) vendor/NetBSD/tests/dist/net/icmp/t_icmp6_redirect.sh (contents, props changed) vendor/NetBSD/tests/dist/net/icmp/t_icmp_redirect.sh (contents, props changed)
svn commit: r303900 - in head/cddl/usr.sbin/dtrace/tests: common/raise common/safety tools
Author: ngie Date: Wed Aug 10 03:10:34 2016 New Revision: 303900 URL: https://svnweb.freebsd.org/changeset/base/303900 Log: Highball memory requirement (4GB) with common/{raise,safety} Both test suites require more memory than my amd64 VM using GENERIC-NODEBUG can provide and reliably panic it with OOM issues in dtrace(4). Some of the testcases fail, but this at least bypasses the panic behavior on platforms that don't have enough resources MFC after: 2 weeks Discussed with: markj Sponsored by: EMC / Isilon Storage Division Modified: head/cddl/usr.sbin/dtrace/tests/common/raise/Makefile head/cddl/usr.sbin/dtrace/tests/common/safety/Makefile head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh Modified: head/cddl/usr.sbin/dtrace/tests/common/raise/Makefile == --- head/cddl/usr.sbin/dtrace/tests/common/raise/Makefile Wed Aug 10 02:44:46 2016(r303899) +++ head/cddl/usr.sbin/dtrace/tests/common/raise/Makefile Wed Aug 10 03:10:34 2016(r303900) @@ -20,4 +20,6 @@ CFILES= \ tst.raise3.c \ +TEST_METADATA.t_dtrace_contrib+= required_memory="4g" + .include "../../dtrace.test.mk" Modified: head/cddl/usr.sbin/dtrace/tests/common/safety/Makefile == --- head/cddl/usr.sbin/dtrace/tests/common/safety/Makefile Wed Aug 10 02:44:46 2016(r303899) +++ head/cddl/usr.sbin/dtrace/tests/common/safety/Makefile Wed Aug 10 03:10:34 2016(r303900) @@ -53,4 +53,6 @@ CFILES= \ +TEST_METADATA.t_dtrace_contrib+= required_memory="4g" + .include "../../dtrace.test.mk" Modified: head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh == --- head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh Wed Aug 10 02:44:46 2016(r303899) +++ head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh Wed Aug 10 03:10:34 2016(r303900) @@ -34,15 +34,28 @@ genmakefile() # One-off variable definitions. local special -if [ "$basedir" = proc ]; then +case "$basedir" in +proc) special=" LIBADD.tst.sigwait.exe+= rt " -elif [ "$basedir" = uctf ]; then +;; +raise) + special=" +TEST_METADATA.t_dtrace_contrib+= required_memory=\"4g\" +" +;; +safety) + special=" +TEST_METADATA.t_dtrace_contrib+= required_memory=\"4g\" +" +;; +uctf) special=" WITH_CTF=YES " -fi +;; +esac local makefile=$(mktemp) cat <<__EOF__ > $makefile ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r303830 - head/usr.bin/getconf
Author: ngie Date: Mon Aug 8 07:19:30 2016 New Revision: 303830 URL: https://svnweb.freebsd.org/changeset/base/303830 Log: Remove vestigal references to __alpha__ Replace alpha reference in getconf(1) with amd64 [*] MFC after:1 week PR: 211300 [*] Submitted by: Sevan Janiyan[*] Sponsored by: EMC / Isilon Storage Division Modified: head/usr.bin/getconf/getconf.1 head/usr.bin/getconf/progenv.gperf Modified: head/usr.bin/getconf/getconf.1 == --- head/usr.bin/getconf/getconf.1 Mon Aug 8 07:16:13 2016 (r303829) +++ head/usr.bin/getconf/getconf.1 Mon Aug 8 07:19:30 2016 (r303830) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 18, 2002 +.Dd August 8, 2016 .Dt GETCONF 1 .Os .Sh NAME @@ -122,7 +122,7 @@ Exactly 32-bit integer, long, and pointe .It Li POSIX_V6_LP64_OFF64 Exactly 32-bit integer; exactly 64-bit long, pointer, and file offset. .Sy Supported platforms : -.Tn Alpha , +.Tn AMD64 , .Tn SPARC64 . .It Li POSIX_V6_LPBIG_OFFBIG At least 32-bit integer; at least 64-bit long, pointer, and file offset. Modified: head/usr.bin/getconf/progenv.gperf == --- head/usr.bin/getconf/progenv.gperf Mon Aug 8 07:16:13 2016 (r303829) +++ head/usr.bin/getconf/progenv.gperf Mon Aug 8 07:19:30 2016 (r303830) @@ -30,7 +30,7 @@ static const struct map *in_word_set(con * be updated. (We cheat here and define the supported environments * statically.) */ -#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) +#if defined(__sparc64__) || defined(__amd64__) #definehave_LP64_OFF64 NULL #endif ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r303804 - head/usr.bin/tar/tests
Author: ngie Date: Sat Aug 6 19:05:01 2016 New Revision: 303804 URL: https://svnweb.freebsd.org/changeset/base/303804 Log: Fix building usr.bin/tar/tests with PIE symbol building enabled by removing CFLAGS+= -static `CFLAGS+= -static` was a carryover from pre-r289195 with usr.bin/tar/test/Makefile that should have been specified in LDFLAGS There doesn't seem to be an apparent need for static compilation of the test binaries. Differential Revision:https://reviews.freebsd.org/D7430 MFC after:1 week Obtained-from:opBSD (418a491eed20d2603ddd1f1bd92c2c0d95094002) Submitted by: op Sponsored by: EMC / Isilon Storage Division Modified: head/usr.bin/tar/tests/Makefile Modified: head/usr.bin/tar/tests/Makefile == --- head/usr.bin/tar/tests/Makefile Sat Aug 6 18:48:47 2016 (r303803) +++ head/usr.bin/tar/tests/Makefile Sat Aug 6 19:05:01 2016 (r303804) @@ -9,7 +9,6 @@ ATF_TESTS_SH+= functional_test BINDIR=${TESTSDIR} CFLAGS+= -DPLATFORM_CONFIG_H=\"${SRCTOP}/lib/libarchive/config_freebsd.h\" -CFLAGS+= -static CFLAGS+= -I${SRCTOP}/lib/libarchive -I${.OBJDIR} CFLAGS+= -I${_LIBARCHIVEDIR}/tar -I${_LIBARCHIVEDIR}/test_utils ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r303695 - stable/9/sys/rpc
Author: ngie Date: Wed Aug 3 01:26:02 2016 New Revision: 303695 URL: https://svnweb.freebsd.org/changeset/base/303695 Log: MFstable/10 r303692: MFstable/11 r303691: MFC r302550,r302551,r302552,r302553: r302550: Deobfuscate cleanup path in clnt_dg_create(..) Similar to r300836 and r301800, cl and cu will always be non-NULL as they're allocated using the mem_alloc routines, which always use `malloc(..., M_WAITOK)`. Deobfuscating the cleanup path fixes a leak where if cl was NULL and cu was not, cu would not be free'd, and also removes a duplicate test for cl not being NULL. CID: 1007033, 1007344 r302551: Deobfuscate cleanup path in clnt_vc_create(..) Similar to r300836, r301800, and r302550, cl and ct will always be non-NULL as they're allocated using the mem_alloc routines, which always use `malloc(..., M_WAITOK)`. CID: 1007342 r302552: Convert `svc_xprt_alloc(..)` and `svc_xprt_free(..)`'s prototypes to ANSI C style prototypes r302553: Don't test for xpt not being NULL before calling svc_xprt_free(..) svc_xprt_alloc(..) will always return initialized memory as it uses mem_alloc(..) under the covers, which uses malloc(.., M_WAITOK, ..). CID: 1007341 Modified: stable/9/sys/rpc/clnt_dg.c stable/9/sys/rpc/clnt_vc.c stable/9/sys/rpc/svc.c stable/9/sys/rpc/svc_dg.c Directory Properties: stable/9/ (props changed) stable/9/sys/ (props changed) Modified: stable/9/sys/rpc/clnt_dg.c == --- stable/9/sys/rpc/clnt_dg.c Wed Aug 3 01:25:44 2016(r303694) +++ stable/9/sys/rpc/clnt_dg.c Wed Aug 3 01:26:02 2016(r303695) @@ -313,11 +313,9 @@ recheck_socket: cl->cl_netid = NULL; return (cl); err2: - if (cl) { - mem_free(cl, sizeof (CLIENT)); - if (cu) - mem_free(cu, sizeof (*cu)); - } + mem_free(cl, sizeof (CLIENT)); + mem_free(cu, sizeof (*cu)); + return (NULL); } Modified: stable/9/sys/rpc/clnt_vc.c == --- stable/9/sys/rpc/clnt_vc.c Wed Aug 3 01:25:44 2016(r303694) +++ stable/9/sys/rpc/clnt_vc.c Wed Aug 3 01:26:02 2016(r303695) @@ -270,12 +270,10 @@ clnt_vc_create( return (cl); err: - if (ct) { - mtx_destroy(>ct_lock); - mem_free(ct, sizeof (struct ct_data)); - } - if (cl) - mem_free(cl, sizeof (CLIENT)); + mtx_destroy(>ct_lock); + mem_free(ct, sizeof (struct ct_data)); + mem_free(cl, sizeof (CLIENT)); + return ((CLIENT *)NULL); } Modified: stable/9/sys/rpc/svc.c == --- stable/9/sys/rpc/svc.c Wed Aug 3 01:25:44 2016(r303694) +++ stable/9/sys/rpc/svc.c Wed Aug 3 01:26:02 2016(r303695) @@ -842,7 +842,7 @@ svcerr_progvers(struct svc_req *rqstp, r * parameters. */ SVCXPRT * -svc_xprt_alloc() +svc_xprt_alloc(void) { SVCXPRT *xprt; SVCXPRT_EXT *ext; @@ -859,8 +859,7 @@ svc_xprt_alloc() * Free a server transport structure. */ void -svc_xprt_free(xprt) - SVCXPRT *xprt; +svc_xprt_free(SVCXPRT *xprt) { mem_free(xprt->xp_p3, sizeof(SVCXPRT_EXT)); Modified: stable/9/sys/rpc/svc_dg.c == --- stable/9/sys/rpc/svc_dg.c Wed Aug 3 01:25:44 2016(r303694) +++ stable/9/sys/rpc/svc_dg.c Wed Aug 3 01:26:02 2016(r303695) @@ -142,9 +142,8 @@ svc_dg_create(SVCPOOL *pool, struct sock return (xprt); freedata: (void) printf(svc_dg_str, __no_mem_str); - if (xprt) { - svc_xprt_free(xprt); - } + svc_xprt_free(xprt); + return (NULL); } ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r303694 - stable/10/tools/build/mk
Author: ngie Date: Wed Aug 3 01:25:44 2016 New Revision: 303694 URL: https://svnweb.freebsd.org/changeset/base/303694 Log: MFC r302330: Remove ftp(1) related files when MK_FTP == no Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc Directory Properties: stable/10/ (props changed) Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc == --- stable/10/tools/build/mk/OptionalObsoleteFiles.inc Wed Aug 3 01:22:11 2016(r303693) +++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc Wed Aug 3 01:25:44 2016(r303694) @@ -873,6 +873,20 @@ OLD_FILES+=usr/sbin/fmtree OLD_FILES+=usr/share/man/man8/fmtree.8.gz .endif +.if ${MK_FTP} == no +OLD_FILES+=etc/ftpusers +OLD_FILES+=etc/rc.d/ftpd +OLD_FILES+=usr/bin/ftp +OLD_FILES+=usr/bin/gate-ftp +OLD_FILES+=usr/bin/pftp +OLD_FILES+=usr/libexec/ftpd +OLD_FILES+=usr/share/man/man1/ftp.1.gz +OLD_FILES+=usr/share/man/man1/gate-ftp.1.gz +OLD_FILES+=usr/share/man/man1/pftp.1.gz +OLD_FILES+=usr/share/man/man5/ftpchroot.5.gz +OLD_FILES+=usr/share/man/man8/ftpd.8.gz +.endif + .if ${MK_GNUCXX} == no OLD_FILES+=usr/bin/g++ OLD_FILES+=usr/include/c++/4.2/algorithm ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r303692 - stable/10/sys/rpc
Author: ngie Date: Wed Aug 3 01:19:10 2016 New Revision: 303692 URL: https://svnweb.freebsd.org/changeset/base/303692 Log: MFstable/11 r303691: MFC r302550,r302551,r302552,r302553: r302550: Deobfuscate cleanup path in clnt_dg_create(..) Similar to r300836 and r301800, cl and cu will always be non-NULL as they're allocated using the mem_alloc routines, which always use `malloc(..., M_WAITOK)`. Deobfuscating the cleanup path fixes a leak where if cl was NULL and cu was not, cu would not be free'd, and also removes a duplicate test for cl not being NULL. CID: 1007033, 1007344 r302551: Deobfuscate cleanup path in clnt_vc_create(..) Similar to r300836, r301800, and r302550, cl and ct will always be non-NULL as they're allocated using the mem_alloc routines, which always use `malloc(..., M_WAITOK)`. CID: 1007342 r302552: Convert `svc_xprt_alloc(..)` and `svc_xprt_free(..)`'s prototypes to ANSI C style prototypes r302553: Don't test for xpt not being NULL before calling svc_xprt_free(..) svc_xprt_alloc(..) will always return initialized memory as it uses mem_alloc(..) under the covers, which uses malloc(.., M_WAITOK, ..). CID: 1007341 Modified: stable/10/sys/rpc/clnt_dg.c stable/10/sys/rpc/clnt_vc.c stable/10/sys/rpc/svc.c stable/10/sys/rpc/svc_dg.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/rpc/clnt_dg.c == --- stable/10/sys/rpc/clnt_dg.c Wed Aug 3 01:06:51 2016(r303691) +++ stable/10/sys/rpc/clnt_dg.c Wed Aug 3 01:19:10 2016(r303692) @@ -313,11 +313,9 @@ recheck_socket: cl->cl_netid = NULL; return (cl); err2: - if (cl) { - mem_free(cl, sizeof (CLIENT)); - if (cu) - mem_free(cu, sizeof (*cu)); - } + mem_free(cl, sizeof (CLIENT)); + mem_free(cu, sizeof (*cu)); + return (NULL); } Modified: stable/10/sys/rpc/clnt_vc.c == --- stable/10/sys/rpc/clnt_vc.c Wed Aug 3 01:06:51 2016(r303691) +++ stable/10/sys/rpc/clnt_vc.c Wed Aug 3 01:19:10 2016(r303692) @@ -270,12 +270,10 @@ clnt_vc_create( return (cl); err: - if (ct) { - mtx_destroy(>ct_lock); - mem_free(ct, sizeof (struct ct_data)); - } - if (cl) - mem_free(cl, sizeof (CLIENT)); + mtx_destroy(>ct_lock); + mem_free(ct, sizeof (struct ct_data)); + mem_free(cl, sizeof (CLIENT)); + return ((CLIENT *)NULL); } Modified: stable/10/sys/rpc/svc.c == --- stable/10/sys/rpc/svc.c Wed Aug 3 01:06:51 2016(r303691) +++ stable/10/sys/rpc/svc.c Wed Aug 3 01:19:10 2016(r303692) @@ -841,7 +841,7 @@ svcerr_progvers(struct svc_req *rqstp, r * parameters. */ SVCXPRT * -svc_xprt_alloc() +svc_xprt_alloc(void) { SVCXPRT *xprt; SVCXPRT_EXT *ext; @@ -858,8 +858,7 @@ svc_xprt_alloc() * Free a server transport structure. */ void -svc_xprt_free(xprt) - SVCXPRT *xprt; +svc_xprt_free(SVCXPRT *xprt) { mem_free(xprt->xp_p3, sizeof(SVCXPRT_EXT)); Modified: stable/10/sys/rpc/svc_dg.c == --- stable/10/sys/rpc/svc_dg.c Wed Aug 3 01:06:51 2016(r303691) +++ stable/10/sys/rpc/svc_dg.c Wed Aug 3 01:19:10 2016(r303692) @@ -142,9 +142,8 @@ svc_dg_create(SVCPOOL *pool, struct sock return (xprt); freedata: (void) printf(svc_dg_str, __no_mem_str); - if (xprt) { - svc_xprt_free(xprt); - } + svc_xprt_free(xprt); + return (NULL); } ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r303691 - stable/11/sys/rpc
Author: ngie Date: Wed Aug 3 01:06:51 2016 New Revision: 303691 URL: https://svnweb.freebsd.org/changeset/base/303691 Log: MFC r302550,r302551,r302552,r302553: Approved by: re (gjb) r302550: Deobfuscate cleanup path in clnt_dg_create(..) Similar to r300836 and r301800, cl and cu will always be non-NULL as they're allocated using the mem_alloc routines, which always use `malloc(..., M_WAITOK)`. Deobfuscating the cleanup path fixes a leak where if cl was NULL and cu was not, cu would not be free'd, and also removes a duplicate test for cl not being NULL. CID: 1007033, 1007344 r302551: Deobfuscate cleanup path in clnt_vc_create(..) Similar to r300836, r301800, and r302550, cl and ct will always be non-NULL as they're allocated using the mem_alloc routines, which always use `malloc(..., M_WAITOK)`. CID: 1007342 r302552: Convert `svc_xprt_alloc(..)` and `svc_xprt_free(..)`'s prototypes to ANSI C style prototypes r302553: Don't test for xpt not being NULL before calling svc_xprt_free(..) svc_xprt_alloc(..) will always return initialized memory as it uses mem_alloc(..) under the covers, which uses malloc(.., M_WAITOK, ..). CID: 1007341 Modified: stable/11/sys/rpc/clnt_dg.c stable/11/sys/rpc/clnt_vc.c stable/11/sys/rpc/svc.c stable/11/sys/rpc/svc_dg.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/rpc/clnt_dg.c == --- stable/11/sys/rpc/clnt_dg.c Wed Aug 3 00:19:52 2016(r303690) +++ stable/11/sys/rpc/clnt_dg.c Wed Aug 3 01:06:51 2016(r303691) @@ -313,11 +313,9 @@ recheck_socket: cl->cl_netid = NULL; return (cl); err2: - if (cl) { - mem_free(cl, sizeof (CLIENT)); - if (cu) - mem_free(cu, sizeof (*cu)); - } + mem_free(cl, sizeof (CLIENT)); + mem_free(cu, sizeof (*cu)); + return (NULL); } Modified: stable/11/sys/rpc/clnt_vc.c == --- stable/11/sys/rpc/clnt_vc.c Wed Aug 3 00:19:52 2016(r303690) +++ stable/11/sys/rpc/clnt_vc.c Wed Aug 3 01:06:51 2016(r303691) @@ -270,12 +270,10 @@ clnt_vc_create( return (cl); err: - if (ct) { - mtx_destroy(>ct_lock); - mem_free(ct, sizeof (struct ct_data)); - } - if (cl) - mem_free(cl, sizeof (CLIENT)); + mtx_destroy(>ct_lock); + mem_free(ct, sizeof (struct ct_data)); + mem_free(cl, sizeof (CLIENT)); + return ((CLIENT *)NULL); } Modified: stable/11/sys/rpc/svc.c == --- stable/11/sys/rpc/svc.c Wed Aug 3 00:19:52 2016(r303690) +++ stable/11/sys/rpc/svc.c Wed Aug 3 01:06:51 2016(r303691) @@ -841,7 +841,7 @@ svcerr_progvers(struct svc_req *rqstp, r * parameters. */ SVCXPRT * -svc_xprt_alloc() +svc_xprt_alloc(void) { SVCXPRT *xprt; SVCXPRT_EXT *ext; @@ -858,8 +858,7 @@ svc_xprt_alloc() * Free a server transport structure. */ void -svc_xprt_free(xprt) - SVCXPRT *xprt; +svc_xprt_free(SVCXPRT *xprt) { mem_free(xprt->xp_p3, sizeof(SVCXPRT_EXT)); Modified: stable/11/sys/rpc/svc_dg.c == --- stable/11/sys/rpc/svc_dg.c Wed Aug 3 00:19:52 2016(r303690) +++ stable/11/sys/rpc/svc_dg.c Wed Aug 3 01:06:51 2016(r303691) @@ -142,9 +142,8 @@ svc_dg_create(SVCPOOL *pool, struct sock return (xprt); freedata: (void) printf(svc_dg_str, __no_mem_str); - if (xprt) { - svc_xprt_free(xprt); - } + svc_xprt_free(xprt); + return (NULL); } ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r303690 - stable/11/sys/dev/cxgb/ulp/tom
Author: ngie Date: Wed Aug 3 00:19:52 2016 New Revision: 303690 URL: https://svnweb.freebsd.org/changeset/base/303690 Log: MFC r302576: Approved by: re (gjb) r302576: (Re-do r302574 with corrected commit message..) Remove redundant declaration for tcp_dooptions netinet/tcp_var.h already defines this function PR: 209920 Tested with: clang 3.8.0, gcc 4.2.1, gcc 5.3.0 Modified: stable/11/sys/dev/cxgb/ulp/tom/cxgb_listen.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/cxgb/ulp/tom/cxgb_listen.c == --- stable/11/sys/dev/cxgb/ulp/tom/cxgb_listen.cWed Aug 3 00:03:03 2016(r303689) +++ stable/11/sys/dev/cxgb/ulp/tom/cxgb_listen.cWed Aug 3 00:19:52 2016(r303690) @@ -922,9 +922,6 @@ t3_syncache_removed(struct toedev *tod _ release_synqe(synqe); } -/* XXX */ -extern void tcp_dooptions(struct tcpopt *, u_char *, int, int); - int t3_syncache_respond(struct toedev *tod, void *arg, struct mbuf *m) { ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r303689 - in stable/11/sys/dev/drm2: . i915 radeon
Author: ngie Date: Wed Aug 3 00:03:03 2016 New Revision: 303689 URL: https://svnweb.freebsd.org/changeset/base/303689 Log: MFC r302571,r302572,r302577,r302841: Approved by: re (gjb) r302571: Remove redundant declaration for radeon_pm_acpi_event_handler(..) to fix -Wredundant-decls warning PR: 209924 Tested with: devel/amd64-gcc (5.3.0) r302572: Remove redundant declarations for intel_fbc_enabled(..) and i915_gem_dump_object(..) to fix -Wredundant-decls warning PR: 209924 Tested with: devel/amd64-gcc (5.3.0) r302577: Add missing default case to capable(..) function definition By definition (enum __drm_capabilities), cases other than CAP_SYS_ADMIN aren't possible. Add in a KASSERT safety belt and return false in !INVARIANTS case if an invalid value is passed in, as it would be a programmer error. This fixes a -Wreturn-type error with gcc 5.3.0. r302841: Always panic if an invalid capability is passed to `capable(..)` instead of just with INVARIANTS rwatson's point was valid in the sense that if the data passed at runtime is invalid, it should always trip the invariant, not just in the debug case. This is a deterrent against malicious input, or input caused by hardware errors. Requested by: rwatson Modified: stable/11/sys/dev/drm2/drm_os_freebsd.h stable/11/sys/dev/drm2/i915/i915_drv.h stable/11/sys/dev/drm2/radeon/radeon_acpi.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/drm2/drm_os_freebsd.h == --- stable/11/sys/dev/drm2/drm_os_freebsd.h Tue Aug 2 23:54:21 2016 (r303688) +++ stable/11/sys/dev/drm2/drm_os_freebsd.h Wed Aug 3 00:03:03 2016 (r303689) @@ -438,6 +438,9 @@ capable(enum __drm_capabilities cap) switch (cap) { case CAP_SYS_ADMIN: return DRM_SUSER(curthread); + default: + panic("%s: unhandled capability: %0x", __func__, cap); + return (false); } } Modified: stable/11/sys/dev/drm2/i915/i915_drv.h == --- stable/11/sys/dev/drm2/i915/i915_drv.h Tue Aug 2 23:54:21 2016 (r303688) +++ stable/11/sys/dev/drm2/i915/i915_drv.h Wed Aug 3 00:03:03 2016 (r303689) @@ -1618,8 +1618,6 @@ int i915_verify_lists(struct drm_device #endif void i915_gem_object_check_coherency(struct drm_i915_gem_object *obj, int handle); -void i915_gem_dump_object(struct drm_i915_gem_object *obj, int len, - const char *where, uint32_t mark); /* i915_suspend.c */ extern int i915_save_state(struct drm_device *dev); @@ -1673,7 +1671,6 @@ extern void intel_modeset_cleanup(struct extern int intel_modeset_vga_set_state(struct drm_device *dev, bool state); extern void intel_modeset_setup_hw_state(struct drm_device *dev, bool force_restore); -extern bool intel_fbc_enabled(struct drm_device *dev); extern void intel_disable_fbc(struct drm_device *dev); extern bool ironlake_set_drps(struct drm_device *dev, u8 val); extern void intel_init_pch_refclk(struct drm_device *dev); Modified: stable/11/sys/dev/drm2/radeon/radeon_acpi.c == --- stable/11/sys/dev/drm2/radeon/radeon_acpi.c Tue Aug 2 23:54:21 2016 (r303688) +++ stable/11/sys/dev/drm2/radeon/radeon_acpi.c Wed Aug 3 00:03:03 2016 (r303689) @@ -32,8 +32,6 @@ __FBSDID("$FreeBSD$"); #define ACPI_AC_CLASS "ac_adapter" -extern void radeon_pm_acpi_event_handler(struct radeon_device *rdev); - struct atif_verify_interface { u16 size; /* structure size in bytes (includes size field) */ u16 version;/* version */ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r303686 - stable/11/sys/dev/cxgbe/tom
Author: ngie Date: Tue Aug 2 23:34:59 2016 New Revision: 303686 URL: https://svnweb.freebsd.org/changeset/base/303686 Log: MFC r302581: Remove redundant declaration for tcp_dooptions, similar to r302576 netinet/tcp_var.h already defines this function Approved by: re (gjb) PR: 209920 Modified: stable/11/sys/dev/cxgbe/tom/t4_listen.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/cxgbe/tom/t4_listen.c == --- stable/11/sys/dev/cxgbe/tom/t4_listen.c Tue Aug 2 22:47:06 2016 (r303685) +++ stable/11/sys/dev/cxgbe/tom/t4_listen.c Tue Aug 2 23:34:59 2016 (r303686) @@ -665,9 +665,6 @@ t4_syncache_removed(struct toedev *tod _ release_synqe(synqe); } -/* XXX */ -extern void tcp_dooptions(struct tcpopt *, u_char *, int, int); - int t4_syncache_respond(struct toedev *tod, void *arg, struct mbuf *m) { ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r303609 - stable/10/sys/conf
Author: ngie Date: Mon Aug 1 06:59:35 2016 New Revision: 303609 URL: https://svnweb.freebsd.org/changeset/base/303609 Log: MFC r288071: - arm64 change was omitted due to lack of architecture support - ia64 change was added as the architecture was removed from ^/head Sponsored by: EMC / Isilon Storage Division r288071 (by emaste): Move kbd.c to main sys/conf/files list It is (optionally) used on all architectures. Modified: stable/10/sys/conf/files stable/10/sys/conf/files.amd64 stable/10/sys/conf/files.arm stable/10/sys/conf/files.i386 stable/10/sys/conf/files.ia64 stable/10/sys/conf/files.mips stable/10/sys/conf/files.pc98 stable/10/sys/conf/files.powerpc stable/10/sys/conf/files.sparc64 Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/conf/files == --- stable/10/sys/conf/filesMon Aug 1 06:56:32 2016(r303608) +++ stable/10/sys/conf/filesMon Aug 1 06:59:35 2016(r303609) @@ -1782,6 +1782,7 @@ dev/jme/if_jme.c optional jme pci dev/joy/joy.c optional joy dev/joy/joy_isa.c optional joy isa dev/joy/joy_pccard.c optional joy pccard +dev/kbd/kbd.c optional atkbd | pckbd | sc | ukbd | vt dev/kbdmux/kbdmux.coptional kbdmux dev/ksyms/ksyms.c optional ksyms dev/le/am7990.coptional le Modified: stable/10/sys/conf/files.amd64 == --- stable/10/sys/conf/files.amd64 Mon Aug 1 06:56:32 2016 (r303608) +++ stable/10/sys/conf/files.amd64 Mon Aug 1 06:59:35 2016 (r303609) @@ -281,7 +281,6 @@ dev/hyperv/vmbus/vmbus.c optionalhyp dev/hyperv/vmbus/vmbus_et.coptionalhyperv dev/hyperv/vmbus/amd64/hyperv_machdep.coptional hyperv dev/hyperv/vmbus/amd64/vmbus_vector.S optionalhyperv -dev/kbd/kbd.c optionalatkbd | sc | ukbd | vt dev/lindev/full.c optionallindev dev/lindev/lindev.coptionallindev dev/nfe/if_nfe.c optionalnfe pci Modified: stable/10/sys/conf/files.arm == --- stable/10/sys/conf/files.armMon Aug 1 06:56:32 2016 (r303608) +++ stable/10/sys/conf/files.armMon Aug 1 06:59:35 2016 (r303609) @@ -66,7 +66,6 @@ crypto/blowfish/bf_enc.c optionalcrypto crypto/des/des_enc.c optionalcrypto | ipsec | netsmb dev/fb/fb.coptionalsc dev/hwpmc/hwpmc_arm.c optionalhwpmc -dev/kbd/kbd.c optionalsc | vt dev/syscons/scgfbrndr.coptionalsc dev/syscons/scterm-teken.c optionalsc dev/syscons/scvtb.coptionalsc Modified: stable/10/sys/conf/files.i386 == --- stable/10/sys/conf/files.i386 Mon Aug 1 06:56:32 2016 (r303608) +++ stable/10/sys/conf/files.i386 Mon Aug 1 06:59:35 2016 (r303609) @@ -274,7 +274,6 @@ dev/ipmi/ipmi_smbios.c optional ipmi dev/ipmi/ipmi_ssif.c optional ipmi smbus dev/ipmi/ipmi_pci.coptional ipmi pci dev/ipmi/ipmi_linux.c optional ipmi compat_linux -dev/kbd/kbd.c optional atkbd | sc | ukbd | vt dev/le/if_le_isa.c optional le isa dev/lindev/full.c optional lindev dev/lindev/lindev.coptional lindev Modified: stable/10/sys/conf/files.ia64 == --- stable/10/sys/conf/files.ia64 Mon Aug 1 06:56:32 2016 (r303608) +++ stable/10/sys/conf/files.ia64 Mon Aug 1 06:59:35 2016 (r303609) @@ -52,7 +52,6 @@ dev/fb/fb.c optionalfb | vga dev/fb/vga.c optionalvga dev/hwpmc/hwpmc_ia64.c optionalhwpmc dev/io/iodev.c optionalio -dev/kbd/kbd.c optionalatkbd | sc | ukbd dev/syscons/scterm-teken.c optionalsc dev/syscons/scvgarndr.coptionalsc vga dev/syscons/scvtb.coptionalsc Modified: stable/10/sys/conf/files.mips == --- stable/10/sys/conf/files.mips Mon Aug 1 06:56:32 2016 (r303608) +++ stable/10/sys/conf/files.mips Mon Aug 1 06:59:35 2016 (r303609) @@ -68,7 +68,6 @@ dev/cfe/cfe_env.c optionalcfe_env # syscons support dev/fb/fb.c
svn commit: r303576 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Author: ngie Date: Sun Jul 31 06:34:49 2016 New Revision: 303576 URL: https://svnweb.freebsd.org/changeset/base/303576 Log: Conditionalize code which defines sysctls per _KERNEL #ifdef guard This resolves several issues when compiling libzpool (userspace library), i.e. -Wimplicit-function-declaration and -Wmissing-declarations issues. MFC after:2 weeks Reported by: clang Tested with: clang 3.8.1, gcc 4.2.1, gcc 5.3.0 Sponsored by: EMC / Isilon Storage Division Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c == --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c Sun Jul 31 06:28:40 2016(r303575) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c Sun Jul 31 06:34:49 2016(r303576) @@ -58,9 +58,11 @@ typedef struct mirror_map { static int vdev_mirror_shift = 21; +#ifdef _KERNEL SYSCTL_DECL(_vfs_zfs_vdev); static SYSCTL_NODE(_vfs_zfs_vdev, OID_AUTO, mirror, CTLFLAG_RD, 0, "ZFS VDEV Mirror"); +#endif /* * The load configuration settings below are tuned by default for @@ -74,28 +76,38 @@ static SYSCTL_NODE(_vfs_zfs_vdev, OID_AU /* Rotating media load calculation configuration. */ static int rotating_inc = 0; +#ifdef _KERNEL SYSCTL_INT(_vfs_zfs_vdev_mirror, OID_AUTO, rotating_inc, CTLFLAG_RWTUN, _inc, 0, "Rotating media load increment for non-seeking I/O's"); +#endif static int rotating_seek_inc = 5; +#ifdef _KERNEL SYSCTL_INT(_vfs_zfs_vdev_mirror, OID_AUTO, rotating_seek_inc, CTLFLAG_RWTUN, _seek_inc, 0, "Rotating media load increment for seeking I/O's"); +#endif static int rotating_seek_offset = 1 * 1024 * 1024; +#ifdef _KERNEL SYSCTL_INT(_vfs_zfs_vdev_mirror, OID_AUTO, rotating_seek_offset, CTLFLAG_RWTUN, _seek_offset, 0, "Offset in bytes from the last I/O which " "triggers a reduced rotating media seek increment"); +#endif /* Non-rotating media load calculation configuration. */ static int non_rotating_inc = 0; +#ifdef _KERNEL SYSCTL_INT(_vfs_zfs_vdev_mirror, OID_AUTO, non_rotating_inc, CTLFLAG_RWTUN, _rotating_inc, 0, "Non-rotating media load increment for non-seeking I/O's"); +#endif static int non_rotating_seek_inc = 1; +#ifdef _KERNEL SYSCTL_INT(_vfs_zfs_vdev_mirror, OID_AUTO, non_rotating_seek_inc, CTLFLAG_RWTUN, _rotating_seek_inc, 0, "Non-rotating media load increment for seeking I/O's"); +#endif static inline size_t Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c == --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.cSun Jul 31 06:28:40 2016(r303575) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.cSun Jul 31 06:34:49 2016(r303576) @@ -176,6 +176,7 @@ int zfs_vdev_read_gap_limit = 32 << 10; int zfs_vdev_write_gap_limit = 4 << 10; #ifdef __FreeBSD__ +#ifdef _KERNEL SYSCTL_DECL(_vfs_zfs_vdev); static int sysctl_zfs_async_write_active_min_dirty_percent(SYSCTL_HANDLER_ARGS); @@ -271,6 +272,7 @@ sysctl_zfs_async_write_active_max_dirty_ return (0); } #endif +#endif int vdev_queue_offset_compare(const void *x1, const void *x2) ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r303575 - in head/tools/regression/zfs/zpool: add create
Author: ngie Date: Sun Jul 31 06:28:40 2016 New Revision: 303575 URL: https://svnweb.freebsd.org/changeset/base/303575 Log: Remove calls to `die` added for associated bugs Panics are no longer hit with ^/head@r303573 on amd64 PR: 194586, 194587, 194589 Sponsored by: EMC / Isilon Storage Division Modified: head/tools/regression/zfs/zpool/add/option-f_size_mismatch.t head/tools/regression/zfs/zpool/add/option-f_type_mismatch.t head/tools/regression/zfs/zpool/create/files.t Modified: head/tools/regression/zfs/zpool/add/option-f_size_mismatch.t == --- head/tools/regression/zfs/zpool/add/option-f_size_mismatch.tSun Jul 31 06:24:26 2016(r303574) +++ head/tools/regression/zfs/zpool/add/option-f_size_mismatch.tSun Jul 31 06:28:40 2016(r303575) @@ -4,8 +4,6 @@ dir=`dirname $0` . ${dir}/../../misc.sh -[ "${os}" = "FreeBSD" ] && die "panics FreeBSD; see bug # 194586" - echo "1..100" disks_create 7 Modified: head/tools/regression/zfs/zpool/add/option-f_type_mismatch.t == --- head/tools/regression/zfs/zpool/add/option-f_type_mismatch.tSun Jul 31 06:24:26 2016(r303574) +++ head/tools/regression/zfs/zpool/add/option-f_type_mismatch.tSun Jul 31 06:28:40 2016(r303575) @@ -4,8 +4,6 @@ dir=`dirname $0` . ${dir}/../../misc.sh -[ "${os}" = "FreeBSD" ] && die "panics FreeBSD; see bug # 194587" - echo "1..100" disks_create 7 Modified: head/tools/regression/zfs/zpool/create/files.t == --- head/tools/regression/zfs/zpool/create/files.t Sun Jul 31 06:24:26 2016(r303574) +++ head/tools/regression/zfs/zpool/create/files.t Sun Jul 31 06:28:40 2016(r303575) @@ -4,8 +4,6 @@ dir=`dirname $0` . ${dir}/../../misc.sh -[ "${os}" = "FreeBSD" ] && die "panics FreeBSD; see bug # 194589" - echo "1..59" files_create 5 ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r303573 - head/cddl/contrib/opensolaris/lib/libzpool/common
Author: ngie Date: Sun Jul 31 06:03:27 2016 New Revision: 303573 URL: https://svnweb.freebsd.org/changeset/base/303573 Log: Cast result from third parameter to int instead of promoting it to size_t This resolves a -Wformat issue when the value is used as a format width precision specifier, i.e. %*s MFC after: 1 month Reported by: clang Sponsored by: EMC / Isilon Storage Division Modified: head/cddl/contrib/opensolaris/lib/libzpool/common/util.c Modified: head/cddl/contrib/opensolaris/lib/libzpool/common/util.c == --- head/cddl/contrib/opensolaris/lib/libzpool/common/util.cSun Jul 31 05:31:09 2016(r303572) +++ head/cddl/contrib/opensolaris/lib/libzpool/common/util.cSun Jul 31 06:03:27 2016(r303573) @@ -108,7 +108,7 @@ show_vdev_stats(const char *desc, const (void) printf("%*s%s%*s%*s%*s %5s %5s %5s %5s %5s %5s %5s\n", indent, "", prefix, - indent + strlen(prefix) - 25 - (vs->vs_space ? 0 : 12), + (int)(indent + strlen(prefix) - 25 - (vs->vs_space ? 0 : 12)), desc, vs->vs_space ? 6 : 0, vs->vs_space ? used : "", vs->vs_space ? 6 : 0, vs->vs_space ? avail : "", ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r303572 - head/usr.bin/sed
Author: ngie Date: Sun Jul 31 05:31:09 2016 New Revision: 303572 URL: https://svnweb.freebsd.org/changeset/base/303572 Log: Fix regression with /i caused by r303047 '\n' was specifically added to -e arguments prior to r303047. Restore historical behavior which in turn fixes usr.sbin/etcupdate/preworld_test:main . The fix is being committed to address the issue in the short term and may be iterated upon as noted in bug 211399 Discussed with: mi, pfg Differential Revision:https://reviews.freebsd.org/D7368 PR: 195929, 211399 [*] MFC after:18 days X-MFC with: r303047 Reported by: Jenkins Sponsored by: EMC / Isilon Storage Division Modified: head/usr.bin/sed/main.c Modified: head/usr.bin/sed/main.c == --- head/usr.bin/sed/main.c Sun Jul 31 04:58:06 2016(r303571) +++ head/usr.bin/sed/main.c Sun Jul 31 05:31:09 2016(r303572) @@ -123,6 +123,7 @@ static void usage(void); int main(int argc, char *argv[]) { + char *temp_arg; int c, fflag; (void) setlocale(LC_ALL, ""); @@ -145,7 +146,10 @@ main(int argc, char *argv[]) break; case 'e': eflag = 1; - add_compunit(CU_STRING, optarg); + asprintf(_arg, "%s\n", optarg); + if (temp_arg == NULL) + errx(1, "Couldn't allocate temporary buffer"); + add_compunit(CU_STRING, temp_arg); break; case 'f': fflag = 1; ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r303538 - head/usr.bin/sed
Author: ngie Date: Sat Jul 30 04:40:44 2016 New Revision: 303538 URL: https://svnweb.freebsd.org/changeset/base/303538 Log: Explicitly test for cu_fgets returning NULL or !NULL MFC after: 3 weeks Sponsored by: EMC / Isilon Storage Division Modified: head/usr.bin/sed/compile.c Modified: head/usr.bin/sed/compile.c == --- head/usr.bin/sed/compile.c Sat Jul 30 03:43:55 2016(r303537) +++ head/usr.bin/sed/compile.c Sat Jul 30 04:40:44 2016(r303538) @@ -546,7 +546,7 @@ compile_subst(const char *p, struct s_su if ((text = realloc(text, asize)) == NULL) err(1, "realloc"); } - } while ((p = cu_fgets())); + } while ((p = cu_fgets()) != NULL); errx(1, "%lu: %s: unterminated substitute in regular expression", linenum, fname); /* NOTREACHED */ @@ -733,7 +733,7 @@ compile_text(size_t *ptlen) if ((text = malloc(asize)) == NULL) err(1, "malloc"); size = 0; - while ((p = cu_fgets(NULL))) { + while ((p = cu_fgets(NULL)) != NULL) { op = s = text + size; for (esc_nl = 0; *p != '\0'; p++) { if (*p == '\\' && p[1] != '\0' && *++p == '\n') ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r303367 - head/usr.bin/sed/tests
Author: ngie Date: Wed Jul 27 06:49:16 2016 New Revision: 303367 URL: https://svnweb.freebsd.org/changeset/base/303367 Log: Testcase 7.8 no longer needs to be marked TODO It passes out of the box today MFC after: 2 months Sponsored by: EMC / Isilon Storage Division Modified: head/usr.bin/sed/tests/multi_test.sh Modified: head/usr.bin/sed/tests/multi_test.sh == --- head/usr.bin/sed/tests/multi_test.shWed Jul 27 06:36:57 2016 (r303366) +++ head/usr.bin/sed/tests/multi_test.shWed Jul 27 06:49:16 2016 (r303367) @@ -383,7 +383,6 @@ test_print() mark '7.8' echo line1 > lines3 echo "" >> lines3 - TODO=1 $SED -n -e '$p' lines3 /dev/null } ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r303364 - stable/11
Author: ngie Date: Wed Jul 27 06:29:41 2016 New Revision: 303364 URL: https://svnweb.freebsd.org/changeset/base/303364 Log: MFC r302842: Don't delete usr/share/local/kk_KZ.UTF-8 with "make delete-old" after r302329 kk_KZ.UTF-8 was originally removed in r290494, but restored as an alias to en_US.UTF-8 in r302329 Approved by: re (kib) PR: 211046 Modified: stable/11/ObsoleteFiles.inc Modified: stable/11/ObsoleteFiles.inc == --- stable/11/ObsoleteFiles.inc Wed Jul 27 06:29:26 2016(r303363) +++ stable/11/ObsoleteFiles.inc Wed Jul 27 06:29:41 2016(r303364) @@ -460,13 +460,6 @@ OLD_FILES+=usr/share/locale/kk_KZ.PT154/ OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_NUMERIC OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_TIME OLD_DIRS+=usr/share/locale/kk_KZ.PT154/ -OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_COLLATE -OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_CTYPE -OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_MESSAGES -OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_MONETARY -OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_NUMERIC -OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_TIME -OLD_DIRS+=usr/share/locale/kk_KZ.UTF-8 OLD_FILES+=usr/share/locale/la_LN.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/la_LN.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/la_LN.ISO8859-1/LC_TIME ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r303363 - stable/11
Author: ngie Date: Wed Jul 27 06:29:26 2016 New Revision: 303363 URL: https://svnweb.freebsd.org/changeset/base/303363 Log: MFC r302842: Don't delete usr/share/local/kk_KZ.UTF-8 with "make delete-old" after r302329 kk_KZ.UTF-8 was originally removed in r290494, but restored as an alias to en_US.UTF-8 in r302329 Approved by: re (kib) PR: 211046 Modified: Directory Properties: stable/11/ (props changed) ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302842 - head
Author: ngie Date: Thu Jul 14 14:16:20 2016 New Revision: 302842 URL: https://svnweb.freebsd.org/changeset/base/302842 Log: Don't delete usr/share/local/kk_KZ.UTF-8 with "make delete-old" after r302329 kk_KZ.UTF-8 was originally removed in r290494, but restored as an alias to en_US.UTF-8 in r302329 MFC after: 1 week X-MFC with: r302329 PR: 211046 Reported by: dhw, O. HartmanSponsored by: EMC / Isilon Storage Division Modified: head/ObsoleteFiles.inc Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Thu Jul 14 13:55:38 2016(r302841) +++ head/ObsoleteFiles.inc Thu Jul 14 14:16:20 2016(r302842) @@ -460,13 +460,6 @@ OLD_FILES+=usr/share/locale/kk_KZ.PT154/ OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_NUMERIC OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_TIME OLD_DIRS+=usr/share/locale/kk_KZ.PT154/ -OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_COLLATE -OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_CTYPE -OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_MESSAGES -OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_MONETARY -OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_NUMERIC -OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_TIME -OLD_DIRS+=usr/share/locale/kk_KZ.UTF-8 OLD_FILES+=usr/share/locale/la_LN.ISO8859-1/LC_COLLATE OLD_FILES+=usr/share/locale/la_LN.ISO8859-1/LC_CTYPE OLD_FILES+=usr/share/locale/la_LN.ISO8859-1/LC_TIME ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302841 - head/sys/dev/drm2
Author: ngie Date: Thu Jul 14 13:55:38 2016 New Revision: 302841 URL: https://svnweb.freebsd.org/changeset/base/302841 Log: Always panic if an invalid capability is passed to `capable(..)` instead of just with INVARIANTS rwatson's point was valid in the sense that if the data passed at runtime is invalid, it should always trip the invariant, not just in the debug case. This is a deterrent against malicious input, or input caused by hardware errors. MFC after: 4 days X-MFC with: r302577 Requested by: rwatson Sponsored by: EMC / Isilon Storage Division Modified: head/sys/dev/drm2/drm_os_freebsd.h Modified: head/sys/dev/drm2/drm_os_freebsd.h == --- head/sys/dev/drm2/drm_os_freebsd.h Thu Jul 14 11:53:39 2016 (r302840) +++ head/sys/dev/drm2/drm_os_freebsd.h Thu Jul 14 13:55:38 2016 (r302841) @@ -439,8 +439,7 @@ capable(enum __drm_capabilities cap) case CAP_SYS_ADMIN: return DRM_SUSER(curthread); default: - KASSERT(false, - ("%s: unhandled capability: %0x", __func__, cap)); + panic("%s: unhandled capability: %0x", __func__, cap); return (false); } } ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302807 - head/contrib/ldns-host
Author: ngie Date: Thu Jul 14 06:10:16 2016 New Revision: 302807 URL: https://svnweb.freebsd.org/changeset/base/302807 Log: Initialize first_serial to 0 in dozonetransfer(..) to fix -Wuninitialized warning MFC after: 3 days X-MFC with: r302779 Pointyhat to: des PR: 209177 Reported by: Jenkins (sparc64 job), gcc 4.2.1, gcc 5.3.0 Sponsored by: EMC / Isilon Storage Division Modified: head/contrib/ldns-host/ldns-host.c Modified: head/contrib/ldns-host/ldns-host.c == --- head/contrib/ldns-host/ldns-host.c Thu Jul 14 06:10:00 2016 (r302806) +++ head/contrib/ldns-host/ldns-host.c Thu Jul 14 06:10:16 2016 (r302807) @@ -888,7 +888,7 @@ dozonetransfer(ldns_resolver *res, ldns_ ldns_rr_list *rrl; ldns_rr *rr; size_t i, nsoa = 0; -uint32_t first_serial; +uint32_t first_serial = 0; rrtype = o_rrtype; o_rrtype = (o_mode == M_AXFR) ? LDNS_RR_TYPE_AXFR : LDNS_RR_TYPE_IXFR; ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302705 - stable/10/usr.sbin/bhyve
Author: ngie Date: Wed Jul 13 06:09:34 2016 New Revision: 302705 URL: https://svnweb.freebsd.org/changeset/base/302705 Log: MFC r302362,r302363,r302364,r302365,r302373: r302362: Fix gcc warnings - Remove -Wunused-but-set-variable (newcpu) - Always return VMEXIT_CONTINUE as the code always set retval to that value. r302363: Fix gcc warnings Put cfl/prdt under AHCI_DEBUG #defines as they are only used in those cases. r302364: Fix gcc warnings Add `WRAPPED_CTASSERT` macro by annotating CTASSERTs with __unused to deal with -Wunused-local-typedefs warnings from gcc 4.8+. All other compilers (clang, etc) use CTASSERT as-is. A more generic solution for this issue will be proposed after ^/stable/11 is forked. Consolidate all CTASSERTs under one block instead of inlining them in functions. r302365: Fix gcc warnings Remove -Wunused-but-set-variable (`error`). Cast calls with `(void)` to note that the return value is explicitly ignored. r302373: Fix CTASSERT issue in a more clean way - Replace all CTASSERT macro instances with static_assert's. - Remove the WRAPPED_CTASSERT macro; it's now an unnecessary obfuscation. - Localize all static_assert's to the structures being tested. - Sort some headers per-style(9). Modified: stable/10/usr.sbin/bhyve/bhyverun.c stable/10/usr.sbin/bhyve/bhyverun.h stable/10/usr.sbin/bhyve/pci_ahci.c stable/10/usr.sbin/bhyve/pci_emul.c stable/10/usr.sbin/bhyve/pci_emul.h stable/10/usr.sbin/bhyve/pci_passthru.c stable/10/usr.sbin/bhyve/task_switch.c Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/bhyve/bhyverun.c == --- stable/10/usr.sbin/bhyve/bhyverun.c Wed Jul 13 05:58:46 2016 (r302704) +++ stable/10/usr.sbin/bhyve/bhyverun.c Wed Jul 13 06:09:34 2016 (r302705) @@ -387,13 +387,11 @@ vmexit_wrmsr(struct vmctx *ctx, struct v static int vmexit_spinup_ap(struct vmctx *ctx, struct vm_exit *vme, int *pvcpu) { - int newcpu; - int retval = VMEXIT_CONTINUE; - newcpu = spinup_ap(ctx, *pvcpu, - vme->u.spinup_ap.vcpu, vme->u.spinup_ap.rip); + (void)spinup_ap(ctx, *pvcpu, + vme->u.spinup_ap.vcpu, vme->u.spinup_ap.rip); - return (retval); + return (VMEXIT_CONTINUE); } #defineDEBUG_EPT_MISCONFIG Modified: stable/10/usr.sbin/bhyve/bhyverun.h == --- stable/10/usr.sbin/bhyve/bhyverun.h Wed Jul 13 05:58:46 2016 (r302704) +++ stable/10/usr.sbin/bhyve/bhyverun.h Wed Jul 13 06:09:34 2016 (r302705) @@ -29,12 +29,6 @@ #ifndef_FBSDRUN_H_ #define_FBSDRUN_H_ -#ifndef CTASSERT /* Allow lint to override */ -#defineCTASSERT(x) _CTASSERT(x, __LINE__) -#define_CTASSERT(x, y) __CTASSERT(x, y) -#define__CTASSERT(x, y)typedef char __assert ## y[(x) ? 1 : -1] -#endif - #defineVMEXIT_CONTINUE (0) #defineVMEXIT_ABORT(-1) Modified: stable/10/usr.sbin/bhyve/pci_ahci.c == --- stable/10/usr.sbin/bhyve/pci_ahci.c Wed Jul 13 05:58:46 2016 (r302704) +++ stable/10/usr.sbin/bhyve/pci_ahci.c Wed Jul 13 06:09:34 2016 (r302705) @@ -1724,19 +1724,25 @@ static void ahci_handle_slot(struct ahci_port *p, int slot) { struct ahci_cmd_hdr *hdr; +#ifdef AHCI_DEBUG struct ahci_prdt_entry *prdt; +#endif struct pci_ahci_softc *sc; uint8_t *cfis; +#ifdef AHCI_DEBUG int cfl; +#endif sc = p->pr_sc; hdr = (struct ahci_cmd_hdr *)(p->cmd_lst + slot * AHCI_CL_SIZE); +#ifdef AHCI_DEBUG cfl = (hdr->flags & 0x1f) * 4; +#endif cfis = paddr_guest2host(ahci_ctx(sc), hdr->ctba, 0x80 + hdr->prdtl * sizeof(struct ahci_prdt_entry)); +#ifdef AHCI_DEBUG prdt = (struct ahci_prdt_entry *)(cfis + 0x80); -#ifdef AHCI_DEBUG DPRINTF("\ncfis:"); for (i = 0; i < cfl; i++) { if (i % 10 == 0) Modified: stable/10/usr.sbin/bhyve/pci_emul.c == --- stable/10/usr.sbin/bhyve/pci_emul.c Wed Jul 13 05:58:46 2016 (r302704) +++ stable/10/usr.sbin/bhyve/pci_emul.c Wed Jul 13 06:09:34 2016 (r302705) @@ -31,9 +31,9 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include +#include #include #include #include @@ -760,8 +760,6 @@ pci_populate_msicap(struct msicap *msica { int mmc; - CTASSERT(sizeof(struct msicap) == 14); - /* Number of msi messages must be a power of 2 between 1 and 32 */ assert((msgnum & (msgnum - 1)) == 0 && msgnum >= 1 && msgnum <= 32);
svn commit: r302625 - stable/11
Author: ngie Date: Tue Jul 12 06:06:10 2016 New Revision: 302625 URL: https://svnweb.freebsd.org/changeset/base/302625 Log: MFC r302532: Correct OLD_LIBS change done in r298840 libkvm.so lives in /lib, not /usr/lib Approved by: re (gjb) Modified: stable/11/ObsoleteFiles.inc Directory Properties: stable/11/ (props changed) Modified: stable/11/ObsoleteFiles.inc == --- stable/11/ObsoleteFiles.inc Tue Jul 12 06:00:57 2016(r302624) +++ stable/11/ObsoleteFiles.inc Tue Jul 12 06:06:10 2016(r302625) @@ -203,7 +203,7 @@ OLD_FILES+=usr/share/man/man9/rman_await # 20160517: ReiserFS removed OLD_FILES+=usr/share/man/man5/reiserfs.5.gz # 20160430: kvm_getfiles(3) removed from kvm(3) -OLD_LIBS+=usr/lib/libkvm.so.6 +OLD_LIBS+=lib/libkvm.so.6 OLD_FILES+=usr/share/man/man3/kvm_getfiles.3.gz # 20160423: remove mroute6d OLD_FILES+=etc/rc.d/mroute6d ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302583 - stable/10/usr.bin/lastcomm/tests
Author: ngie Date: Mon Jul 11 17:31:30 2016 New Revision: 302583 URL: https://svnweb.freebsd.org/changeset/base/302583 Log: MFC r302327: Fix .../usr.bin/lastcomm/legacy_test:main on i386 The time in the output files was ahead by 3 hours on i386. Fix the incorrect offset. PR: 210329 Modified: stable/10/usr.bin/lastcomm/tests/v1-i386.out stable/10/usr.bin/lastcomm/tests/v2-i386.out Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.bin/lastcomm/tests/v1-i386.out == --- stable/10/usr.bin/lastcomm/tests/v1-i386.outMon Jul 11 17:30:20 2016(r302582) +++ stable/10/usr.bin/lastcomm/tests/v1-i386.outMon Jul 11 17:31:30 2016(r302583) @@ -1,28 +1,28 @@ -core -FDX root 0.000 secs 0.000 us 0.000 sy 0.031 es Fri May 18 11:34 -core -DX root 0.000 secs 0.000 us 0.000 sy 0.031 es Fri May 18 11:34 -cc - root 0.000 secs 0.000 us 0.000 sy 0.469 es Fri May 18 11:34 -ld - root 0.000 secs 0.000 us 0.000 sy 0.109 es Fri May 18 11:34 -as - root 0.000 secs 0.000 us 0.000 sy 0.047 es Fri May 18 11:34 -cc1 - root 0.016 secs 0.016 us 0.000 sy 0.203 es Fri May 18 11:34 -time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:34 -1234567890123456 - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:34 -ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:34 -time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:34 -1234567890123456 - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:34 -ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:34 -time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:34 -123456789012345 - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:34 -ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:34 -time - root 0.000 secs 0.000 us 0.000 sy 0.359 es Fri May 18 11:34 -diff - root 0.312 secs 0.297 us 0.016 sy 0.359 es Fri May 18 11:34 -time - root 0.000 secs 0.000 us 0.000 sy 0.031 es Fri May 18 11:34 -dd - root 0.016 secs 0.000 us 0.016 sy 0.031 es Fri May 18 11:34 -time - root 0.000 secs 0.000 us 0.000 sy 3.000 es Fri May 18 11:34 -sleep - root 0.000 secs 0.000 us 0.000 sy 3.000 es Fri May 18 11:34 -time - root 0.000 secs 0.000 us 0.000 sy 3.406 es Fri May 18 11:34 -find - root 0.266 secs 0.062 us 0.203 sy 3.406 es Fri May 18 11:34 -time - root 0.000 secs 0.000 us 0.000 sy 5.047 es Fri May 18 11:33 -egrep - root 4.984 secs 4.984 us 0.000 sy 5.047 es Fri May 18 11:33 -time - root 0.000 secs 0.000 us 0.000 sy 0.484 es Fri May 18 11:33 -awk - root 0.453 secs 0.453 us 0.000 sy 0.453 es Fri May 18 11:33 -accton - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:33 +core -FDX root 0.000 secs 0.000 us 0.000 sy 0.031 es Fri May 18 08:34 +core -DX root 0.000 secs 0.000 us 0.000 sy 0.031 es Fri May 18 08:34 +cc - root 0.000 secs 0.000 us 0.000 sy 0.469 es Fri May 18 08:34 +ld - root 0.000 secs 0.000 us 0.000 sy 0.109 es Fri May 18 08:34 +as - root 0.000 secs 0.000 us 0.000 sy 0.047 es Fri May 18 08:34 +cc1 - root 0.016 secs 0.016 us 0.000 sy 0.203 es Fri May 18 08:34 +time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34 +1234567890123456 - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34 +ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34 +time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34 +1234567890123456 - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34 +ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34 +time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34 +123456789012345 - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34 +ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34 +time - root 0.000 secs 0.000 us 0.000 sy 0.359 es Fri May 18 08:34 +diff - root 0.312 secs 0.297 us 0.016 sy 0.359 es Fri May 18 08:34 +time - root 0.000 secs 0.000 us 0.000 sy 0.031 es Fri May 18 08:34 +dd - root 0.016 secs 0.000 us 0.016 sy 0.031 es Fri May 18 08:34 +time - root 0.000 secs 0.000 us 0.000 sy 3.000 es Fri May 18 08:34 +sleep - root 0.000 secs 0.000 us 0.000 sy 3.000 es Fri May 18 08:34 +time - root 0.000 secs 0.000 us 0.000 sy 3.406 es Fri May 18 08:34 +find - root 0.266 secs 0.062 us 0.203 sy 3.406 es Fri May 18 08:34 +time - root 0.000 secs 0.000 us 0.000 sy 5.047 es Fri May 18 08:33 +egrep - root 4.984 secs 4.984 us 0.000 sy 5.047 es Fri May 18 08:33 +time - root 0.000 secs 0.000 us 0.000 sy 0.484 es Fri May 18 08:33 +awk - root 0.453 secs 0.453 us 0.000 sy 0.453 es Fri May 18 08:33 +accton - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:33 Modified: stable/10/usr.bin/lastcomm/tests/v2-i386.out == --- stable/10/usr.bin/lastcomm/tests/v2-i386.outMon Jul 11 17:30:20 2016(r302582) +++
svn commit: r302582 - stable/10/usr.bin/lastcomm/tests
Author: ngie Date: Mon Jul 11 17:30:20 2016 New Revision: 302582 URL: https://svnweb.freebsd.org/changeset/base/302582 Log: MFC r302326: Output the diffs to standard error when comparing the expected vs the obtained output from lastcomm instead of just printing out a summary, e.g. "they differed". This will make failures with results more apparent when running kyua debug, kyua report-html, etc. Modified: stable/10/usr.bin/lastcomm/tests/legacy_test.sh Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.bin/lastcomm/tests/legacy_test.sh == --- stable/10/usr.bin/lastcomm/tests/legacy_test.sh Mon Jul 11 17:11:18 2016(r302581) +++ stable/10/usr.bin/lastcomm/tests/legacy_test.sh Mon Jul 11 17:30:20 2016(r302582) @@ -14,7 +14,7 @@ check() shift # Remove tty field, which varies between systems. awk '{$4 = ""; print}' | - if diff -q - $1 + if diff -a - $1 >&2 then echo "ok $NUM" else ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302581 - head/sys/dev/cxgbe/tom
Author: ngie Date: Mon Jul 11 17:11:18 2016 New Revision: 302581 URL: https://svnweb.freebsd.org/changeset/base/302581 Log: Remove redundant declaration for tcp_dooptions, similar to r302576 netinet/tcp_var.h already defines this function Differential Revision:https://reviews.freebsd.org/D7189 MFC after:1 week PR: 209920 Reported by: Mark MillardReviewed by: np Tested with: clang 3.8.0, gcc 4.2.1, gcc 5.3.0 Sponsored by: EMC / Isilon Storage Division Modified: head/sys/dev/cxgbe/tom/t4_listen.c Modified: head/sys/dev/cxgbe/tom/t4_listen.c == --- head/sys/dev/cxgbe/tom/t4_listen.c Mon Jul 11 17:04:22 2016 (r302580) +++ head/sys/dev/cxgbe/tom/t4_listen.c Mon Jul 11 17:11:18 2016 (r302581) @@ -665,9 +665,6 @@ t4_syncache_removed(struct toedev *tod _ release_synqe(synqe); } -/* XXX */ -extern void tcp_dooptions(struct tcpopt *, u_char *, int, int); - int t4_syncache_respond(struct toedev *tod, void *arg, struct mbuf *m) { ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302577 - head/sys/dev/drm2
Author: ngie Date: Mon Jul 11 17:01:07 2016 New Revision: 302577 URL: https://svnweb.freebsd.org/changeset/base/302577 Log: Add missing default case to capable(..) function definition By definition (enum __drm_capabilities), cases other than CAP_SYS_ADMIN aren't possible. Add in a KASSERT safety belt and return false in !INVARIANTS case if an invalid value is passed in, as it would be a programmer error. This fixes a -Wreturn-type error with gcc 5.3.0. Differential Revision:https://reviews.freebsd.org/D7188 MFC after:1 week Reported by: devel/amd64-gcc (5.3.0) Reviewed by: dumbbell Sponsored by: EMC / Isilon Storage Division Modified: head/sys/dev/drm2/drm_os_freebsd.h Modified: head/sys/dev/drm2/drm_os_freebsd.h == --- head/sys/dev/drm2/drm_os_freebsd.h Mon Jul 11 16:56:51 2016 (r302576) +++ head/sys/dev/drm2/drm_os_freebsd.h Mon Jul 11 17:01:07 2016 (r302577) @@ -438,6 +438,10 @@ capable(enum __drm_capabilities cap) switch (cap) { case CAP_SYS_ADMIN: return DRM_SUSER(curthread); + default: + KASSERT(false, + ("%s: unhandled capability: %0x", __func__, cap)); + return (false); } } ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302576 - head/sys/dev/cxgb/ulp/tom
Author: ngie Date: Mon Jul 11 16:56:51 2016 New Revision: 302576 URL: https://svnweb.freebsd.org/changeset/base/302576 Log: (Re-do r302574 with corrected commit message..) Remove redundant declaration for tcp_dooptions netinet/tcp_var.h already defines this function Differential Revision:https://reviews.freebsd.org/D7187 MFC after:1 week PR: 209920 Reported by: Mark MillardReviewed by: np Tested with: clang 3.8.0, gcc 4.2.1, gcc 5.3.0 Sponsored by: EMC / Isilon Storage Division Modified: head/sys/dev/cxgb/ulp/tom/cxgb_listen.c Modified: head/sys/dev/cxgb/ulp/tom/cxgb_listen.c == --- head/sys/dev/cxgb/ulp/tom/cxgb_listen.c Mon Jul 11 16:54:19 2016 (r302575) +++ head/sys/dev/cxgb/ulp/tom/cxgb_listen.c Mon Jul 11 16:56:51 2016 (r302576) @@ -922,9 +922,6 @@ t3_syncache_removed(struct toedev *tod _ release_synqe(synqe); } -/* XXX */ -extern void tcp_dooptions(struct tcpopt *, u_char *, int, int); - int t3_syncache_respond(struct toedev *tod, void *arg, struct mbuf *m) { ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302575 - head/sys/dev/cxgb/ulp/tom
Author: ngie Date: Mon Jul 11 16:54:19 2016 New Revision: 302575 URL: https://svnweb.freebsd.org/changeset/base/302575 Log: Revert r302574. I botched the commit message in more way than 1 Modified: head/sys/dev/cxgb/ulp/tom/cxgb_listen.c Modified: head/sys/dev/cxgb/ulp/tom/cxgb_listen.c == --- head/sys/dev/cxgb/ulp/tom/cxgb_listen.c Mon Jul 11 16:52:04 2016 (r302574) +++ head/sys/dev/cxgb/ulp/tom/cxgb_listen.c Mon Jul 11 16:54:19 2016 (r302575) @@ -922,6 +922,9 @@ t3_syncache_removed(struct toedev *tod _ release_synqe(synqe); } +/* XXX */ +extern void tcp_dooptions(struct tcpopt *, u_char *, int, int); + int t3_syncache_respond(struct toedev *tod, void *arg, struct mbuf *m) { ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302574 - head/sys/dev/cxgb/ulp/tom
Author: ngie Date: Mon Jul 11 16:52:04 2016 New Revision: 302574 URL: https://svnweb.freebsd.org/changeset/base/302574 Log: Remove redundant declaration for tcp_dooptions netinet/tcp_var.h already defines this function PR: 209924 Reported by: Mark MillardReviewed by: np Tested with: clang 3.8.0, gcc 4.2.1, gcc 5.3.0 Sponsored by: EMC / Isilon Storage Division Modified: head/sys/dev/cxgb/ulp/tom/cxgb_listen.c Modified: head/sys/dev/cxgb/ulp/tom/cxgb_listen.c == --- head/sys/dev/cxgb/ulp/tom/cxgb_listen.c Mon Jul 11 15:52:52 2016 (r302573) +++ head/sys/dev/cxgb/ulp/tom/cxgb_listen.c Mon Jul 11 16:52:04 2016 (r302574) @@ -922,9 +922,6 @@ t3_syncache_removed(struct toedev *tod _ release_synqe(synqe); } -/* XXX */ -extern void tcp_dooptions(struct tcpopt *, u_char *, int, int); - int t3_syncache_respond(struct toedev *tod, void *arg, struct mbuf *m) { ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302572 - head/sys/dev/drm2/i915
Author: ngie Date: Mon Jul 11 15:50:06 2016 New Revision: 302572 URL: https://svnweb.freebsd.org/changeset/base/302572 Log: Remove redundant declarations for intel_fbc_enabled(..) and i915_gem_dump_object(..) to fix -Wredundant-decls warning MFC after:1 week PR: 209924 Reported by: Mark MillardTested with: devel/amd64-gcc (5.3.0) Sponsored by: EMC / Isilon Storage Division Modified: head/sys/dev/drm2/i915/i915_drv.h Modified: head/sys/dev/drm2/i915/i915_drv.h == --- head/sys/dev/drm2/i915/i915_drv.h Mon Jul 11 15:47:43 2016 (r302571) +++ head/sys/dev/drm2/i915/i915_drv.h Mon Jul 11 15:50:06 2016 (r302572) @@ -1618,8 +1618,6 @@ int i915_verify_lists(struct drm_device #endif void i915_gem_object_check_coherency(struct drm_i915_gem_object *obj, int handle); -void i915_gem_dump_object(struct drm_i915_gem_object *obj, int len, - const char *where, uint32_t mark); /* i915_suspend.c */ extern int i915_save_state(struct drm_device *dev); @@ -1673,7 +1671,6 @@ extern void intel_modeset_cleanup(struct extern int intel_modeset_vga_set_state(struct drm_device *dev, bool state); extern void intel_modeset_setup_hw_state(struct drm_device *dev, bool force_restore); -extern bool intel_fbc_enabled(struct drm_device *dev); extern void intel_disable_fbc(struct drm_device *dev); extern bool ironlake_set_drps(struct drm_device *dev, u8 val); extern void intel_init_pch_refclk(struct drm_device *dev); ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302571 - head/sys/dev/drm2/radeon
Author: ngie Date: Mon Jul 11 15:47:43 2016 New Revision: 302571 URL: https://svnweb.freebsd.org/changeset/base/302571 Log: Remove redundant declaration for radeon_pm_acpi_event_handler(..) to fix -Wredundant-decls warning MFC after:1 week PR: 209924 Reported by: Mark MillardTested with: devel/amd64-gcc (5.3.0) Sponsored by: EMC / Isilon Storage Division Modified: head/sys/dev/drm2/radeon/radeon_acpi.c Modified: head/sys/dev/drm2/radeon/radeon_acpi.c == --- head/sys/dev/drm2/radeon/radeon_acpi.c Mon Jul 11 15:33:49 2016 (r302570) +++ head/sys/dev/drm2/radeon/radeon_acpi.c Mon Jul 11 15:47:43 2016 (r302571) @@ -32,8 +32,6 @@ __FBSDID("$FreeBSD$"); #define ACPI_AC_CLASS "ac_adapter" -extern void radeon_pm_acpi_event_handler(struct radeon_device *rdev); - struct atif_verify_interface { u16 size; /* structure size in bytes (includes size field) */ u16 version;/* version */ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302553 - head/sys/rpc
Author: ngie Date: Mon Jul 11 07:24:56 2016 New Revision: 302553 URL: https://svnweb.freebsd.org/changeset/base/302553 Log: Don't test for xpt not being NULL before calling svc_xprt_free(..) svc_xprt_alloc(..) will always return initialized memory as it uses mem_alloc(..) under the covers, which uses malloc(.., M_WAITOK, ..). MFC after: 1 week Reported by: Coverity CID: 1007341 Sponsored by: EMC / Isilon Storage Division Modified: head/sys/rpc/svc_dg.c Modified: head/sys/rpc/svc_dg.c == --- head/sys/rpc/svc_dg.c Mon Jul 11 07:17:52 2016(r302552) +++ head/sys/rpc/svc_dg.c Mon Jul 11 07:24:56 2016(r302553) @@ -142,9 +142,8 @@ svc_dg_create(SVCPOOL *pool, struct sock return (xprt); freedata: (void) printf(svc_dg_str, __no_mem_str); - if (xprt) { - svc_xprt_free(xprt); - } + svc_xprt_free(xprt); + return (NULL); } ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302552 - head/sys/rpc
Author: ngie Date: Mon Jul 11 07:17:52 2016 New Revision: 302552 URL: https://svnweb.freebsd.org/changeset/base/302552 Log: Convert `svc_xprt_alloc(..)` and `svc_xprt_free(..)`'s prototypes to ANSI C style prototypes MFC after: 1 week Sponsored by: EMC / Isilon Storage Division Modified: head/sys/rpc/svc.c Modified: head/sys/rpc/svc.c == --- head/sys/rpc/svc.c Mon Jul 11 07:07:15 2016(r302551) +++ head/sys/rpc/svc.c Mon Jul 11 07:17:52 2016(r302552) @@ -841,7 +841,7 @@ svcerr_progvers(struct svc_req *rqstp, r * parameters. */ SVCXPRT * -svc_xprt_alloc() +svc_xprt_alloc(void) { SVCXPRT *xprt; SVCXPRT_EXT *ext; @@ -858,8 +858,7 @@ svc_xprt_alloc() * Free a server transport structure. */ void -svc_xprt_free(xprt) - SVCXPRT *xprt; +svc_xprt_free(SVCXPRT *xprt) { mem_free(xprt->xp_p3, sizeof(SVCXPRT_EXT)); ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302551 - head/sys/rpc
Author: ngie Date: Mon Jul 11 07:07:15 2016 New Revision: 302551 URL: https://svnweb.freebsd.org/changeset/base/302551 Log: Deobfuscate cleanup path in clnt_vc_create(..) Similar to r300836, r301800, and r302550, cl and ct will always be non-NULL as they're allocated using the mem_alloc routines, which always use `malloc(..., M_WAITOK)`. MFC after: 1 week Reported by: Coverity CID: 1007342 Sponsored by: EMC / Isilon Storage Division Modified: head/sys/rpc/clnt_vc.c Modified: head/sys/rpc/clnt_vc.c == --- head/sys/rpc/clnt_vc.c Mon Jul 11 06:58:24 2016(r302550) +++ head/sys/rpc/clnt_vc.c Mon Jul 11 07:07:15 2016(r302551) @@ -270,12 +270,10 @@ clnt_vc_create( return (cl); err: - if (ct) { - mtx_destroy(>ct_lock); - mem_free(ct, sizeof (struct ct_data)); - } - if (cl) - mem_free(cl, sizeof (CLIENT)); + mtx_destroy(>ct_lock); + mem_free(ct, sizeof (struct ct_data)); + mem_free(cl, sizeof (CLIENT)); + return ((CLIENT *)NULL); } ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302550 - head/sys/rpc
Author: ngie Date: Mon Jul 11 06:58:24 2016 New Revision: 302550 URL: https://svnweb.freebsd.org/changeset/base/302550 Log: Deobfuscate cleanup path in clnt_dg_create(..) Similar to r300836 and r301800, cl and cu will always be non-NULL as they're allocated using the mem_alloc routines, which always use `malloc(..., M_WAITOK)`. Deobfuscating the cleanup path fixes a leak where if cl was NULL and cu was not, cu would not be free'd, and also removes a duplicate test for cl not being NULL. MFC after: 1 week Reported by: Coverity CID: 1007033, 1007344 Sponsored by: EMC / Isilon Storage Division Modified: head/sys/rpc/clnt_dg.c Modified: head/sys/rpc/clnt_dg.c == --- head/sys/rpc/clnt_dg.c Mon Jul 11 06:55:02 2016(r302549) +++ head/sys/rpc/clnt_dg.c Mon Jul 11 06:58:24 2016(r302550) @@ -313,11 +313,9 @@ recheck_socket: cl->cl_netid = NULL; return (cl); err2: - if (cl) { - mem_free(cl, sizeof (CLIENT)); - if (cu) - mem_free(cu, sizeof (*cu)); - } + mem_free(cl, sizeof (CLIENT)); + mem_free(cu, sizeof (*cu)); + return (NULL); } ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302532 - head
Author: ngie Date: Sun Jul 10 20:42:18 2016 New Revision: 302532 URL: https://svnweb.freebsd.org/changeset/base/302532 Log: Correct OLD_LIBS change done in r298840 libkvm.so lives in /lib, not /usr/lib MFC after: 3 days X-MFC note: ^/stable/11 only X-MFC with: r298840 Submitted by: Herbert J. SkuhraSponsored by: EMC / Isilon Storage Division Modified: head/ObsoleteFiles.inc Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Sun Jul 10 20:22:04 2016(r302531) +++ head/ObsoleteFiles.inc Sun Jul 10 20:42:18 2016(r302532) @@ -203,7 +203,7 @@ OLD_FILES+=usr/share/man/man9/rman_await # 20160517: ReiserFS removed OLD_FILES+=usr/share/man/man5/reiserfs.5.gz # 20160430: kvm_getfiles(3) removed from kvm(3) -OLD_LIBS+=usr/lib/libkvm.so.6 +OLD_LIBS+=lib/libkvm.so.6 OLD_FILES+=usr/share/man/man3/kvm_getfiles.3.gz # 20160423: remove mroute6d OLD_FILES+=etc/rc.d/mroute6d ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302458 - stable/9/usr.sbin/rpc.lockd
Author: ngie Date: Fri Jul 8 21:20:09 2016 New Revision: 302458 URL: https://svnweb.freebsd.org/changeset/base/302458 Log: MFstable/10 r302455: MFC r301871: Add missing break in lock_partialfilelock(..) with NFS_RESERR This will help ensure that the right error is trickled up when the function is called if the lock status is NFS_RESERR Tested with: fsx; svn info/svnversion (uses bdb locking); locktests from Bull http://nfsv4.bullopensource.org/tools/tests/locktest.php CID: 1008161, 1304956 Modified: stable/9/usr.sbin/rpc.lockd/lockd_lock.c Directory Properties: stable/9/ (props changed) stable/9/usr.sbin/ (props changed) stable/9/usr.sbin/rpc.lockd/ (props changed) Modified: stable/9/usr.sbin/rpc.lockd/lockd_lock.c == --- stable/9/usr.sbin/rpc.lockd/lockd_lock.cFri Jul 8 21:19:48 2016 (r302457) +++ stable/9/usr.sbin/rpc.lockd/lockd_lock.cFri Jul 8 21:20:09 2016 (r302458) @@ -1428,6 +1428,7 @@ lock_partialfilelock(struct file_lock *f break; case NFS_RESERR: retval = PFL_NFSRESERR; + break; default: debuglog("Unmatched lnlstatus %d\n"); retval = PFL_NFSDENIED_NOLOCK; ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302455 - stable/10/usr.sbin/rpc.lockd
Author: ngie Date: Fri Jul 8 20:50:44 2016 New Revision: 302455 URL: https://svnweb.freebsd.org/changeset/base/302455 Log: MFC r301871: Add missing break in lock_partialfilelock(..) with NFS_RESERR This will help ensure that the right error is trickled up when the function is called if the lock status is NFS_RESERR Tested with: fsx; svn info/svnversion (uses bdb locking); locktests from Bull http://nfsv4.bullopensource.org/tools/tests/locktest.php CID: 1008161, 1304956 Modified: stable/10/usr.sbin/rpc.lockd/lockd_lock.c Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/rpc.lockd/lockd_lock.c == --- stable/10/usr.sbin/rpc.lockd/lockd_lock.c Fri Jul 8 20:40:50 2016 (r302454) +++ stable/10/usr.sbin/rpc.lockd/lockd_lock.c Fri Jul 8 20:50:44 2016 (r302455) @@ -1426,6 +1426,7 @@ lock_partialfilelock(struct file_lock *f break; case NFS_RESERR: retval = PFL_NFSRESERR; + break; default: debuglog("Unmatched lnlstatus %d\n"); retval = PFL_NFSDENIED_NOLOCK; ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302454 - stable/9/usr.sbin/rpcbind
Author: ngie Date: Fri Jul 8 20:40:50 2016 New Revision: 302454 URL: https://svnweb.freebsd.org/changeset/base/302454 Log: MFstable/10 r302453: MFC r301605: Bounds check rpcbs_rmtcall(..) to ensure rtype is less than RPCBVERS_STAT Not returning if rtype == RPCBVERS_STAT will cause us to overrun the inf array, as it's defined to be exactly RPCBVERS_STAT elements in rpcb_prot.x: > include/rpc/rpcb_prot.x:typedef rpcb_stat rpcb_stat_byvers[RPCBVERS_STAT]; The proposed change also matches the rest of the rtype upper bound checks in the file, so the original change was likely a typo. CID: 1007567 Modified: stable/9/usr.sbin/rpcbind/rpcb_stat.c Directory Properties: stable/9/ (props changed) stable/9/usr.sbin/ (props changed) Modified: stable/9/usr.sbin/rpcbind/rpcb_stat.c == --- stable/9/usr.sbin/rpcbind/rpcb_stat.c Fri Jul 8 20:39:37 2016 (r302453) +++ stable/9/usr.sbin/rpcbind/rpcb_stat.c Fri Jul 8 20:40:50 2016 (r302454) @@ -152,7 +152,7 @@ rpcbs_rmtcall(rpcvers_t rtype, rpcproc_t rpcbs_rmtcalllist *rl; struct netconfig *nconf; - if (rtype > RPCBVERS_STAT) + if (rtype >= RPCBVERS_STAT) return; for (rl = inf[rtype].rmtinfo; rl; rl = rl->next) { ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302453 - stable/10/usr.sbin/rpcbind
Author: ngie Date: Fri Jul 8 20:39:37 2016 New Revision: 302453 URL: https://svnweb.freebsd.org/changeset/base/302453 Log: MFC r301605: Bounds check rpcbs_rmtcall(..) to ensure rtype is less than RPCBVERS_STAT Not returning if rtype == RPCBVERS_STAT will cause us to overrun the inf array, as it's defined to be exactly RPCBVERS_STAT elements in rpcb_prot.x: > include/rpc/rpcb_prot.x:typedef rpcb_stat rpcb_stat_byvers[RPCBVERS_STAT]; The proposed change also matches the rest of the rtype upper bound checks in the file, so the original change was likely a typo. CID: 1007567 Modified: stable/10/usr.sbin/rpcbind/rpcb_stat.c Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/rpcbind/rpcb_stat.c == --- stable/10/usr.sbin/rpcbind/rpcb_stat.c Fri Jul 8 20:33:20 2016 (r302452) +++ stable/10/usr.sbin/rpcbind/rpcb_stat.c Fri Jul 8 20:39:37 2016 (r302453) @@ -152,7 +152,7 @@ rpcbs_rmtcall(rpcvers_t rtype, rpcproc_t rpcbs_rmtcalllist *rl; struct netconfig *nconf; - if (rtype > RPCBVERS_STAT) + if (rtype >= RPCBVERS_STAT) return; for (rl = inf[rtype].rmtinfo; rl; rl = rl->next) { ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302451 - stable/10/sys/rpc
Author: ngie Date: Fri Jul 8 20:30:20 2016 New Revision: 302451 URL: https://svnweb.freebsd.org/changeset/base/302451 Log: MFC r301800: Deobfuscate cleanup path in clnt_bck_create(..) Similar to r300836, cl and ct will always be non-NULL as they're allocated using the mem_alloc routines, which always use `malloc(..., M_WAITOK)`. Deobfuscating the cleanup path fixes a leak where if cl was NULL and ct was not, ct would not be free'd, and also removes a duplicate test for cl not being NULL. CID: 122 Modified: stable/10/sys/rpc/clnt_bck.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/rpc/clnt_bck.c == --- stable/10/sys/rpc/clnt_bck.cFri Jul 8 20:20:46 2016 (r302450) +++ stable/10/sys/rpc/clnt_bck.cFri Jul 8 20:30:20 2016 (r302451) @@ -175,14 +175,9 @@ clnt_bck_create( return (cl); err: - if (cl) { - if (ct) { - mtx_destroy(>ct_lock); - mem_free(ct, sizeof (struct ct_data)); - } - if (cl) - mem_free(cl, sizeof (CLIENT)); - } + mtx_destroy(>ct_lock); + mem_free(ct, sizeof (struct ct_data)); + mem_free(cl, sizeof (CLIENT)); return (NULL); } ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302447 - stable/10/contrib/netbsd-tests/lib/libc/string
Author: ngie Date: Fri Jul 8 19:19:30 2016 New Revision: 302447 URL: https://svnweb.freebsd.org/changeset/base/302447 Log: MFC r301749: Add debug output to aid in determining why `goodResult` != `result` PR: 210619 (for diagnosis) Modified: stable/10/contrib/netbsd-tests/lib/libc/string/t_memcpy.c Directory Properties: stable/10/ (props changed) Modified: stable/10/contrib/netbsd-tests/lib/libc/string/t_memcpy.c == --- stable/10/contrib/netbsd-tests/lib/libc/string/t_memcpy.c Fri Jul 8 19:16:50 2016(r302446) +++ stable/10/contrib/netbsd-tests/lib/libc/string/t_memcpy.c Fri Jul 8 19:19:30 2016(r302447) @@ -108,7 +108,12 @@ ATF_TC_BODY(memcpy_basic, tc) if (i != j) runTest(start[i], start[j]); MD5End(mc, result); +#ifdef __NetBSD__ ATF_REQUIRE_EQ(strcmp(result, goodResult), 0); +#else + ATF_REQUIRE_EQ_MSG(strcmp(result, goodResult), 0, "%s != %s", + result, goodResult); +#endif } ATF_TC(memccpy_simple); ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302445 - stable/9/lib/libc/net
Author: ngie Date: Fri Jul 8 19:16:45 2016 New Revision: 302445 URL: https://svnweb.freebsd.org/changeset/base/302445 Log: MFstable/10 r302444: MFC r301708: Revert r301707 getnetent_p doesn't return NULL like getnetent does. coccinelle got confused and I didn't verify that it worked before committing the change Pointyhat to: ngie Modified: stable/9/lib/libc/net/getnetbyht.c Directory Properties: stable/9/ (props changed) stable/9/lib/ (props changed) stable/9/lib/libc/ (props changed) Modified: stable/9/lib/libc/net/getnetbyht.c == --- stable/9/lib/libc/net/getnetbyht.c Fri Jul 8 19:13:18 2016 (r302444) +++ stable/9/lib/libc/net/getnetbyht.c Fri Jul 8 19:16:45 2016 (r302445) @@ -215,10 +215,10 @@ _ht_getnetbyname(void *rval, void *cb_da } _setnethtent(ned->stayopen, ned); - while ((error = getnetent_p(, ned)) == NULL) { + while ((error = getnetent_p(, ned)) == 0) { if (strcasecmp(ne.n_name, name) == 0) break; - for (cp = ne.n_aliases; *cp != NULL; cp++) + for (cp = ne.n_aliases; *cp != 0; cp++) if (strcasecmp(*cp, name) == 0) goto found; } ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302444 - stable/10/lib/libc/net
Author: ngie Date: Fri Jul 8 19:13:18 2016 New Revision: 302444 URL: https://svnweb.freebsd.org/changeset/base/302444 Log: MFC r301708: Revert r301707 getnetent_p doesn't return NULL like getnetent does. coccinelle got confused and I didn't verify that it worked before committing the change Pointyhat to: ngie Modified: stable/10/lib/libc/net/getnetbyht.c Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libc/net/getnetbyht.c == --- stable/10/lib/libc/net/getnetbyht.c Fri Jul 8 19:09:47 2016 (r302443) +++ stable/10/lib/libc/net/getnetbyht.c Fri Jul 8 19:13:18 2016 (r302444) @@ -215,10 +215,10 @@ _ht_getnetbyname(void *rval, void *cb_da } _setnethtent(ned->stayopen, ned); - while ((error = getnetent_p(, ned)) == NULL) { + while ((error = getnetent_p(, ned)) == 0) { if (strcasecmp(ne.n_name, name) == 0) break; - for (cp = ne.n_aliases; *cp != NULL; cp++) + for (cp = ne.n_aliases; *cp != 0; cp++) if (strcasecmp(*cp, name) == 0) goto found; } ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302443 - stable/9/lib/libc/net
Author: ngie Date: Fri Jul 8 19:09:47 2016 New Revision: 302443 URL: https://svnweb.freebsd.org/changeset/base/302443 Log: MFstable/10 r302442: MFC r301707: Use NULL instead of `0` in _ht_getnetbyname(..) - getnetent returns NULL on completion/error. - .h_aliases is NULL terminated. Modified: stable/9/lib/libc/net/getnetbyht.c Directory Properties: stable/9/ (props changed) stable/9/lib/ (props changed) stable/9/lib/libc/ (props changed) Modified: stable/9/lib/libc/net/getnetbyht.c == --- stable/9/lib/libc/net/getnetbyht.c Fri Jul 8 19:04:51 2016 (r302442) +++ stable/9/lib/libc/net/getnetbyht.c Fri Jul 8 19:09:47 2016 (r302443) @@ -215,10 +215,10 @@ _ht_getnetbyname(void *rval, void *cb_da } _setnethtent(ned->stayopen, ned); - while ((error = getnetent_p(, ned)) == 0) { + while ((error = getnetent_p(, ned)) == NULL) { if (strcasecmp(ne.n_name, name) == 0) break; - for (cp = ne.n_aliases; *cp != 0; cp++) + for (cp = ne.n_aliases; *cp != NULL; cp++) if (strcasecmp(*cp, name) == 0) goto found; } ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302442 - stable/10/lib/libc/net
Author: ngie Date: Fri Jul 8 19:04:51 2016 New Revision: 302442 URL: https://svnweb.freebsd.org/changeset/base/302442 Log: MFC r301707: Use NULL instead of `0` in _ht_getnetbyname(..) - getnetent returns NULL on completion/error. - .h_aliases is NULL terminated. Modified: stable/10/lib/libc/net/getnetbyht.c Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libc/net/getnetbyht.c == --- stable/10/lib/libc/net/getnetbyht.c Fri Jul 8 18:54:28 2016 (r302441) +++ stable/10/lib/libc/net/getnetbyht.c Fri Jul 8 19:04:51 2016 (r302442) @@ -215,10 +215,10 @@ _ht_getnetbyname(void *rval, void *cb_da } _setnethtent(ned->stayopen, ned); - while ((error = getnetent_p(, ned)) == 0) { + while ((error = getnetent_p(, ned)) == NULL) { if (strcasecmp(ne.n_name, name) == 0) break; - for (cp = ne.n_aliases; *cp != 0; cp++) + for (cp = ne.n_aliases; *cp != NULL; cp++) if (strcasecmp(*cp, name) == 0) goto found; } ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302441 - stable/11/sys/conf
Author: ngie Date: Fri Jul 8 18:54:28 2016 New Revision: 302441 URL: https://svnweb.freebsd.org/changeset/base/302441 Log: MFC r302438: Revert r302403 lang/gcc{48,49,5} lacks -fformat-extensions support (causing build errors, which is what prompted r302403 to be committed). devel/amd64-gcc on the other hand (which is used by Jenkins), has the support. This fixes the Jenkins failure emails due to excessive warnings being produced with "make buildkernel". Discussed with: lwhsu Approved by: re (gjb) Modified: stable/11/sys/conf/kern.mk Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/conf/kern.mk == --- stable/11/sys/conf/kern.mk Fri Jul 8 18:13:23 2016(r302440) +++ stable/11/sys/conf/kern.mk Fri Jul 8 18:54:28 2016(r302441) @@ -62,7 +62,7 @@ CWARNEXTRA?= -Wno-uninitialized FORMAT_EXTENSIONS= -Wno-format .elif ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 30600 FORMAT_EXTENSIONS= -D__printf__=__freebsd_kprintf__ -.elif ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} == 40201 +.else FORMAT_EXTENSIONS= -fformat-extensions .endif ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302438 - head/sys/conf
Author: ngie Date: Fri Jul 8 16:29:45 2016 New Revision: 302438 URL: https://svnweb.freebsd.org/changeset/base/302438 Log: Revert r302403 lang/gcc{48,49,5} lacks -fformat-extensions support (causing build errors, which is what prompted r302403 to be committed). devel/amd64-gcc on the other hand (which is used by Jenkins), has the support. This fixes the Jenkins failure emails due to excessive warnings being produced with "make buildkernel". Discussed with: lwhsu Reported by: Jenkins (FreeBSD_HEAD_amd64_gcc job) Sponsored by: EMC / Isilon Storage Division Modified: head/sys/conf/kern.mk Modified: head/sys/conf/kern.mk == --- head/sys/conf/kern.mk Fri Jul 8 15:57:55 2016(r302437) +++ head/sys/conf/kern.mk Fri Jul 8 16:29:45 2016(r302438) @@ -62,7 +62,7 @@ CWARNEXTRA?= -Wno-uninitialized FORMAT_EXTENSIONS= -Wno-format .elif ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 30600 FORMAT_EXTENSIONS= -D__printf__=__freebsd_kprintf__ -.elif ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} == 40201 +.else FORMAT_EXTENSIONS= -fformat-extensions .endif ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302403 - head/sys/conf
Author: ngie Date: Thu Jul 7 22:44:23 2016 New Revision: 302403 URL: https://svnweb.freebsd.org/changeset/base/302403 Log: Do not use -fformat-extensions with non-base versions of gcc Ports versions of gcc do not have -fformat-extensions support. This unbreaks compiling the kernel/modules with non-base gcc (4.8, 5.0, etc) if MK_FORMAT_EXTENSIONS=yes (the default). Approved by: re (gjb) Differential Revision: https://reviews.freebsd.org/D7150 Reviewed by: bdrewery Sponsored by: EMC / Isilon Storage Division Modified: head/sys/conf/kern.mk Modified: head/sys/conf/kern.mk == --- head/sys/conf/kern.mk Thu Jul 7 22:10:10 2016(r302402) +++ head/sys/conf/kern.mk Thu Jul 7 22:44:23 2016(r302403) @@ -62,7 +62,7 @@ CWARNEXTRA?= -Wno-uninitialized FORMAT_EXTENSIONS= -Wno-format .elif ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 30600 FORMAT_EXTENSIONS= -D__printf__=__freebsd_kprintf__ -.else +.elif ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} == 40201 FORMAT_EXTENSIONS= -fformat-extensions .endif ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302373 - head/usr.sbin/bhyve
Author: ngie Date: Wed Jul 6 16:02:15 2016 New Revision: 302373 URL: https://svnweb.freebsd.org/changeset/base/302373 Log: Fix CTASSERT issue in a more clean way - Replace all CTASSERT macro instances with static_assert's. - Remove the WRAPPED_CTASSERT macro; it's now an unnecessary obfuscation. - Localize all static_assert's to the structures being tested. - Sort some headers per-style(9). Approved by: re (hrs) Differential Revision: https://reviews.freebsd.org/D7130 MFC after: 1 week X-MFC with: r302364 Reviewed by: ed, grehan (maintainer) Submitted by: ed Sponsored by: EMC / Isilon Storage Division Modified: head/usr.sbin/bhyve/bhyverun.h head/usr.sbin/bhyve/pci_emul.c head/usr.sbin/bhyve/pci_emul.h head/usr.sbin/bhyve/task_switch.c Modified: head/usr.sbin/bhyve/bhyverun.h == --- head/usr.sbin/bhyve/bhyverun.h Wed Jul 6 14:09:49 2016 (r302372) +++ head/usr.sbin/bhyve/bhyverun.h Wed Jul 6 16:02:15 2016 (r302373) @@ -29,12 +29,6 @@ #ifndef_FBSDRUN_H_ #define_FBSDRUN_H_ -#ifndef CTASSERT /* Allow lint to override */ -#defineCTASSERT(x) _CTASSERT(x, __LINE__) -#define_CTASSERT(x, y) __CTASSERT(x, y) -#define__CTASSERT(x, y)typedef char __assert ## y[(x) ? 1 : -1] -#endif - #defineVMEXIT_CONTINUE (0) #defineVMEXIT_ABORT(-1) Modified: head/usr.sbin/bhyve/pci_emul.c == --- head/usr.sbin/bhyve/pci_emul.c Wed Jul 6 14:09:49 2016 (r302372) +++ head/usr.sbin/bhyve/pci_emul.c Wed Jul 6 16:02:15 2016 (r302373) @@ -31,9 +31,9 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include +#include #include #include #include @@ -755,16 +755,6 @@ pci_emul_init(struct vmctx *ctx, struct return (err); } -#ifdef __GNU_C__ -#defineWRAPPED_CTASSERT(x) CTASSERT(x) __unused -#else -#defineWRAPPED_CTASSERT(x) CTASSERT(x) -#endif - -WRAPPED_CTASSERT(sizeof(struct msicap) == 14); -WRAPPED_CTASSERT(sizeof(struct msixcap) == 12); -WRAPPED_CTASSERT(sizeof(struct pciecap) == 60); - void pci_populate_msicap(struct msicap *msicap, int msgnum, int nextptr) { Modified: head/usr.sbin/bhyve/pci_emul.h == --- head/usr.sbin/bhyve/pci_emul.h Wed Jul 6 14:09:49 2016 (r302372) +++ head/usr.sbin/bhyve/pci_emul.h Wed Jul 6 16:02:15 2016 (r302373) @@ -160,6 +160,7 @@ struct msicap { uint32_taddrhi; uint16_tmsgdata; } __packed; +static_assert(sizeof(struct msicap) == 14, "compile-time assertion failed"); struct msixcap { uint8_t capid; @@ -168,6 +169,7 @@ struct msixcap { uint32_ttable_info; /* bar index and offset within it */ uint32_tpba_info; /* bar index and offset within it */ } __packed; +static_assert(sizeof(struct msixcap) == 12, "compile-time assertion failed"); struct pciecap { uint8_t capid; @@ -202,6 +204,7 @@ struct pciecap { uint16_tslot_control2; uint16_tslot_status2; } __packed; +static_assert(sizeof(struct pciecap) == 60, "compile-time assertion failed"); typedef void (*pci_lintr_cb)(int b, int s, int pin, int pirq_pin, int ioapic_irq, void *arg); Modified: head/usr.sbin/bhyve/task_switch.c == --- head/usr.sbin/bhyve/task_switch.c Wed Jul 6 14:09:49 2016 (r302372) +++ head/usr.sbin/bhyve/task_switch.c Wed Jul 6 16:02:15 2016 (r302373) @@ -37,11 +37,11 @@ __FBSDID("$FreeBSD$"); #include #include +#include +#include #include #include #include -#include -#include #include @@ -91,7 +91,7 @@ struct tss32 { uint16_ttss_trap; uint16_ttss_iomap; }; -CTASSERT(sizeof(struct tss32) == 104); +static_assert(sizeof(struct tss32) == 104, "compile-time assertion failed"); #defineSEL_START(sel) (((sel) & ~0x7)) #defineSEL_LIMIT(sel) (((sel) | 0x7)) ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302369 - head/usr.sbin/bhyve
Author: ngie Date: Wed Jul 6 05:17:56 2016 New Revision: 302369 URL: https://svnweb.freebsd.org/changeset/base/302369 Log: Fix gcc warning Remove -Wunused-but-set-variable (`mopt`). Approved by: re (gjb) Differential Revision: https://reviews.freebsd.org/D7119 MFC after: 1 week X-MFC with: r302332 Reported by: Jenkins Reviewed by: grehan (maintainer) Sponsored by: EMC / Isilon Storage Division Modified: head/usr.sbin/bhyve/usb_mouse.c Modified: head/usr.sbin/bhyve/usb_mouse.c == --- head/usr.sbin/bhyve/usb_mouse.c Wed Jul 6 05:17:07 2016 (r302368) +++ head/usr.sbin/bhyve/usb_mouse.c Wed Jul 6 05:17:56 2016 (r302369) @@ -297,9 +297,6 @@ static void * umouse_init(struct usb_hci *hci, char *opt) { struct umouse_softc *sc; - char *mopt; - - mopt = opt; sc = calloc(1, sizeof(struct umouse_softc)); sc->hci = hci; ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302368 - head/usr.sbin/bhyve
Author: ngie Date: Wed Jul 6 05:17:07 2016 New Revision: 302368 URL: https://svnweb.freebsd.org/changeset/base/302368 Log: Fix gcc build errors with SSE 4.2 detection and gcc warnings - Remove -Wunused-but-set-variable's (`len`, etc). - Replace clang-specific tests in sse42_supported(..) with generic, FreeBSD-supported CPU feature tests, using macros and functions from machine/cpufunc.h and machine/specialreg.h . The previous method for determining SSE4.2 availability was only compatible with clang. - Sort #includes per style(9). Approved by: re (gjb) Differential Revision: https://reviews.freebsd.org/D7119 MFC after: 1 week X-MFC with: r302332 Reported by: Jenkins Reviewed by: grehan (maintainer) Sponsored by: EMC / Isilon Storage Division Modified: head/usr.sbin/bhyve/rfb.c Modified: head/usr.sbin/bhyve/rfb.c == --- head/usr.sbin/bhyve/rfb.c Wed Jul 6 05:11:39 2016(r302367) +++ head/usr.sbin/bhyve/rfb.c Wed Jul 6 05:17:07 2016(r302368) @@ -28,12 +28,14 @@ #include __FBSDID("$FreeBSD$"); +#include #include -#include #include -#include -#include +#include #include +#include +#include +#include #include #include @@ -46,7 +48,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include "bhyvegc.h" #include "console.h" @@ -177,7 +178,6 @@ rfb_send_server_init_msg(int cfd) { struct bhyvegc_image *gc_image; struct rfb_srvr_info sinfo; - int len; gc_image = console_get_image(); @@ -194,8 +194,8 @@ rfb_send_server_init_msg(int cfd) sinfo.pixfmt.green_shift = 8; sinfo.pixfmt.blue_shift = 0; sinfo.namelen = htonl(strlen("bhyve")); - len = stream_write(cfd, , sizeof(sinfo)); - len = stream_write(cfd, "bhyve", strlen("bhyve")); + (void)stream_write(cfd, , sizeof(sinfo)); + (void)stream_write(cfd, "bhyve", strlen("bhyve")); } static void @@ -223,9 +223,8 @@ static void rfb_recv_set_pixfmt_msg(struct rfb_softc *rc, int cfd) { struct rfb_pixfmt_msg pixfmt_msg; - int len; - len = stream_read(cfd, ((void *)_msg)+1, sizeof(pixfmt_msg)-1); + (void)stream_read(cfd, ((void *)_msg)+1, sizeof(pixfmt_msg)-1); } @@ -233,14 +232,14 @@ static void rfb_recv_set_encodings_msg(struct rfb_softc *rc, int cfd) { struct rfb_enc_msg enc_msg; - int len, i; + int i; uint32_t encoding; assert((sizeof(enc_msg) - 1) == 3); - len = stream_read(cfd, ((void *)_msg)+1, sizeof(enc_msg)-1); + (void)stream_read(cfd, ((void *)_msg)+1, sizeof(enc_msg)-1); for (i = 0; i < htons(enc_msg.numencs); i++) { - len = stream_read(cfd, , sizeof(encoding)); + (void)stream_read(cfd, , sizeof(encoding)); switch (htonl(encoding)) { case RFB_ENCODING_RAW: rc->enc_raw_ok = true; @@ -256,27 +255,6 @@ rfb_recv_set_encodings_msg(struct rfb_so } } -static void -rfb_resize_update(struct rfb_softc *rc, int fd) -{ - struct rfb_srvr_updt_msg supdt_msg; -struct rfb_srvr_rect_hdr srect_hdr; - - /* Number of rectangles: 1 */ - supdt_msg.type = 0; - supdt_msg.pad = 0; - supdt_msg.numrects = htons(1); - stream_write(fd, _msg, sizeof(struct rfb_srvr_updt_msg)); - - /* Rectangle header */ - srect_hdr.x = htons(0); - srect_hdr.y = htons(0); - srect_hdr.width = htons(rc->width); - srect_hdr.height = htons(rc->height); - srect_hdr.encoding = htonl(RFB_ENCODING_RESIZE); - stream_write(fd, _hdr, sizeof(struct rfb_srvr_rect_hdr)); -} - /* * Calculate CRC32 using SSE4.2; Intel or AMD Bulldozer+ CPUs only */ @@ -636,9 +614,8 @@ rfb_recv_update_msg(struct rfb_softc *rc { struct rfb_updt_msg updt_msg; struct bhyvegc_image *gc_image; - int len; - len = stream_read(cfd, ((void *)_msg) + 1 , sizeof(updt_msg) - 1); + (void)stream_read(cfd, ((void *)_msg) + 1 , sizeof(updt_msg) - 1); console_refresh(); gc_image = console_get_image(); @@ -666,9 +643,8 @@ static void rfb_recv_key_msg(struct rfb_softc *rc, int cfd) { struct rfb_key_msg key_msg; - int len; - len = stream_read(cfd, ((void *)_msg) + 1, sizeof(key_msg) - 1); + (void)stream_read(cfd, ((void *)_msg) + 1, sizeof(key_msg) - 1); console_key_event(key_msg.down, htonl(key_msg.code)); } @@ -677,9 +653,8 @@ static void rfb_recv_ptr_msg(struct rfb_softc *rc, int cfd) { struct rfb_ptr_msg ptr_msg; - int len; - len = stream_read(cfd, ((void *)_msg) + 1, sizeof(ptr_msg) - 1); + (void)stream_read(cfd, ((void *)_msg) + 1, sizeof(ptr_msg) - 1); console_ptr_event(ptr_msg.button, htons(ptr_msg.x), htons(ptr_msg.y)); } @@ -876,13 +851,15 @@ rfb_thr(void *arg) } static int
svn commit: r302367 - head/usr.sbin/bhyve
Author: ngie Date: Wed Jul 6 05:11:39 2016 New Revision: 302367 URL: https://svnweb.freebsd.org/changeset/base/302367 Log: Fix gcc warnings Remove unused function (`fifo_available`) Approved by: re (gjb) Differential Revision: https://reviews.freebsd.org/D7119 MFC after: 1 week X-MFC with: r302332 Reported by: Jenkins Reviewed by: grehan (maintainer) Sponsored by: EMC / Isilon Storage Division Modified: head/usr.sbin/bhyve/ps2kbd.c Modified: head/usr.sbin/bhyve/ps2kbd.c == --- head/usr.sbin/bhyve/ps2kbd.cWed Jul 6 05:09:13 2016 (r302366) +++ head/usr.sbin/bhyve/ps2kbd.cWed Jul 6 05:11:39 2016 (r302367) @@ -93,15 +93,6 @@ fifo_reset(struct ps2kbd_softc *sc) fifo->size = sizeof(((struct fifo *)0)->buf); } -static int -fifo_available(struct ps2kbd_softc *sc) -{ - struct fifo *fifo; - - fifo = >fifo; - return (fifo->num < fifo->size); -} - static void fifo_put(struct ps2kbd_softc *sc, uint8_t val) { ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302366 - head/usr.sbin/bhyve
Author: ngie Date: Wed Jul 6 05:09:13 2016 New Revision: 302366 URL: https://svnweb.freebsd.org/changeset/base/302366 Log: Fix gcc warnings - Put parentheses around bitwise OR'ed values in the `FIELD_COPY(..)` and `FIELD_REPLACE(..)` macros to mute warning from gcc 4.2.1. - Remove -Wunused-but-set-variable's (`setup_addr`, `status_addr`). Approved by: re (gjb) Differential Revision: https://reviews.freebsd.org/D7119 MFC after: 1 week X-MFC with: r302332 Reported by: Jenkins Reviewed by: grehan (maintainer) Sponsored by: EMC / Isilon Storage Division Modified: head/usr.sbin/bhyve/pci_xhci.c Modified: head/usr.sbin/bhyve/pci_xhci.c == --- head/usr.sbin/bhyve/pci_xhci.c Wed Jul 6 05:05:03 2016 (r302365) +++ head/usr.sbin/bhyve/pci_xhci.c Wed Jul 6 05:09:13 2016 (r302366) @@ -143,10 +143,10 @@ static int xhci_debug = 0; #defineMASK_64_HI(x) ((x) & ~0xULL) #defineMASK_64_LO(x) ((x) & 0xULL) -#defineFIELD_REPLACE(a,b,m,s) ((a) & ~((m) << (s)) | \ - ((b) & (m)) << (s)) -#defineFIELD_COPY(a,b,m,s) ((a) & ~((m) << (s)) | \ - ((b) & ((m) << (s +#defineFIELD_REPLACE(a,b,m,s) (((a) & ~((m) << (s))) | \ + (((b) & (m)) << (s))) +#defineFIELD_COPY(a,b,m,s) (((a) & ~((m) << (s))) | \ + (((b) & ((m) << (s) struct pci_xhci_trb_ring { uint64_t ringaddr; /* current dequeue guest address */ @@ -1700,7 +1700,7 @@ pci_xhci_handle_transfer(struct pci_xhci struct xhci_trb *setup_trb; struct usb_data_xfer *xfer; struct usb_data_xfer_block *xfer_block; - uint64_tval, setup_addr, status_addr; + uint64_tval; uint32_ttrbflags; int do_intr, err; int do_retry; @@ -1718,8 +1718,6 @@ retry: do_retry = 0; do_intr = 0; setup_trb = NULL; - setup_addr = 0; - status_addr = 0; while (1) { pci_xhci_dump_trb(trb); @@ -1754,7 +1752,6 @@ retry: goto errout; } setup_trb = trb; - setup_addr = addr; val = trb->qwTrb0; if (!xfer->ureq) @@ -1786,7 +1783,6 @@ retry: break; case XHCI_TRB_TYPE_STATUS_STAGE: - status_addr = addr; xfer_block = usb_data_xfer_append(xfer, NULL, 0, (void *)addr, ccs); break; @@ -1842,7 +1838,6 @@ retry: err = USB_ERR_NOT_STARTED; if (dev->dev_ue->ue_request != NULL) err = dev->dev_ue->ue_request(dev->dev_sc, xfer); - status_addr = 0; setup_trb = NULL; } else { /* handle data transfer */ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302365 - head/usr.sbin/bhyve
Author: ngie Date: Wed Jul 6 05:05:03 2016 New Revision: 302365 URL: https://svnweb.freebsd.org/changeset/base/302365 Log: Fix gcc warnings Remove -Wunused-but-set-variable (`error`). Cast calls with `(void)` to note that the return value is explicitly ignored. Approved by: re (gjb) Differential Revision: https://reviews.freebsd.org/D7119 MFC after: 1 week Reported by: Jenkins Reviewed by: grehan (maintainer) Sponsored by: EMC / Isilon Storage Division Modified: head/usr.sbin/bhyve/pci_passthru.c Modified: head/usr.sbin/bhyve/pci_passthru.c == --- head/usr.sbin/bhyve/pci_passthru.c Wed Jul 6 05:02:59 2016 (r302364) +++ head/usr.sbin/bhyve/pci_passthru.c Wed Jul 6 05:05:03 2016 (r302365) @@ -361,7 +361,7 @@ msix_table_write(struct vmctx *ctx, int uint64_t *dest64; size_t entry_offset; uint32_t vector_control; - int error, index; + int index; pi = sc->psc_pi; if (offset >= pi->pi_msix.pba_offset && @@ -416,8 +416,8 @@ msix_table_write(struct vmctx *ctx, int /* If the entry is masked, don't set it up */ if ((entry->vector_control & PCIM_MSIX_VCTRL_MASK) == 0 || (vector_control & PCIM_MSIX_VCTRL_MASK) == 0) { - error = vm_setup_pptdev_msix(ctx, vcpu, - sc->psc_sel.pc_bus, sc->psc_sel.pc_dev, + (void)vm_setup_pptdev_msix(ctx, vcpu, + sc->psc_sel.pc_bus, sc->psc_sel.pc_dev, sc->psc_sel.pc_func, index, entry->addr, entry->msg_data, entry->vector_control); } ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302364 - head/usr.sbin/bhyve
Author: ngie Date: Wed Jul 6 05:02:59 2016 New Revision: 302364 URL: https://svnweb.freebsd.org/changeset/base/302364 Log: Fix gcc warnings Add `WRAPPED_CTASSERT` macro by annotating CTASSERTs with __unused to deal with -Wunused-local-typedefs warnings from gcc 4.8+. All other compilers (clang, etc) use CTASSERT as-is. A more generic solution for this issue will be proposed after ^/stable/11 is forked. Consolidate all CTASSERTs under one block instead of inlining them in functions. Approved by: re (gjb) Differential Revision: https://reviews.freebsd.org/D7119 MFC after: 1 week Reported by: Jenkins Reviewed by: grehan (maintainer) Sponsored by: EMC / Isilon Storage Division Modified: head/usr.sbin/bhyve/pci_emul.c Modified: head/usr.sbin/bhyve/pci_emul.c == --- head/usr.sbin/bhyve/pci_emul.c Wed Jul 6 04:58:42 2016 (r302363) +++ head/usr.sbin/bhyve/pci_emul.c Wed Jul 6 05:02:59 2016 (r302364) @@ -755,13 +755,21 @@ pci_emul_init(struct vmctx *ctx, struct return (err); } +#ifdef __GNU_C__ +#defineWRAPPED_CTASSERT(x) CTASSERT(x) __unused +#else +#defineWRAPPED_CTASSERT(x) CTASSERT(x) +#endif + +WRAPPED_CTASSERT(sizeof(struct msicap) == 14); +WRAPPED_CTASSERT(sizeof(struct msixcap) == 12); +WRAPPED_CTASSERT(sizeof(struct pciecap) == 60); + void pci_populate_msicap(struct msicap *msicap, int msgnum, int nextptr) { int mmc; - CTASSERT(sizeof(struct msicap) == 14); - /* Number of msi messages must be a power of 2 between 1 and 32 */ assert((msgnum & (msgnum - 1)) == 0 && msgnum >= 1 && msgnum <= 32); mmc = ffs(msgnum) - 1; @@ -786,7 +794,6 @@ static void pci_populate_msixcap(struct msixcap *msixcap, int msgnum, int barnum, uint32_t msix_tab_size) { - CTASSERT(sizeof(struct msixcap) == 12); assert(msix_tab_size % 4096 == 0); @@ -937,8 +944,6 @@ pci_emul_add_pciecap(struct pci_devinst int err; struct pciecap pciecap; - CTASSERT(sizeof(struct pciecap) == 60); - if (type != PCIEM_TYPE_ROOT_PORT) return (-1); ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302363 - head/usr.sbin/bhyve
Author: ngie Date: Wed Jul 6 04:58:42 2016 New Revision: 302363 URL: https://svnweb.freebsd.org/changeset/base/302363 Log: Fix gcc warnings Put cfl/prdt under AHCI_DEBUG #defines as they are only used in those cases. Approved by: re (gjb) Differential Revision: https://reviews.freebsd.org/D7119 MFC after: 1 week Reported by: Jenkins Reviewed by: grehan (maintainer) Sponsored by: EMC / Isilon Storage Division Modified: head/usr.sbin/bhyve/pci_ahci.c Modified: head/usr.sbin/bhyve/pci_ahci.c == --- head/usr.sbin/bhyve/pci_ahci.c Wed Jul 6 04:56:45 2016 (r302362) +++ head/usr.sbin/bhyve/pci_ahci.c Wed Jul 6 04:58:42 2016 (r302363) @@ -1717,19 +1717,25 @@ static void ahci_handle_slot(struct ahci_port *p, int slot) { struct ahci_cmd_hdr *hdr; +#ifdef AHCI_DEBUG struct ahci_prdt_entry *prdt; +#endif struct pci_ahci_softc *sc; uint8_t *cfis; +#ifdef AHCI_DEBUG int cfl; +#endif sc = p->pr_sc; hdr = (struct ahci_cmd_hdr *)(p->cmd_lst + slot * AHCI_CL_SIZE); +#ifdef AHCI_DEBUG cfl = (hdr->flags & 0x1f) * 4; +#endif cfis = paddr_guest2host(ahci_ctx(sc), hdr->ctba, 0x80 + hdr->prdtl * sizeof(struct ahci_prdt_entry)); +#ifdef AHCI_DEBUG prdt = (struct ahci_prdt_entry *)(cfis + 0x80); -#ifdef AHCI_DEBUG DPRINTF("\ncfis:"); for (i = 0; i < cfl; i++) { if (i % 10 == 0) ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302362 - head/usr.sbin/bhyve
Author: ngie Date: Wed Jul 6 04:56:45 2016 New Revision: 302362 URL: https://svnweb.freebsd.org/changeset/base/302362 Log: Fix gcc warnings - Remove -Wunused-but-set-variable (newcpu) - Always return VMEXIT_CONTINUE as the code always set retval to that value. Approved by: re (gjb) Differential Revision: https://reviews.freebsd.org/D7119 MFC after: 1 week Reported by: Jenkins Reviewed by: grehan (maintainer) Sponsored by: EMC / Isilon Storage Division Modified: head/usr.sbin/bhyve/bhyverun.c Modified: head/usr.sbin/bhyve/bhyverun.c == --- head/usr.sbin/bhyve/bhyverun.c Wed Jul 6 03:23:07 2016 (r302361) +++ head/usr.sbin/bhyve/bhyverun.c Wed Jul 6 04:56:45 2016 (r302362) @@ -388,13 +388,11 @@ vmexit_wrmsr(struct vmctx *ctx, struct v static int vmexit_spinup_ap(struct vmctx *ctx, struct vm_exit *vme, int *pvcpu) { - int newcpu; - int retval = VMEXIT_CONTINUE; - newcpu = spinup_ap(ctx, *pvcpu, - vme->u.spinup_ap.vcpu, vme->u.spinup_ap.rip); + (void)spinup_ap(ctx, *pvcpu, + vme->u.spinup_ap.vcpu, vme->u.spinup_ap.rip); - return (retval); + return (VMEXIT_CONTINUE); } #defineDEBUG_EPT_MISCONFIG ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302330 - head/tools/build/mk
Author: ngie Date: Sun Jul 3 18:27:00 2016 New Revision: 302330 URL: https://svnweb.freebsd.org/changeset/base/302330 Log: Remove ftp(1) related files when MK_FTP == no Approved by: re (gjb) Differential Revision: https://reviews.freebsd.org/D6969 MFC after: 1 week Reviewed by: ngie Submitted by: rakuco Sponsored by: EMC / Isilon Storage Division Modified: head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/tools/build/mk/OptionalObsoleteFiles.inc == --- head/tools/build/mk/OptionalObsoleteFiles.inc Sun Jul 3 18:21:11 2016(r302329) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Sun Jul 3 18:27:00 2016(r302330) @@ -1345,6 +1345,20 @@ OLD_FILES+=usr/sbin/fmtree OLD_FILES+=usr/share/man/man8/fmtree.8.gz .endif +.if ${MK_FTP} == no +OLD_FILES+=etc/ftpusers +OLD_FILES+=etc/rc.d/ftpd +OLD_FILES+=usr/bin/ftp +OLD_FILES+=usr/bin/gate-ftp +OLD_FILES+=usr/bin/pftp +OLD_FILES+=usr/libexec/ftpd +OLD_FILES+=usr/share/man/man1/ftp.1.gz +OLD_FILES+=usr/share/man/man1/gate-ftp.1.gz +OLD_FILES+=usr/share/man/man1/pftp.1.gz +OLD_FILES+=usr/share/man/man5/ftpchroot.5.gz +OLD_FILES+=usr/share/man/man8/ftpd.8.gz +.endif + .if ${MK_GNUCXX} == no OLD_FILES+=usr/bin/g++ OLD_FILES+=usr/include/c++/4.2/algorithm ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302327 - head/usr.bin/lastcomm/tests
Author: ngie Date: Sun Jul 3 17:52:21 2016 New Revision: 302327 URL: https://svnweb.freebsd.org/changeset/base/302327 Log: Fix .../usr.bin/lastcomm/legacy_test:main on i386 The time in the output files was ahead by 3 hours on i386. Fix the incorrect offset. Differential Revision: https://reviews.freebsd.org/D7079 (as part of a larger diff) MFC after: 1 week PR: 210329 Reported by: asomers Approved by: re (gjb) Reviewed by: cem Sponsored by: EMC / Isilon Storage Division Modified: head/usr.bin/lastcomm/tests/v1-i386.out head/usr.bin/lastcomm/tests/v2-i386.out Modified: head/usr.bin/lastcomm/tests/v1-i386.out == --- head/usr.bin/lastcomm/tests/v1-i386.out Sun Jul 3 17:51:24 2016 (r302326) +++ head/usr.bin/lastcomm/tests/v1-i386.out Sun Jul 3 17:52:21 2016 (r302327) @@ -1,28 +1,28 @@ -core -FDX root 0.000 secs 0.000 us 0.000 sy 0.031 es Fri May 18 11:34 -core -DX root 0.000 secs 0.000 us 0.000 sy 0.031 es Fri May 18 11:34 -cc - root 0.000 secs 0.000 us 0.000 sy 0.469 es Fri May 18 11:34 -ld - root 0.000 secs 0.000 us 0.000 sy 0.109 es Fri May 18 11:34 -as - root 0.000 secs 0.000 us 0.000 sy 0.047 es Fri May 18 11:34 -cc1 - root 0.016 secs 0.016 us 0.000 sy 0.203 es Fri May 18 11:34 -time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:34 -1234567890123456 - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:34 -ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:34 -time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:34 -1234567890123456 - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:34 -ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:34 -time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:34 -123456789012345 - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:34 -ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:34 -time - root 0.000 secs 0.000 us 0.000 sy 0.359 es Fri May 18 11:34 -diff - root 0.312 secs 0.297 us 0.016 sy 0.359 es Fri May 18 11:34 -time - root 0.000 secs 0.000 us 0.000 sy 0.031 es Fri May 18 11:34 -dd - root 0.016 secs 0.000 us 0.016 sy 0.031 es Fri May 18 11:34 -time - root 0.000 secs 0.000 us 0.000 sy 3.000 es Fri May 18 11:34 -sleep - root 0.000 secs 0.000 us 0.000 sy 3.000 es Fri May 18 11:34 -time - root 0.000 secs 0.000 us 0.000 sy 3.406 es Fri May 18 11:34 -find - root 0.266 secs 0.062 us 0.203 sy 3.406 es Fri May 18 11:34 -time - root 0.000 secs 0.000 us 0.000 sy 5.047 es Fri May 18 11:33 -egrep - root 4.984 secs 4.984 us 0.000 sy 5.047 es Fri May 18 11:33 -time - root 0.000 secs 0.000 us 0.000 sy 0.484 es Fri May 18 11:33 -awk - root 0.453 secs 0.453 us 0.000 sy 0.453 es Fri May 18 11:33 -accton - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 11:33 +core -FDX root 0.000 secs 0.000 us 0.000 sy 0.031 es Fri May 18 08:34 +core -DX root 0.000 secs 0.000 us 0.000 sy 0.031 es Fri May 18 08:34 +cc - root 0.000 secs 0.000 us 0.000 sy 0.469 es Fri May 18 08:34 +ld - root 0.000 secs 0.000 us 0.000 sy 0.109 es Fri May 18 08:34 +as - root 0.000 secs 0.000 us 0.000 sy 0.047 es Fri May 18 08:34 +cc1 - root 0.016 secs 0.016 us 0.000 sy 0.203 es Fri May 18 08:34 +time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34 +1234567890123456 - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34 +ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34 +time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34 +1234567890123456 - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34 +ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34 +time - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34 +123456789012345 - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34 +ln - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:34 +time - root 0.000 secs 0.000 us 0.000 sy 0.359 es Fri May 18 08:34 +diff - root 0.312 secs 0.297 us 0.016 sy 0.359 es Fri May 18 08:34 +time - root 0.000 secs 0.000 us 0.000 sy 0.031 es Fri May 18 08:34 +dd - root 0.016 secs 0.000 us 0.016 sy 0.031 es Fri May 18 08:34 +time - root 0.000 secs 0.000 us 0.000 sy 3.000 es Fri May 18 08:34 +sleep - root 0.000 secs 0.000 us 0.000 sy 3.000 es Fri May 18 08:34 +time - root 0.000 secs 0.000 us 0.000 sy 3.406 es Fri May 18 08:34 +find - root 0.266 secs 0.062 us 0.203 sy 3.406 es Fri May 18 08:34 +time - root 0.000 secs 0.000 us 0.000 sy 5.047 es Fri May 18 08:33 +egrep - root 4.984 secs 4.984 us 0.000 sy 5.047 es Fri May 18 08:33 +time - root 0.000 secs 0.000 us 0.000 sy 0.484 es Fri May 18 08:33 +awk - root 0.453 secs 0.453 us 0.000 sy 0.453 es Fri May 18 08:33 +accton - root 0.000 secs 0.000 us 0.000 sy 0.000 es Fri May 18 08:33 Modified: head/usr.bin/lastcomm/tests/v2-i386.out == ---
svn commit: r302326 - head/usr.bin/lastcomm/tests
Author: ngie Date: Sun Jul 3 17:51:24 2016 New Revision: 302326 URL: https://svnweb.freebsd.org/changeset/base/302326 Log: Output the diffs to standard error when comparing the expected vs the obtained output from lastcomm instead of just printing out a summary, e.g. "they differed". This will make failures with results more apparent when running kyua debug, kyua report-html, etc. Differential Revision: https://reviews.freebsd.org/D7079 (as part of a larger diff) MFC after: 1 week Approved by: re (gjb) Reviewed by: cem Sponsored by: EMC / Isilon Storage Division Modified: head/usr.bin/lastcomm/tests/legacy_test.sh Modified: head/usr.bin/lastcomm/tests/legacy_test.sh == --- head/usr.bin/lastcomm/tests/legacy_test.sh Sun Jul 3 17:28:39 2016 (r302325) +++ head/usr.bin/lastcomm/tests/legacy_test.sh Sun Jul 3 17:51:24 2016 (r302326) @@ -14,7 +14,7 @@ check() shift # Remove tty field, which varies between systems. awk '{$4 = ""; print}' | - if diff -q - $1 + if diff -a - $1 >&2 then echo "ok $NUM" else ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302321 - in head/contrib/libxo: . tests/core
Author: ngie Date: Sun Jul 3 01:35:27 2016 New Revision: 302321 URL: https://svnweb.freebsd.org/changeset/base/302321 Log: Update libxo to 0.6.3 This fixes the 02 testcases on i386 (at least), and may fix the testcases in general on 32-bit platforms Differential Revision: https://reviews.freebsd.org/D7052 Approved by: phil (maintainer) Approved by: re (gjb) Reported by: asomers Reviewed by: phil Submitted by: phil Sponsored by: EMC / Isilon Storage Division Modified: head/contrib/libxo/configure.ac head/contrib/libxo/tests/core/test_02.c Directory Properties: head/contrib/libxo/ (props changed) Modified: head/contrib/libxo/configure.ac == --- head/contrib/libxo/configure.ac Sun Jul 3 01:23:38 2016 (r302320) +++ head/contrib/libxo/configure.ac Sun Jul 3 01:35:27 2016 (r302321) @@ -12,7 +12,7 @@ # AC_PREREQ(2.2) -AC_INIT([libxo], [0.6.2], [p...@juniper.net]) +AC_INIT([libxo], [0.6.3], [p...@juniper.net]) AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability]) # Support silent build rules. Requires at least automake-1.11. Modified: head/contrib/libxo/tests/core/test_02.c == --- head/contrib/libxo/tests/core/test_02.c Sun Jul 3 01:23:38 2016 (r302320) +++ head/contrib/libxo/tests/core/test_02.c Sun Jul 3 01:35:27 2016 (r302321) @@ -70,7 +70,7 @@ main (int argc, char **argv) xo_emit(" {:lines/%7ju} {:words/%7ju} " "{:characters/%7ju} {d:filename/%s}\n", -20, 30, 40, "file"); +(uintmax_t) 20, (uintmax_t) 30, (uintmax_t) 40, "file"); int i; for (i = 0; i < 5; i++) ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302315 - vendor/Juniper/libxo/0.6.3
Author: ngie Date: Sat Jul 2 05:31:59 2016 New Revision: 302315 URL: https://svnweb.freebsd.org/changeset/base/302315 Log: Copy .../dist to .../0.6.3 Added: - copied from r302314, vendor/Juniper/libxo/dist/ Directory Properties: vendor/Juniper/libxo/0.6.3/ (props changed) ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r302314 - in vendor/Juniper/libxo/dist: . tests/core
Author: ngie Date: Sat Jul 2 05:30:27 2016 New Revision: 302314 URL: https://svnweb.freebsd.org/changeset/base/302314 Log: Update libxo to 0.6.3 Obtained from: https://github.com/Juniper/libxo/tree/0.6.3 Sponsored by: EMC / Isilon Storage Division Modified: vendor/Juniper/libxo/dist/configure.ac vendor/Juniper/libxo/dist/tests/core/test_02.c Modified: vendor/Juniper/libxo/dist/configure.ac == --- vendor/Juniper/libxo/dist/configure.ac Fri Jul 1 23:18:49 2016 (r302313) +++ vendor/Juniper/libxo/dist/configure.ac Sat Jul 2 05:30:27 2016 (r302314) @@ -12,7 +12,7 @@ # AC_PREREQ(2.2) -AC_INIT([libxo], [0.6.2], [p...@juniper.net]) +AC_INIT([libxo], [0.6.3], [p...@juniper.net]) AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability]) # Support silent build rules. Requires at least automake-1.11. Modified: vendor/Juniper/libxo/dist/tests/core/test_02.c == --- vendor/Juniper/libxo/dist/tests/core/test_02.c Fri Jul 1 23:18:49 2016(r302313) +++ vendor/Juniper/libxo/dist/tests/core/test_02.c Sat Jul 2 05:30:27 2016(r302314) @@ -70,7 +70,7 @@ main (int argc, char **argv) xo_emit(" {:lines/%7ju} {:words/%7ju} " "{:characters/%7ju} {d:filename/%s}\n", -20, 30, 40, "file"); +(uintmax_t) 20, (uintmax_t) 30, (uintmax_t) 40, "file"); int i; for (i = 0; i < 5; i++) ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r301871 - head/usr.sbin/rpc.lockd
Author: ngie Date: Mon Jun 13 11:19:06 2016 New Revision: 301871 URL: https://svnweb.freebsd.org/changeset/base/301871 Log: Add missing break in lock_partialfilelock(..) with NFS_RESERR This will help ensure that the right error is trickled up when the function is called if the lock status is NFS_RESERR Differential Revision: https://reviews.freebsd.org/D6622 Reviewed by: rmacklem Approved by: re (gjb) Tested with: fsx; svn info/svnversion (uses bdb locking); locktests from Bull http://nfsv4.bullopensource.org/tools/tests/locktest.php MFC after: 2 weeks Reported by: Coverity CID: 1008161, 1304956 Sponsored by: EMC / Isilon Storage Division Modified: head/usr.sbin/rpc.lockd/lockd_lock.c Modified: head/usr.sbin/rpc.lockd/lockd_lock.c == --- head/usr.sbin/rpc.lockd/lockd_lock.cMon Jun 13 10:53:34 2016 (r301870) +++ head/usr.sbin/rpc.lockd/lockd_lock.cMon Jun 13 11:19:06 2016 (r301871) @@ -1426,6 +1426,7 @@ lock_partialfilelock(struct file_lock *f break; case NFS_RESERR: retval = PFL_NFSRESERR; + break; default: debuglog("Unmatched lnlstatus %d\n"); retval = PFL_NFSDENIED_NOLOCK; ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r301869 - in head: share/misc usr.bin/calendar/calendars usr.sbin/sysrc
Author: ngie Date: Mon Jun 13 10:35:11 2016 New Revision: 301869 URL: https://svnweb.freebsd.org/changeset/base/301869 Log: Change my given name from "Garrett" to "Ngie" A legal name change from "Garrett" to "Ngie", as well as a FreeBSD account name change, is pending. Approved by: re (hrs) Modified: head/share/misc/committers-src.dot head/usr.bin/calendar/calendars/calendar.freebsd head/usr.sbin/sysrc/sysrc.8 Directory Properties: head/ (props changed) Modified: head/share/misc/committers-src.dot == --- head/share/misc/committers-src.dot Mon Jun 13 10:30:49 2016 (r301868) +++ head/share/misc/committers-src.dot Mon Jun 13 10:35:11 2016 (r301869) @@ -244,7 +244,7 @@ mp [label="Mark Peek\n...@freebsd.org\n20 mr [label="Michael Reifenberger\n...@freebsd.org\n2001/09/30"] neel [label="Neel Natu\nn...@freebsd.org\n2009/09/20"] netchild [label="Alexander Leidinger\nnetch...@freebsd.org\n2005/03/31"] -ngie [label="Garrett Cooper\nn...@freebsd.org\n2014/07/27"] +ngie [label="Ngie Cooper\nn...@freebsd.org\n2014/07/27"] nork [label="Norikatsu Shigemura\nn...@freebsd.org\n2009/06/09"] np [label="Navdeep Parhar\n...@freebsd.org\n2009/06/05"] nwhitehorn [label="Nathan Whitehorn\nnwhiteh...@freebsd.org\n2008/07/03"] Modified: head/usr.bin/calendar/calendars/calendar.freebsd == --- head/usr.bin/calendar/calendars/calendar.freebsdMon Jun 13 10:30:49 2016(r301868) +++ head/usr.bin/calendar/calendars/calendar.freebsdMon Jun 13 10:35:11 2016(r301869) @@ -36,7 +36,7 @@ 01/26 Andrew Gallatin <galla...@freebsd.org> born in Buffalo, New York, United States, 1970 01/27 Nick Sayer <nsa...@freebsd.org> born in San Diego, California, United States, 1968 01/27 Jacques Anthony Vidrine <nec...@freebsd.org> born in Baton Rouge, Louisiana, United States, 1971 -01/27 Garrett Cooper <n...@freebsd.org> born in Seattle, Washington, United States, 1984 +01/27 Ngie Cooper <n...@freebsd.org> born in Seattle, Washington, United States, 1984 01/31 Hidetoshi Shimokawa <simok...@freebsd.org> born in Yokohama, Kanagawa, Japan, 1970 02/01 Doug Rabson <d...@freebsd.org> born in London, England, 1966 02/01 Nicola Vitale <ni...@freebsd.org> born in Busto Arsizio, Varese, Italy, 1976 Modified: head/usr.sbin/sysrc/sysrc.8 == --- head/usr.sbin/sysrc/sysrc.8 Mon Jun 13 10:30:49 2016(r301868) +++ head/usr.sbin/sysrc/sysrc.8 Mon Jun 13 10:35:11 2016(r301869) @@ -480,6 +480,6 @@ utility first appeared in .Sh AUTHORS .An Devin Teske Aq Mt dte...@freebsd.org .Sh THANKS TO -Brandon Gooch, Garrett Cooper, Julian Elischer, Pawel Jakub Dawidek, +Brandon Gooch, Ngie Cooper, Julian Elischer, Pawel Jakub Dawidek, Cyrille Lefevre, Ross West, Stefan Esser, Marco Steinbach, Jilles Tjoelker, Allan Jude, and Lars Engels for suggestions, help, and testing. ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r301837 - stable/9/contrib/top
Author: ngie Date: Sun Jun 12 08:32:39 2016 New Revision: 301837 URL: https://svnweb.freebsd.org/changeset/base/301837 Log: MFstable/10 r301836: MFC r300395: Silence top(1) compiler warnings The contrib/top code is no longer maintained upstream (last pulled 16 years ago). The K followed by the code spews -Wimplicit-int and -Wreturn-type warnings, amongst others. This silences 131 warnings with as little modification as possible by adding necessary return types, definitions, headers, and header guards, and missing header includes. The 5 warnings that remain are due to undeclared ncurses references. I didn't include curses.h and term.h because there are several local functions and macros that conflict with those definitions. Added: stable/9/contrib/top/commands.h - copied unchanged from r301836, stable/10/contrib/top/commands.h stable/9/contrib/top/username.h - copied unchanged from r301836, stable/10/contrib/top/username.h Modified: stable/9/contrib/top/commands.c stable/9/contrib/top/display.c stable/9/contrib/top/display.h stable/9/contrib/top/machine.h stable/9/contrib/top/screen.c stable/9/contrib/top/screen.h stable/9/contrib/top/top.c stable/9/contrib/top/top.h stable/9/contrib/top/username.c stable/9/contrib/top/utils.h stable/9/contrib/top/version.c Directory Properties: stable/9/ (props changed) stable/9/contrib/ (props changed) stable/9/contrib/top/ (props changed) Modified: stable/9/contrib/top/commands.c == --- stable/9/contrib/top/commands.c Sun Jun 12 05:57:42 2016 (r301836) +++ stable/9/contrib/top/commands.c Sun Jun 12 08:32:39 2016 (r301837) @@ -19,16 +19,21 @@ */ #include "os.h" -#include -#include -#include + #include #include +#include +#include +#include +#include + +#include "commands.h" #include "sigdesc.h" /* generated automatically */ #include "top.h" #include "boolean.h" #include "utils.h" +#include "machine.h" extern int errno; @@ -39,12 +44,15 @@ extern int overstrike; int err_compar(); char *err_string(); +static int str_adderr(char *str, int len, int err); +static int str_addarg(char *str, int len, char *arg, int first); /* * show_help() - display the help screen; invoked in response to * either 'h' or '?'. */ +void show_help() { @@ -123,6 +131,7 @@ register char *str; return(*str == '\0' ? NULL : str); } +int scanint(str, intp) char *str; @@ -262,6 +271,7 @@ char *err_string() * the string "str". */ +static int str_adderr(str, len, err) char *str; @@ -289,6 +299,7 @@ int err; * is set (indicating that a comma should NOT be added to the front). */ +static int str_addarg(str, len, arg, first) char *str; @@ -321,6 +332,7 @@ int first; * for sorting errors. */ +int err_compar(p1, p2) register struct errs *p1, *p2; @@ -339,6 +351,7 @@ register struct errs *p1, *p2; * error_count() - return the number of errors currently logged. */ +int error_count() { @@ -349,6 +362,7 @@ error_count() * show_errors() - display on stdout the current log of errors. */ +void show_errors() { Copied: stable/9/contrib/top/commands.h (from r301836, stable/10/contrib/top/commands.h) == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/9/contrib/top/commands.h Sun Jun 12 08:32:39 2016 (r301837, copy of r301836, stable/10/contrib/top/commands.h) @@ -0,0 +1,21 @@ +/* + * Top users/processes display for Unix + * Version 3 + * + * This program may be freely redistributed, + * but this entire comment MUST remain intact. + * + * Copyright (c) 1984, 1989, William LeFebvre, Rice University + * Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University + * Copyright (c) 2016, Randy Westlund + * + * $FreeBSD$ + */ +#ifndef COMMANDS_H +#define COMMANDS_H + +void show_errors(void); +interror_count(void); +void show_help(void); + +#endif /* COMMANDS_H */ Modified: stable/9/contrib/top/display.c == --- stable/9/contrib/top/display.c Sun Jun 12 05:57:42 2016 (r301836) +++ stable/9/contrib/top/display.c Sun Jun 12 08:32:39 2016 (r301837) @@ -29,9 +29,12 @@ */ #include "os.h" + +#include + #include #include -#include +#include #include "screen.h"/* interface to screen package */ #include "layout.h"/* defines for screen position layout */ @@ -56,7 +59,6 @@ static int display_width = MAX_COLS; #define lineindex(l) ((l)*display_width) -char *printable(); /* things initialized by display_init and used thruout */ @@ -239,6 +241,7 @@ struct statics *statics; return(lines); } +void
svn commit: r301836 - stable/10/contrib/top
Author: ngie Date: Sun Jun 12 05:57:42 2016 New Revision: 301836 URL: https://svnweb.freebsd.org/changeset/base/301836 Log: MFC r300395: Silence top(1) compiler warnings The contrib/top code is no longer maintained upstream (last pulled 16 years ago). The K followed by the code spews -Wimplicit-int and -Wreturn-type warnings, amongst others. This silences 131 warnings with as little modification as possible by adding necessary return types, definitions, headers, and header guards, and missing header includes. The 5 warnings that remain are due to undeclared ncurses references. I didn't include curses.h and term.h because there are several local functions and macros that conflict with those definitions. Added: stable/10/contrib/top/commands.h - copied unchanged from r300395, head/contrib/top/commands.h stable/10/contrib/top/username.h - copied unchanged from r300395, head/contrib/top/username.h Modified: stable/10/contrib/top/commands.c stable/10/contrib/top/display.c stable/10/contrib/top/display.h stable/10/contrib/top/machine.h stable/10/contrib/top/screen.c stable/10/contrib/top/screen.h stable/10/contrib/top/top.c stable/10/contrib/top/top.h stable/10/contrib/top/username.c stable/10/contrib/top/utils.h stable/10/contrib/top/version.c Directory Properties: stable/10/ (props changed) Modified: stable/10/contrib/top/commands.c == --- stable/10/contrib/top/commands.cSun Jun 12 02:42:08 2016 (r301835) +++ stable/10/contrib/top/commands.cSun Jun 12 05:57:42 2016 (r301836) @@ -19,16 +19,21 @@ */ #include "os.h" -#include -#include -#include + #include #include +#include +#include +#include +#include + +#include "commands.h" #include "sigdesc.h" /* generated automatically */ #include "top.h" #include "boolean.h" #include "utils.h" +#include "machine.h" extern int errno; @@ -39,12 +44,15 @@ extern int overstrike; int err_compar(); char *err_string(); +static int str_adderr(char *str, int len, int err); +static int str_addarg(char *str, int len, char *arg, int first); /* * show_help() - display the help screen; invoked in response to * either 'h' or '?'. */ +void show_help() { @@ -123,6 +131,7 @@ register char *str; return(*str == '\0' ? NULL : str); } +int scanint(str, intp) char *str; @@ -262,6 +271,7 @@ char *err_string() * the string "str". */ +static int str_adderr(str, len, err) char *str; @@ -289,6 +299,7 @@ int err; * is set (indicating that a comma should NOT be added to the front). */ +static int str_addarg(str, len, arg, first) char *str; @@ -321,6 +332,7 @@ int first; * for sorting errors. */ +int err_compar(p1, p2) register struct errs *p1, *p2; @@ -339,6 +351,7 @@ register struct errs *p1, *p2; * error_count() - return the number of errors currently logged. */ +int error_count() { @@ -349,6 +362,7 @@ error_count() * show_errors() - display on stdout the current log of errors. */ +void show_errors() { Copied: stable/10/contrib/top/commands.h (from r300395, head/contrib/top/commands.h) == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/contrib/top/commands.hSun Jun 12 05:57:42 2016 (r301836, copy of r300395, head/contrib/top/commands.h) @@ -0,0 +1,21 @@ +/* + * Top users/processes display for Unix + * Version 3 + * + * This program may be freely redistributed, + * but this entire comment MUST remain intact. + * + * Copyright (c) 1984, 1989, William LeFebvre, Rice University + * Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University + * Copyright (c) 2016, Randy Westlund + * + * $FreeBSD$ + */ +#ifndef COMMANDS_H +#define COMMANDS_H + +void show_errors(void); +interror_count(void); +void show_help(void); + +#endif /* COMMANDS_H */ Modified: stable/10/contrib/top/display.c == --- stable/10/contrib/top/display.c Sun Jun 12 02:42:08 2016 (r301835) +++ stable/10/contrib/top/display.c Sun Jun 12 05:57:42 2016 (r301836) @@ -29,9 +29,12 @@ */ #include "os.h" + +#include + #include #include -#include +#include #include "screen.h"/* interface to screen package */ #include "layout.h"/* defines for screen position layout */ @@ -56,7 +59,6 @@ static int display_width = MAX_COLS; #define lineindex(l) ((l)*display_width) -char *printable(); /* things initialized by display_init and used thruout */ @@ -239,6 +241,7 @@ struct statics *statics; return(lines); } +void i_loadave(mpid, avenrun) int mpid; @@ -267,6 +270,7 @@ double *avenrun; lmpid = mpid; } +void u_loadave(mpid,
svn commit: r301833 - in stable/10/sys: sys vm
Author: ngie Date: Sat Jun 11 11:28:29 2016 New Revision: 301833 URL: https://svnweb.freebsd.org/changeset/base/301833 Log: Redo MFC r300220,r300223: Differential Revision: https://reviews.freebsd.org/D6803 Reviewed by: alc, kib Sponsored by: EMC / Isilon Storage Division r300220 (by cem): sys/vmmeter.h: Fix trivial '-Wsign-compare' warning in common header Frankly, it doesn't make sense for vm_pageout_wakeup_thresh to have a negative value (it is only ever set to a fraction of v_free_min, which is unsigned and also obviously non-negative). But I'm not going to try and convert every non-negative scalar in the VM to unsigned today, so just cast it for the comparison. r300223 (by cem): vm/vm_page.h: Fix trivial '-Wpointer-sign' warning pq_vcnt, as a count of real things, has no business being negative. It is only ever initialized by a u_int counter. The warning came from the atomic_add_int() in vm_pagequeue_cnt_add(). Rectify the warning by changing the variable to u_int. No functional change. Suggested by: Clang 3.3 Modified: stable/10/sys/sys/vmmeter.h stable/10/sys/vm/vm_page.c stable/10/sys/vm/vm_page.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/sys/vmmeter.h == --- stable/10/sys/sys/vmmeter.h Sat Jun 11 11:25:49 2016(r301832) +++ stable/10/sys/sys/vmmeter.h Sat Jun 11 11:28:29 2016(r301833) @@ -183,7 +183,8 @@ static __inline int vm_paging_needed(void) { -return (cnt.v_free_count + cnt.v_cache_count < vm_pageout_wakeup_thresh); +return (cnt.v_free_count + cnt.v_cache_count < +(u_int)vm_pageout_wakeup_thresh); } #endif Modified: stable/10/sys/vm/vm_page.c == --- stable/10/sys/vm/vm_page.c Sat Jun 11 11:25:49 2016(r301832) +++ stable/10/sys/vm/vm_page.c Sat Jun 11 11:28:29 2016(r301833) @@ -253,11 +253,11 @@ vm_page_domain_init(struct vm_domain *vm *__DECONST(char **, >vmd_pagequeues[PQ_INACTIVE].pq_name) = "vm inactive pagequeue"; - *__DECONST(int **, >vmd_pagequeues[PQ_INACTIVE].pq_vcnt) = + *__DECONST(u_int **, >vmd_pagequeues[PQ_INACTIVE].pq_vcnt) = _inactive_count; *__DECONST(char **, >vmd_pagequeues[PQ_ACTIVE].pq_name) = "vm active pagequeue"; - *__DECONST(int **, >vmd_pagequeues[PQ_ACTIVE].pq_vcnt) = + *__DECONST(u_int **, >vmd_pagequeues[PQ_ACTIVE].pq_vcnt) = _active_count; vmd->vmd_page_count = 0; vmd->vmd_free_count = 0; Modified: stable/10/sys/vm/vm_page.h == --- stable/10/sys/vm/vm_page.h Sat Jun 11 11:25:49 2016(r301832) +++ stable/10/sys/vm/vm_page.h Sat Jun 11 11:28:29 2016(r301833) @@ -215,7 +215,7 @@ struct vm_pagequeue { struct mtx pq_mutex; struct pglist pq_pl; int pq_cnt; - int * const pq_vcnt; + u_int * const pq_vcnt; const char * const pq_name; } __aligned(CACHE_LINE_SIZE); ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r301832 - stable/10
Author: ngie Date: Sat Jun 11 11:25:49 2016 New Revision: 301832 URL: https://svnweb.freebsd.org/changeset/base/301832 Log: Revert r301831 -- I forgot to add the diff from Phabricator Pointyhat to: ngie (never commit without svn status half asleep) Modified: Directory Properties: stable/10/ (props changed) ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r301831 - stable/10
Author: ngie Date: Sat Jun 11 11:24:30 2016 New Revision: 301831 URL: https://svnweb.freebsd.org/changeset/base/301831 Log: MFC r300220,r300223: Differential Revision: https://reviews.freebsd.org/D6803 Reviewed by: alc, kib Sponsored by: EMC / Isilon Storage Division r300220 (by cem): sys/vmmeter.h: Fix trivial '-Wsign-compare' warning in common header Frankly, it doesn't make sense for vm_pageout_wakeup_thresh to have a negative value (it is only ever set to a fraction of v_free_min, which is unsigned and also obviously non-negative). But I'm not going to try and convert every non-negative scalar in the VM to unsigned today, so just cast it for the comparison. r300223 (by cem): vm/vm_page.h: Fix trivial '-Wpointer-sign' warning pq_vcnt, as a count of real things, has no business being negative. It is only ever initialized by a u_int counter. The warning came from the atomic_add_int() in vm_pagequeue_cnt_add(). Rectify the warning by changing the variable to u_int. No functional change. Suggested by: Clang 3.3 Modified: Directory Properties: stable/10/ (props changed) ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r301821 - stable/9/lib/libc/rpc
Author: ngie Date: Sat Jun 11 01:44:27 2016 New Revision: 301821 URL: https://svnweb.freebsd.org/changeset/base/301821 Log: MFstable/10 r301820: MFC r301704: Test for strchr(3) returning NULL, not 0 Modified: stable/9/lib/libc/rpc/getnetpath.c Directory Properties: stable/9/ (props changed) stable/9/lib/ (props changed) stable/9/lib/libc/ (props changed) Modified: stable/9/lib/libc/rpc/getnetpath.c == --- stable/9/lib/libc/rpc/getnetpath.c Sat Jun 11 01:37:59 2016 (r301820) +++ stable/9/lib/libc/rpc/getnetpath.c Sat Jun 11 01:44:27 2016 (r301821) @@ -265,7 +265,7 @@ int token; /* char to parse string for *cp++ = '\0'; /* null-terminate token */ /* get rid of any backslash escapes */ ep = npp; -while ((np = strchr(ep, '\\')) != 0) { +while ((np = strchr(ep, '\\')) != NULL) { if (np[1] == '\\') np++; strcpy(np, (ep = [1])); /* XXX: overlapping string copy */ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r301820 - stable/10/lib/libc/rpc
Author: ngie Date: Sat Jun 11 01:37:59 2016 New Revision: 301820 URL: https://svnweb.freebsd.org/changeset/base/301820 Log: MFC r301704: Test for strchr(3) returning NULL, not 0 Modified: stable/10/lib/libc/rpc/getnetpath.c Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libc/rpc/getnetpath.c == --- stable/10/lib/libc/rpc/getnetpath.c Sat Jun 11 01:35:34 2016 (r301819) +++ stable/10/lib/libc/rpc/getnetpath.c Sat Jun 11 01:37:59 2016 (r301820) @@ -264,7 +264,7 @@ int token; /* char to parse string for *cp++ = '\0'; /* null-terminate token */ /* get rid of any backslash escapes */ ep = npp; -while ((np = strchr(ep, '\\')) != 0) { +while ((np = strchr(ep, '\\')) != NULL) { if (np[1] == '\\') np++; strcpy(np, (ep = [1])); /* XXX: overlapping string copy */ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r301819 - stable/9/etc/defaults
Author: ngie Date: Sat Jun 11 01:35:34 2016 New Revision: 301819 URL: https://svnweb.freebsd.org/changeset/base/301819 Log: MFstable/10 r301818: MFC r301683: Fix typo with description for $ipv6_cpe_wanif (upstram -> upstream) PR: 210146 Modified: stable/9/etc/defaults/rc.conf Directory Properties: stable/9/ (props changed) stable/9/etc/ (props changed) Modified: stable/9/etc/defaults/rc.conf == --- stable/9/etc/defaults/rc.conf Sat Jun 11 01:34:41 2016 (r301818) +++ stable/9/etc/defaults/rc.conf Sat Jun 11 01:35:34 2016 (r301819) @@ -483,7 +483,7 @@ ipv6_static_routes="" # Set to static r # route toward loopback interface. #ipv6_route_xxx="fec0:::0006:: -prefixlen 64 ::1" ipv6_gateway_enable="NO" # Set to YES if this host will be a gateway. -ipv6_cpe_wanif="NO"# Set to the upstram interface name if this +ipv6_cpe_wanif="NO"# Set to the upstream interface name if this # node will work as a router to forward IPv6 # packets not explicitly addressed to itself. ipv6_privacy="NO" # Use privacy address on RA-receiving IFs ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r301818 - stable/10/etc/defaults
Author: ngie Date: Sat Jun 11 01:34:41 2016 New Revision: 301818 URL: https://svnweb.freebsd.org/changeset/base/301818 Log: MFC r301683: Fix typo with description for $ipv6_cpe_wanif (upstram -> upstream) PR: 210146 Modified: stable/10/etc/defaults/rc.conf Directory Properties: stable/10/ (props changed) Modified: stable/10/etc/defaults/rc.conf == --- stable/10/etc/defaults/rc.conf Fri Jun 10 22:07:17 2016 (r301817) +++ stable/10/etc/defaults/rc.conf Sat Jun 11 01:34:41 2016 (r301818) @@ -485,7 +485,7 @@ ipv6_static_routes="" # Set to static r # route toward loopback interface. #ipv6_route_xxx="fec0:::0006:: -prefixlen 64 ::1" ipv6_gateway_enable="NO" # Set to YES if this host will be a gateway. -ipv6_cpe_wanif="NO"# Set to the upstram interface name if this +ipv6_cpe_wanif="NO"# Set to the upstream interface name if this # node will work as a router to forward IPv6 # packets not explicitly addressed to itself. ipv6_privacy="NO" # Use privacy address on RA-receiving IFs ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r301813 - stable/10
Author: ngie Date: Fri Jun 10 18:47:11 2016 New Revision: 301813 URL: https://svnweb.freebsd.org/changeset/base/301813 Log: Record mergeinfo for all complete commits done in the ioat(4) merge in r300661 This will make it easier for someone to determine what's missing when running `svn mergeinfo --show-revs eligible` r299353 wasn't recorded intentionally because it was only a "partial" merge Sponsored by: EMC / Isilon Storage Division Modified: Directory Properties: stable/10/ (props changed) ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"