svn commit: r293087 - in user/ngie/stable-10-libnv: . lib/libnv lib/libnv/tests usr.sbin/iovctl
Garrett Cooper
ngie at FreeBSD.org
Sun Jan 3 08:09:16 UTC 2016
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 <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include <sys/dnv.h>
+#include <sys/nv.h>
+
#include <atf-c++.hpp>
-#include <dnv.h>
-#include <nv.h>
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 <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include <sys/nv.h>
+
#include <atf-c++.hpp>
-#include <nv.h>
#include <errno.h>
#include <limits>
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 <sys/nv.h>
+
#include <errno.h>
#include <stdio.h>
#include <unistd.h>
-#include <nv.h>
-
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 <sys/nv.h>
+
#include <stdio.h>
#include <unistd.h>
-#include <nv.h>
-
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 <sys/nv.h>
+
#include <stdio.h>
#include <unistd.h>
-#include <nv.h>
-
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 <sys/nv.h>
#include <errno.h>
#include <fcntl.h>
@@ -35,8 +36,6 @@
#include <string.h>
#include <unistd.h>
-#include <nv.h>
-
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 <sys/nv.h>
+
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <nv.h>
-
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 <sys/types.h>
#include <sys/socket.h>
#include <sys/wait.h>
+#include <sys/nv.h>
#include <err.h>
#include <errno.h>
@@ -40,8 +41,6 @@
#include <string.h>
#include <unistd.h>
-#include <nv.h>
-
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 <sys/param.h>
#include <sys/iov.h>
+#include <sys/dnv.h>
+#include <sys/nv.h>
-#include <dnv.h>
#include <err.h>
#include <errno.h>
#include <fcntl.h>
-#include <nv.h>
#include <regex.h>
#include <stdio.h>
#include <stdlib.h>
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 <sys/param.h>
#include <sys/iov.h>
+#include <sys/nv.h>
#include <net/ethernet.h>
#include <err.h>
#include <errno.h>
#include <fcntl.h>
-#include <nv.h>
#include <regex.h>
#include <stdint.h>
#include <stdio.h>
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 <sys/param.h>
#include <sys/iov.h>
+#include <sys/dnv.h>
+#include <sys/nv.h>
-#include <dnv.h>
#include <err.h>
-#include <nv.h>
#include <regex.h>
#include <stdlib.h>
More information about the svn-src-user
mailing list