svn commit: r285063 - in head: . contrib/tcpdump lib/libcapsicum lib/libcasper lib/libnv lib/libnv/tests libexec/casper/dns libexec/casper/grp libexec/casper/pwd libexec/casper/random libexec/caspe...
Mariusz Zaborski
oshogbo at FreeBSD.org
Thu Jul 2 21:58:20 UTC 2015
Author: oshogbo
Date: Thu Jul 2 21:58:10 2015
New Revision: 285063
URL: https://svnweb.freebsd.org/changeset/base/285063
Log:
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)
Modified:
head/ObsoleteFiles.inc
head/contrib/tcpdump/tcpdump.c
head/lib/libcapsicum/libcapsicum.c
head/lib/libcapsicum/libcapsicum_dns.c
head/lib/libcapsicum/libcapsicum_grp.c
head/lib/libcapsicum/libcapsicum_pwd.c
head/lib/libcapsicum/libcapsicum_random.c
head/lib/libcapsicum/libcapsicum_service.c
head/lib/libcapsicum/libcapsicum_sysctl.c
head/lib/libcasper/libcasper.c
head/lib/libnv/Makefile
head/lib/libnv/tests/dnv_tests.cc
head/lib/libnv/tests/nv_tests.cc
head/lib/libnv/tests/nvlist_add_test.c
head/lib/libnv/tests/nvlist_exists_test.c
head/lib/libnv/tests/nvlist_free_test.c
head/lib/libnv/tests/nvlist_get_test.c
head/lib/libnv/tests/nvlist_move_test.c
head/lib/libnv/tests/nvlist_send_recv_test.c
head/libexec/casper/dns/dns.c
head/libexec/casper/grp/grp.c
head/libexec/casper/pwd/pwd.c
head/libexec/casper/random/random.c
head/libexec/casper/sysctl/sysctl.c
head/sbin/casperd/casperd.c
head/sbin/casperd/zygote.c
head/tools/regression/capsicum/libcapsicum/sysctl.c
head/usr.bin/kdump/kdump.c
head/usr.sbin/iovctl/iovctl.c
head/usr.sbin/iovctl/parse.c
head/usr.sbin/iovctl/validate.c
Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc Thu Jul 2 21:46:07 2015 (r285062)
+++ head/ObsoleteFiles.inc Thu Jul 2 21:58:10 2015 (r285063)
@@ -38,6 +38,9 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20150702: Remove duplicated nvlist includes.
+OLD_FILES+=usr/include/dnv.h
+OLD_FILES+=usr/include/nv.h
# 20150528: PCI IOV device driver methods moved to a separate kobj interface.
OLD_FILES+=usr/share/man/man9/PCI_ADD_VF.9.gz
OLD_FILES+=usr/share/man/man9/PCI_INIT_IOV.9.gz
Modified: head/contrib/tcpdump/tcpdump.c
==============================================================================
--- head/contrib/tcpdump/tcpdump.c Thu Jul 2 21:46:07 2015 (r285062)
+++ head/contrib/tcpdump/tcpdump.c Thu Jul 2 21:58:10 2015 (r285063)
@@ -82,7 +82,7 @@ extern int SIZE_BUF;
#include <libcapsicum.h>
#include <libcapsicum_dns.h>
#include <libcapsicum_service.h>
-#include <nv.h>
+#include <sys/nv.h>
#include <sys/capability.h>
#include <sys/ioccom.h>
#include <net/bpf.h>
Modified: head/lib/libcapsicum/libcapsicum.c
==============================================================================
--- head/lib/libcapsicum/libcapsicum.c Thu Jul 2 21:46:07 2015 (r285062)
+++ head/lib/libcapsicum/libcapsicum.c Thu Jul 2 21:58:10 2015 (r285063)
@@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$");
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>
+#include <sys/nv.h>
#include <assert.h>
#include <errno.h>
@@ -44,7 +45,6 @@ __FBSDID("$FreeBSD$");
#include "libcapsicum.h"
#include "libcapsicum_impl.h"
-#include "nv.h"
/*
* Structure describing communication channel between two separated processes.
Modified: head/lib/libcapsicum/libcapsicum_dns.c
==============================================================================
--- head/lib/libcapsicum/libcapsicum_dns.c Thu Jul 2 21:46:07 2015 (r285062)
+++ head/lib/libcapsicum/libcapsicum_dns.c Thu Jul 2 21:58:10 2015 (r285063)
@@ -30,14 +30,14 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include <sys/nv.h>
+
#include <assert.h>
#include <netdb.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <nv.h>
-
#include "libcapsicum.h"
#include "libcapsicum_dns.h"
Modified: head/lib/libcapsicum/libcapsicum_grp.c
==============================================================================
--- head/lib/libcapsicum/libcapsicum_grp.c Thu Jul 2 21:46:07 2015 (r285062)
+++ head/lib/libcapsicum/libcapsicum_grp.c Thu Jul 2 21:58:10 2015 (r285063)
@@ -30,6 +30,8 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include <sys/dnv.h>
+#include <sys/nv.h>
#include <sys/param.h>
#include <assert.h>
@@ -39,9 +41,6 @@ __FBSDID("$FreeBSD$");
#include <string.h>
#include <unistd.h>
-#include <dnv.h>
-#include <nv.h>
-
#include "libcapsicum.h"
#include "libcapsicum_grp.h"
Modified: head/lib/libcapsicum/libcapsicum_pwd.c
==============================================================================
--- head/lib/libcapsicum/libcapsicum_pwd.c Thu Jul 2 21:46:07 2015 (r285062)
+++ head/lib/libcapsicum/libcapsicum_pwd.c Thu Jul 2 21:58:10 2015 (r285063)
@@ -31,6 +31,7 @@
__FBSDID("$FreeBSD$");
#include <sys/types.h>
+#include <sys/nv.h>
#include <assert.h>
#include <errno.h>
@@ -39,8 +40,6 @@ __FBSDID("$FreeBSD$");
#include <string.h>
#include <unistd.h>
-#include <nv.h>
-
#include "libcapsicum.h"
#include "libcapsicum_pwd.h"
Modified: head/lib/libcapsicum/libcapsicum_random.c
==============================================================================
--- head/lib/libcapsicum/libcapsicum_random.c Thu Jul 2 21:46:07 2015 (r285062)
+++ head/lib/libcapsicum/libcapsicum_random.c Thu Jul 2 21:58:10 2015 (r285063)
@@ -30,12 +30,12 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include <sys/nv.h>
+
#include <assert.h>
#include <errno.h>
#include <string.h>
-#include <nv.h>
-
#include "libcapsicum.h"
#include "libcapsicum_random.h"
Modified: head/lib/libcapsicum/libcapsicum_service.c
==============================================================================
--- head/lib/libcapsicum/libcapsicum_service.c Thu Jul 2 21:46:07 2015 (r285062)
+++ head/lib/libcapsicum/libcapsicum_service.c Thu Jul 2 21:58:10 2015 (r285063)
@@ -30,12 +30,13 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include <sys/nv.h>
+
#include <assert.h>
#include <errno.h>
#include <string.h>
#include <unistd.h>
-#include <nv.h>
#include "msgio.h"
#include "libcapsicum.h"
Modified: head/lib/libcapsicum/libcapsicum_sysctl.c
==============================================================================
--- head/lib/libcapsicum/libcapsicum_sysctl.c Thu Jul 2 21:46:07 2015 (r285062)
+++ head/lib/libcapsicum/libcapsicum_sysctl.c Thu Jul 2 21:58:10 2015 (r285063)
@@ -30,11 +30,11 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include <sys/nv.h>
+
#include <errno.h>
#include <string.h>
-#include <nv.h>
-
#include "libcapsicum.h"
#include "libcapsicum_sysctl.h"
Modified: head/lib/libcasper/libcasper.c
==============================================================================
--- head/lib/libcasper/libcasper.c Thu Jul 2 21:46:07 2015 (r285062)
+++ head/lib/libcasper/libcasper.c Thu Jul 2 21:58:10 2015 (r285063)
@@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$");
#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/un.h>
+#include <sys/nv.h>
#include <assert.h>
#include <dirent.h>
@@ -52,7 +53,6 @@ __FBSDID("$FreeBSD$");
#include <libcapsicum.h>
#include <libcasper.h>
#include <libcasper_impl.h>
-#include <nv.h>
#include <pjdlog.h>
/*
Modified: head/lib/libnv/Makefile
==============================================================================
--- head/lib/libnv/Makefile Thu Jul 2 21:46:07 2015 (r285062)
+++ head/lib/libnv/Makefile Thu Jul 2 21:58:10 2015 (r285063)
@@ -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 \
Modified: head/lib/libnv/tests/dnv_tests.cc
==============================================================================
--- head/lib/libnv/tests/dnv_tests.cc Thu Jul 2 21:46:07 2015 (r285062)
+++ head/lib/libnv/tests/dnv_tests.cc Thu Jul 2 21:58:10 2015 (r285063)
@@ -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: head/lib/libnv/tests/nv_tests.cc
==============================================================================
--- head/lib/libnv/tests/nv_tests.cc Thu Jul 2 21:46:07 2015 (r285062)
+++ head/lib/libnv/tests/nv_tests.cc Thu Jul 2 21:58:10 2015 (r285063)
@@ -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: head/lib/libnv/tests/nvlist_add_test.c
==============================================================================
--- head/lib/libnv/tests/nvlist_add_test.c Thu Jul 2 21:46:07 2015 (r285062)
+++ head/lib/libnv/tests/nvlist_add_test.c Thu Jul 2 21:58:10 2015 (r285063)
@@ -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: head/lib/libnv/tests/nvlist_exists_test.c
==============================================================================
--- head/lib/libnv/tests/nvlist_exists_test.c Thu Jul 2 21:46:07 2015 (r285062)
+++ head/lib/libnv/tests/nvlist_exists_test.c Thu Jul 2 21:58:10 2015 (r285063)
@@ -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: head/lib/libnv/tests/nvlist_free_test.c
==============================================================================
--- head/lib/libnv/tests/nvlist_free_test.c Thu Jul 2 21:46:07 2015 (r285062)
+++ head/lib/libnv/tests/nvlist_free_test.c Thu Jul 2 21:58:10 2015 (r285063)
@@ -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: head/lib/libnv/tests/nvlist_get_test.c
==============================================================================
--- head/lib/libnv/tests/nvlist_get_test.c Thu Jul 2 21:46:07 2015 (r285062)
+++ head/lib/libnv/tests/nvlist_get_test.c Thu Jul 2 21:58:10 2015 (r285063)
@@ -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: head/lib/libnv/tests/nvlist_move_test.c
==============================================================================
--- head/lib/libnv/tests/nvlist_move_test.c Thu Jul 2 21:46:07 2015 (r285062)
+++ head/lib/libnv/tests/nvlist_move_test.c Thu Jul 2 21:58:10 2015 (r285063)
@@ -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: head/lib/libnv/tests/nvlist_send_recv_test.c
==============================================================================
--- head/lib/libnv/tests/nvlist_send_recv_test.c Thu Jul 2 21:46:07 2015 (r285062)
+++ head/lib/libnv/tests/nvlist_send_recv_test.c Thu Jul 2 21:58:10 2015 (r285063)
@@ -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: head/libexec/casper/dns/dns.c
==============================================================================
--- head/libexec/casper/dns/dns.c Thu Jul 2 21:46:07 2015 (r285062)
+++ head/libexec/casper/dns/dns.c Thu Jul 2 21:58:10 2015 (r285063)
@@ -30,6 +30,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include <sys/nv.h>
#include <netinet/in.h>
#include <assert.h>
@@ -41,7 +42,6 @@ __FBSDID("$FreeBSD$");
#include <libcapsicum.h>
#include <libcapsicum_dns.h>
#include <libcasper.h>
-#include <nv.h>
#include <pjdlog.h>
static bool
Modified: head/libexec/casper/grp/grp.c
==============================================================================
--- head/libexec/casper/grp/grp.c Thu Jul 2 21:46:07 2015 (r285062)
+++ head/libexec/casper/grp/grp.c Thu Jul 2 21:58:10 2015 (r285063)
@@ -30,6 +30,8 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include <sys/nv.h>
+
#include <assert.h>
#include <errno.h>
#include <grp.h>
@@ -38,7 +40,6 @@ __FBSDID("$FreeBSD$");
#include <libcapsicum.h>
#include <libcasper.h>
-#include <nv.h>
#include <pjdlog.h>
static bool
Modified: head/libexec/casper/pwd/pwd.c
==============================================================================
--- head/libexec/casper/pwd/pwd.c Thu Jul 2 21:46:07 2015 (r285062)
+++ head/libexec/casper/pwd/pwd.c Thu Jul 2 21:58:10 2015 (r285063)
@@ -30,6 +30,8 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include <sys/nv.h>
+
#include <errno.h>
#include <pwd.h>
#include <stdlib.h>
@@ -37,7 +39,6 @@ __FBSDID("$FreeBSD$");
#include <libcapsicum.h>
#include <libcasper.h>
-#include <nv.h>
#include <pjdlog.h>
static bool
Modified: head/libexec/casper/random/random.c
==============================================================================
--- head/libexec/casper/random/random.c Thu Jul 2 21:46:07 2015 (r285062)
+++ head/libexec/casper/random/random.c Thu Jul 2 21:58:10 2015 (r285063)
@@ -30,13 +30,14 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
+#include <sys/nv.h>
+
#include <errno.h>
#include <stdlib.h>
#include <string.h>
#include <libcapsicum.h>
#include <libcasper.h>
-#include <nv.h>
#include <pjdlog.h>
#define MAXSIZE (1024 * 1024)
Modified: head/libexec/casper/sysctl/sysctl.c
==============================================================================
--- head/libexec/casper/sysctl/sysctl.c Thu Jul 2 21:46:07 2015 (r285062)
+++ head/libexec/casper/sysctl/sysctl.c Thu Jul 2 21:58:10 2015 (r285063)
@@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$");
#include <sys/types.h>
#include <sys/sysctl.h>
+#include <sys/nv.h>
#include <errno.h>
#include <stdlib.h>
@@ -40,7 +41,6 @@ __FBSDID("$FreeBSD$");
#include <libcapsicum.h>
#include <libcapsicum_sysctl.h>
#include <libcasper.h>
-#include <nv.h>
#include <pjdlog.h>
static int
Modified: head/sbin/casperd/casperd.c
==============================================================================
--- head/sbin/casperd/casperd.c Thu Jul 2 21:46:07 2015 (r285062)
+++ head/sbin/casperd/casperd.c Thu Jul 2 21:58:10 2015 (r285063)
@@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$");
#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/un.h>
+#include <sys/nv.h>
#include <assert.h>
#include <dirent.h>
@@ -56,7 +57,6 @@ __FBSDID("$FreeBSD$");
#include <libcasper.h>
#include <libcasper_impl.h>
#include <msgio.h>
-#include <nv.h>
#include <pjdlog.h>
#include "msgio.h"
Modified: head/sbin/casperd/zygote.c
==============================================================================
--- head/sbin/casperd/zygote.c Thu Jul 2 21:46:07 2015 (r285062)
+++ head/sbin/casperd/zygote.c Thu Jul 2 21:58:10 2015 (r285063)
@@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$");
#include <sys/capsicum.h>
#include <sys/procdesc.h>
#include <sys/socket.h>
+#include <sys/nv.h>
#include <assert.h>
#include <err.h>
@@ -46,7 +47,6 @@ __FBSDID("$FreeBSD$");
#include <libcapsicum.h>
#include <libcapsicum_impl.h>
-#include <nv.h>
#include <pjdlog.h>
#include "zygote.h"
Modified: head/tools/regression/capsicum/libcapsicum/sysctl.c
==============================================================================
--- head/tools/regression/capsicum/libcapsicum/sysctl.c Thu Jul 2 21:46:07 2015 (r285062)
+++ head/tools/regression/capsicum/libcapsicum/sysctl.c Thu Jul 2 21:58:10 2015 (r285063)
@@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$");
#include <sys/types.h>
#include <sys/capsicum.h>
#include <sys/sysctl.h>
+#include <sys/nv.h>
#include <assert.h>
#include <err.h>
@@ -46,7 +47,6 @@ __FBSDID("$FreeBSD$");
#include <libcapsicum.h>
#include <libcapsicum_service.h>
#include <libcapsicum_sysctl.h>
-#include <nv.h>
/*
* We need some sysctls to perform the tests on.
Modified: head/usr.bin/kdump/kdump.c
==============================================================================
--- head/usr.bin/kdump/kdump.c Thu Jul 2 21:46:07 2015 (r285062)
+++ head/usr.bin/kdump/kdump.c Thu Jul 2 21:58:10 2015 (r285063)
@@ -61,6 +61,9 @@ extern int errno;
#include <sys/un.h>
#include <sys/queue.h>
#include <sys/wait.h>
+#ifdef HAVE_LIBCAPSICUM
+#include <sys/nv.h>
+#endif
#include <arpa/inet.h>
#include <netinet/in.h>
#include <ctype.h>
@@ -77,9 +80,6 @@ extern int errno;
#include <locale.h>
#include <netdb.h>
#include <nl_types.h>
-#ifdef HAVE_LIBCAPSICUM
-#include <nv.h>
-#endif
#include <pwd.h>
#include <stdio.h>
#include <stdlib.h>
Modified: head/usr.sbin/iovctl/iovctl.c
==============================================================================
--- head/usr.sbin/iovctl/iovctl.c Thu Jul 2 21:46:07 2015 (r285062)
+++ head/usr.sbin/iovctl/iovctl.c Thu Jul 2 21:58:10 2015 (r285063)
@@ -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: head/usr.sbin/iovctl/parse.c
==============================================================================
--- head/usr.sbin/iovctl/parse.c Thu Jul 2 21:46:07 2015 (r285062)
+++ head/usr.sbin/iovctl/parse.c Thu Jul 2 21:58:10 2015 (r285063)
@@ -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: head/usr.sbin/iovctl/validate.c
==============================================================================
--- head/usr.sbin/iovctl/validate.c Thu Jul 2 21:46:07 2015 (r285062)
+++ head/usr.sbin/iovctl/validate.c Thu Jul 2 21:58:10 2015 (r285063)
@@ -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-head
mailing list