summaryrefslogtreecommitdiffstats
path: root/lib/libnv
diff options
context:
space:
mode:
authoroshogbo <oshogbo@FreeBSD.org>2015-07-02 21:58:10 +0000
committeroshogbo <oshogbo@FreeBSD.org>2015-07-02 21:58:10 +0000
commit55d95276339dc90b68f6b9108bbaeeca1fff715e (patch)
tree80ab9f9e7fd1444c52e233037e177dfa3b7a1eff /lib/libnv
parent029d310933bead17f87eca6486a236878b2b6dc4 (diff)
downloadFreeBSD-src-55d95276339dc90b68f6b9108bbaeeca1fff715e.zip
FreeBSD-src-55d95276339dc90b68f6b9108bbaeeca1fff715e.tar.gz
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. Approved by: pjd (mentor)
Diffstat (limited to 'lib/libnv')
-rw-r--r--lib/libnv/Makefile3
-rw-r--r--lib/libnv/tests/dnv_tests.cc5
-rw-r--r--lib/libnv/tests/nv_tests.cc3
-rw-r--r--lib/libnv/tests/nvlist_add_test.c4
-rw-r--r--lib/libnv/tests/nvlist_exists_test.c4
-rw-r--r--lib/libnv/tests/nvlist_free_test.c4
-rw-r--r--lib/libnv/tests/nvlist_get_test.c3
-rw-r--r--lib/libnv/tests/nvlist_move_test.c4
-rw-r--r--lib/libnv/tests/nvlist_send_recv_test.c3
9 files changed, 15 insertions, 18 deletions
diff --git a/lib/libnv/Makefile b/lib/libnv/Makefile
index 8b2fc78..93ccc7a 100644
--- a/lib/libnv/Makefile
+++ b/lib/libnv/Makefile
@@ -15,9 +15,6 @@ SRCS+= msgio.c
SRCS+= subr_nvlist.c
SRCS+= subr_nvpair.c
-INCS= dnv.h
-INCS+= nv.h
-
MAN+= nv.3
MLINKS+=nv.3 libnv.3 \
diff --git a/lib/libnv/tests/dnv_tests.cc b/lib/libnv/tests/dnv_tests.cc
index 2f92d9d..fe80d00 100644
--- a/lib/libnv/tests/dnv_tests.cc
+++ b/lib/libnv/tests/dnv_tests.cc
@@ -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)
diff --git a/lib/libnv/tests/nv_tests.cc b/lib/libnv/tests/nv_tests.cc
index d779190..1c65b66 100644
--- a/lib/libnv/tests/nv_tests.cc
+++ b/lib/libnv/tests/nv_tests.cc
@@ -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>
diff --git a/lib/libnv/tests/nvlist_add_test.c b/lib/libnv/tests/nvlist_add_test.c
index 06bcc63..04486f3 100644
--- a/lib/libnv/tests/nvlist_add_test.c
+++ b/lib/libnv/tests/nvlist_add_test.c
@@ -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 { \
diff --git a/lib/libnv/tests/nvlist_exists_test.c b/lib/libnv/tests/nvlist_exists_test.c
index cb595d7..b4596fb6 100644
--- a/lib/libnv/tests/nvlist_exists_test.c
+++ b/lib/libnv/tests/nvlist_exists_test.c
@@ -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 { \
diff --git a/lib/libnv/tests/nvlist_free_test.c b/lib/libnv/tests/nvlist_free_test.c
index 4417a44..74ab785 100644
--- a/lib/libnv/tests/nvlist_free_test.c
+++ b/lib/libnv/tests/nvlist_free_test.c
@@ -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 { \
diff --git a/lib/libnv/tests/nvlist_get_test.c b/lib/libnv/tests/nvlist_get_test.c
index b4468db..f67da90 100644
--- a/lib/libnv/tests/nvlist_get_test.c
+++ b/lib/libnv/tests/nvlist_get_test.c
@@ -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 { \
diff --git a/lib/libnv/tests/nvlist_move_test.c b/lib/libnv/tests/nvlist_move_test.c
index 760399d..7499faa 100644
--- a/lib/libnv/tests/nvlist_move_test.c
+++ b/lib/libnv/tests/nvlist_move_test.c
@@ -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 { \
diff --git a/lib/libnv/tests/nvlist_send_recv_test.c b/lib/libnv/tests/nvlist_send_recv_test.c
index 50222fb..f4bc1c4 100644
--- a/lib/libnv/tests/nvlist_send_recv_test.c
+++ b/lib/libnv/tests/nvlist_send_recv_test.c
@@ -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 { \
OpenPOWER on IntegriCloud