Index: head/lib/libc/sys/clock_nanosleep.c
===================================================================
--- head/lib/libc/sys/clock_nanosleep.c	(revision 333429)
+++ head/lib/libc/sys/clock_nanosleep.c	(revision 333430)
@@ -1,53 +1,52 @@
 /*
  * Copyright (c) 2017 Eric van Gyzen
  * Copyright (c) 2014 The FreeBSD Foundation.
- * All rights reserved.
  *
  * Portions of this software were developed by Konstantin Belousov
  * under sponsorship from the FreeBSD Foundation.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice(s), this list of conditions and the following disclaimer as
  *    the first lines of this file unmodified other than the possible
  *    addition of one or more copyright notices.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice(s), this list of conditions and the following disclaimer in
  *    the documentation and/or other materials provided with the
  *    distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) BE
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
  * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <time.h>
 #include "libc_private.h"
 
 __weak_reference(__sys_clock_nanosleep, __clock_nanosleep);
 
 #pragma weak clock_nanosleep
 int
 clock_nanosleep(clockid_t clock_id, int flags, const struct timespec *rqtp,
     struct timespec *rmtp)
 {
 
 	return (((int (*)(clockid_t, int, const struct timespec *,
 	    struct timespec *))
 	    __libc_interposing[INTERPOS_clock_nanosleep])(clock_id, flags,
 	    rqtp, rmtp));
 }
Index: head/lib/libc/tests/iconv/iconvctl_test.c
===================================================================
--- head/lib/libc/tests/iconv/iconvctl_test.c	(revision 333429)
+++ head/lib/libc/tests/iconv/iconvctl_test.c	(revision 333430)
@@ -1,69 +1,68 @@
 /*-
  * Copyright (c) 2016 Eric van Gyzen
- * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <iconv.h>
 
 #include <atf-c.h>
 
 void
 test_trivialp(const char *src, const char *dst, int expected)
 {
 	iconv_t ic;
 	int actual, status;
 
 	ic = iconv_open(dst, src);
 	ATF_REQUIRE(ic != (iconv_t)-1);
 
 	status = iconvctl(ic, ICONV_TRIVIALP, &actual);
 	ATF_REQUIRE(status == 0);
 
 	ATF_REQUIRE(actual == expected);
 
 	status = iconv_close(ic);
 	ATF_REQUIRE(status == 0);
 }
 
 ATF_TC_WITHOUT_HEAD(iconvctl_trivialp_test);
 ATF_TC_BODY(iconvctl_trivialp_test, tc)
 {
 
 	test_trivialp("ISO-8859-1",  "ISO-8859-1",  1);
 	test_trivialp("ISO-8859-1",  "ISO-8859-15", 0);
 	test_trivialp("ISO-8859-15", "ISO-8859-1",  0);
 	test_trivialp("ISO-8859-15", "UTF-8",       0);
 	test_trivialp("UTF-8",       "ASCII",       0);
 }
 
 ATF_TP_ADD_TCS(tp)
 {
 
 	ATF_TP_ADD_TC(tp, iconvctl_trivialp_test);
 
 	return (atf_no_error());
 }