From owner-svn-src-user@freebsd.org Sun Jan 3 08:09:16 2016 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 01F75A5FFEA for ; Sun, 3 Jan 2016 08:09:16 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B7ABD1C5F; Sun, 3 Jan 2016 08:09:15 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0389E26007758; Sun, 3 Jan 2016 08:09:14 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0389DlD007745; Sun, 3 Jan 2016 08:09:13 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201601030809.u0389DlD007745@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 3 Jan 2016 08:09:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r293087 - in user/ngie/stable-10-libnv: . lib/libnv lib/libnv/tests usr.sbin/iovctl X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jan 2016 08:09:16 -0000 Author: ngie Date: Sun Jan 3 08:09:13 2016 New Revision: 293087 URL: https://svnweb.freebsd.org/changeset/base/293087 Log: MFC r285063: r285063 (by oshogbo): Let the nv.h and dnv.h includes be only in sys directory. Change consumers to include those files from sys. Add duplicated files to ObsoleteFiles. Modified: user/ngie/stable-10-libnv/ObsoleteFiles.inc user/ngie/stable-10-libnv/lib/libnv/Makefile user/ngie/stable-10-libnv/lib/libnv/tests/dnv_tests.cc user/ngie/stable-10-libnv/lib/libnv/tests/nv_tests.cc user/ngie/stable-10-libnv/lib/libnv/tests/nvlist_add_test.c user/ngie/stable-10-libnv/lib/libnv/tests/nvlist_exists_test.c user/ngie/stable-10-libnv/lib/libnv/tests/nvlist_free_test.c user/ngie/stable-10-libnv/lib/libnv/tests/nvlist_get_test.c user/ngie/stable-10-libnv/lib/libnv/tests/nvlist_move_test.c user/ngie/stable-10-libnv/lib/libnv/tests/nvlist_send_recv_test.c user/ngie/stable-10-libnv/usr.sbin/iovctl/iovctl.c user/ngie/stable-10-libnv/usr.sbin/iovctl/parse.c user/ngie/stable-10-libnv/usr.sbin/iovctl/validate.c Directory Properties: user/ngie/stable-10-libnv/ (props changed) Modified: user/ngie/stable-10-libnv/ObsoleteFiles.inc ============================================================================== --- user/ngie/stable-10-libnv/ObsoleteFiles.inc Sun Jan 3 07:56:04 2016 (r293086) +++ user/ngie/stable-10-libnv/ObsoleteFiles.inc Sun Jan 3 08:09:13 2016 (r293087) @@ -78,6 +78,9 @@ OLD_FILES+=usr/share/man/man9/MEXT_REM_R OLD_FILES+=usr/share/man/man9/MFREE.9.gz # 20151023: unused sgsmsg utility is removed OLD_FILES+=usr/bin/sgsmsg +# 20150702: Remove duplicated nvlist includes. +OLD_FILES+=usr/include/dnv.h +OLD_FILES+=usr/include/nv.h # 20150506 OLD_FILES+=usr/share/man/man9/NDHASGIANT.9.gz # 20141223: remove in6_gif.h and in_gif.h Modified: user/ngie/stable-10-libnv/lib/libnv/Makefile ============================================================================== --- user/ngie/stable-10-libnv/lib/libnv/Makefile Sun Jan 3 07:56:04 2016 (r293086) +++ user/ngie/stable-10-libnv/lib/libnv/Makefile Sun Jan 3 08:09:13 2016 (r293087) @@ -15,9 +15,6 @@ SRCS+= msgio.c SRCS+= nvlist.c SRCS+= nvpair.c -INCS= dnv.h -INCS+= nv.h - MAN+= nv.3 MLINKS+=nv.3 libnv.3 \ Modified: user/ngie/stable-10-libnv/lib/libnv/tests/dnv_tests.cc ============================================================================== --- user/ngie/stable-10-libnv/lib/libnv/tests/dnv_tests.cc Sun Jan 3 07:56:04 2016 (r293086) +++ user/ngie/stable-10-libnv/lib/libnv/tests/dnv_tests.cc Sun Jan 3 08:09:13 2016 (r293087) @@ -27,9 +27,10 @@ #include __FBSDID("$FreeBSD$"); +#include +#include + #include -#include -#include ATF_TEST_CASE_WITHOUT_HEAD(dnvlist_get_bool__present); ATF_TEST_CASE_BODY(dnvlist_get_bool__present) Modified: user/ngie/stable-10-libnv/lib/libnv/tests/nv_tests.cc ============================================================================== --- user/ngie/stable-10-libnv/lib/libnv/tests/nv_tests.cc Sun Jan 3 07:56:04 2016 (r293086) +++ user/ngie/stable-10-libnv/lib/libnv/tests/nv_tests.cc Sun Jan 3 08:09:13 2016 (r293087) @@ -27,8 +27,9 @@ #include __FBSDID("$FreeBSD$"); +#include + #include -#include #include #include Modified: user/ngie/stable-10-libnv/lib/libnv/tests/nvlist_add_test.c ============================================================================== --- user/ngie/stable-10-libnv/lib/libnv/tests/nvlist_add_test.c Sun Jan 3 07:56:04 2016 (r293086) +++ user/ngie/stable-10-libnv/lib/libnv/tests/nvlist_add_test.c Sun Jan 3 08:09:13 2016 (r293087) @@ -29,12 +29,12 @@ * $FreeBSD$ */ +#include + #include #include #include -#include - static int ntest = 1; #define CHECK(expr) do { \ Modified: user/ngie/stable-10-libnv/lib/libnv/tests/nvlist_exists_test.c ============================================================================== --- user/ngie/stable-10-libnv/lib/libnv/tests/nvlist_exists_test.c Sun Jan 3 07:56:04 2016 (r293086) +++ user/ngie/stable-10-libnv/lib/libnv/tests/nvlist_exists_test.c Sun Jan 3 08:09:13 2016 (r293087) @@ -29,11 +29,11 @@ * $FreeBSD$ */ +#include + #include #include -#include - static int ntest = 1; #define CHECK(expr) do { \ Modified: user/ngie/stable-10-libnv/lib/libnv/tests/nvlist_free_test.c ============================================================================== --- user/ngie/stable-10-libnv/lib/libnv/tests/nvlist_free_test.c Sun Jan 3 07:56:04 2016 (r293086) +++ user/ngie/stable-10-libnv/lib/libnv/tests/nvlist_free_test.c Sun Jan 3 08:09:13 2016 (r293087) @@ -29,11 +29,11 @@ * $FreeBSD$ */ +#include + #include #include -#include - static int ntest = 1; #define CHECK(expr) do { \ Modified: user/ngie/stable-10-libnv/lib/libnv/tests/nvlist_get_test.c ============================================================================== --- user/ngie/stable-10-libnv/lib/libnv/tests/nvlist_get_test.c Sun Jan 3 07:56:04 2016 (r293086) +++ user/ngie/stable-10-libnv/lib/libnv/tests/nvlist_get_test.c Sun Jan 3 08:09:13 2016 (r293087) @@ -28,6 +28,7 @@ * * $FreeBSD$ */ +#include #include #include @@ -35,8 +36,6 @@ #include #include -#include - static int ntest = 1; #define CHECK(expr) do { \ Modified: user/ngie/stable-10-libnv/lib/libnv/tests/nvlist_move_test.c ============================================================================== --- user/ngie/stable-10-libnv/lib/libnv/tests/nvlist_move_test.c Sun Jan 3 07:56:04 2016 (r293086) +++ user/ngie/stable-10-libnv/lib/libnv/tests/nvlist_move_test.c Sun Jan 3 08:09:13 2016 (r293087) @@ -29,14 +29,14 @@ * $FreeBSD$ */ +#include + #include #include #include #include #include -#include - static int ntest = 1; #define CHECK(expr) do { \ Modified: user/ngie/stable-10-libnv/lib/libnv/tests/nvlist_send_recv_test.c ============================================================================== --- user/ngie/stable-10-libnv/lib/libnv/tests/nvlist_send_recv_test.c Sun Jan 3 07:56:04 2016 (r293086) +++ user/ngie/stable-10-libnv/lib/libnv/tests/nvlist_send_recv_test.c Sun Jan 3 08:09:13 2016 (r293087) @@ -32,6 +32,7 @@ #include #include #include +#include #include #include @@ -40,8 +41,6 @@ #include #include -#include - static int ntest = 1; #define CHECK(expr) do { \ Modified: user/ngie/stable-10-libnv/usr.sbin/iovctl/iovctl.c ============================================================================== --- user/ngie/stable-10-libnv/usr.sbin/iovctl/iovctl.c Sun Jan 3 07:56:04 2016 (r293086) +++ user/ngie/stable-10-libnv/usr.sbin/iovctl/iovctl.c Sun Jan 3 08:09:13 2016 (r293087) @@ -29,12 +29,12 @@ __FBSDID("$FreeBSD$"); #include #include +#include +#include -#include #include #include #include -#include #include #include #include Modified: user/ngie/stable-10-libnv/usr.sbin/iovctl/parse.c ============================================================================== --- user/ngie/stable-10-libnv/usr.sbin/iovctl/parse.c Sun Jan 3 07:56:04 2016 (r293086) +++ user/ngie/stable-10-libnv/usr.sbin/iovctl/parse.c Sun Jan 3 08:09:13 2016 (r293087) @@ -29,12 +29,12 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include #include -#include #include #include #include Modified: user/ngie/stable-10-libnv/usr.sbin/iovctl/validate.c ============================================================================== --- user/ngie/stable-10-libnv/usr.sbin/iovctl/validate.c Sun Jan 3 07:56:04 2016 (r293086) +++ user/ngie/stable-10-libnv/usr.sbin/iovctl/validate.c Sun Jan 3 08:09:13 2016 (r293087) @@ -29,10 +29,10 @@ __FBSDID("$FreeBSD$"); #include #include +#include +#include -#include #include -#include #include #include