diff options
31 files changed, 51 insertions, 49 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 3e0c899..9cddbce 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -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 diff --git a/contrib/tcpdump/tcpdump.c b/contrib/tcpdump/tcpdump.c index c8ca0bf..aca877c 100644 --- a/contrib/tcpdump/tcpdump.c +++ b/contrib/tcpdump/tcpdump.c @@ -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> diff --git a/lib/libcapsicum/libcapsicum.c b/lib/libcapsicum/libcapsicum.c index 79c570f..8c4d04d 100644 --- a/lib/libcapsicum/libcapsicum.c +++ b/lib/libcapsicum/libcapsicum.c @@ -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. diff --git a/lib/libcapsicum/libcapsicum_dns.c b/lib/libcapsicum/libcapsicum_dns.c index a180b6b..5f54283 100644 --- a/lib/libcapsicum/libcapsicum_dns.c +++ b/lib/libcapsicum/libcapsicum_dns.c @@ -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" diff --git a/lib/libcapsicum/libcapsicum_grp.c b/lib/libcapsicum/libcapsicum_grp.c index 267ac68..44d573e 100644 --- a/lib/libcapsicum/libcapsicum_grp.c +++ b/lib/libcapsicum/libcapsicum_grp.c @@ -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" diff --git a/lib/libcapsicum/libcapsicum_pwd.c b/lib/libcapsicum/libcapsicum_pwd.c index 32eeeb0..5b44c34 100644 --- a/lib/libcapsicum/libcapsicum_pwd.c +++ b/lib/libcapsicum/libcapsicum_pwd.c @@ -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" diff --git a/lib/libcapsicum/libcapsicum_random.c b/lib/libcapsicum/libcapsicum_random.c index 2c3eb36..2a7b109 100644 --- a/lib/libcapsicum/libcapsicum_random.c +++ b/lib/libcapsicum/libcapsicum_random.c @@ -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" diff --git a/lib/libcapsicum/libcapsicum_service.c b/lib/libcapsicum/libcapsicum_service.c index edfde8c..6b6ceea 100644 --- a/lib/libcapsicum/libcapsicum_service.c +++ b/lib/libcapsicum/libcapsicum_service.c @@ -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" diff --git a/lib/libcapsicum/libcapsicum_sysctl.c b/lib/libcapsicum/libcapsicum_sysctl.c index fc69113..3f1ccd9 100644 --- a/lib/libcapsicum/libcapsicum_sysctl.c +++ b/lib/libcapsicum/libcapsicum_sysctl.c @@ -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" diff --git a/lib/libcasper/libcasper.c b/lib/libcasper/libcasper.c index cb95346..e241888 100644 --- a/lib/libcasper/libcasper.c +++ b/lib/libcasper/libcasper.c @@ -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> /* 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 { \ diff --git a/libexec/casper/dns/dns.c b/libexec/casper/dns/dns.c index f82801e..dbdb2a2 100644 --- a/libexec/casper/dns/dns.c +++ b/libexec/casper/dns/dns.c @@ -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 diff --git a/libexec/casper/grp/grp.c b/libexec/casper/grp/grp.c index ab28e1a..5b3e13d 100644 --- a/libexec/casper/grp/grp.c +++ b/libexec/casper/grp/grp.c @@ -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 diff --git a/libexec/casper/pwd/pwd.c b/libexec/casper/pwd/pwd.c index be51ad0..0a06c5f 100644 --- a/libexec/casper/pwd/pwd.c +++ b/libexec/casper/pwd/pwd.c @@ -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 diff --git a/libexec/casper/random/random.c b/libexec/casper/random/random.c index 56f1afb..db91685 100644 --- a/libexec/casper/random/random.c +++ b/libexec/casper/random/random.c @@ -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) diff --git a/libexec/casper/sysctl/sysctl.c b/libexec/casper/sysctl/sysctl.c index 8bb43b6..4cbc505 100644 --- a/libexec/casper/sysctl/sysctl.c +++ b/libexec/casper/sysctl/sysctl.c @@ -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 diff --git a/sbin/casperd/casperd.c b/sbin/casperd/casperd.c index f838811..7277b98 100644 --- a/sbin/casperd/casperd.c +++ b/sbin/casperd/casperd.c @@ -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" diff --git a/sbin/casperd/zygote.c b/sbin/casperd/zygote.c index c460bd3..2e17f91 100644 --- a/sbin/casperd/zygote.c +++ b/sbin/casperd/zygote.c @@ -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" diff --git a/tools/regression/capsicum/libcapsicum/sysctl.c b/tools/regression/capsicum/libcapsicum/sysctl.c index c72e842..f3ae307 100644 --- a/tools/regression/capsicum/libcapsicum/sysctl.c +++ b/tools/regression/capsicum/libcapsicum/sysctl.c @@ -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. diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c index 2f6c1e7..d8b6ccd 100644 --- a/usr.bin/kdump/kdump.c +++ b/usr.bin/kdump/kdump.c @@ -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> diff --git a/usr.sbin/iovctl/iovctl.c b/usr.sbin/iovctl/iovctl.c index dbf29d8..6c69f52 100644 --- a/usr.sbin/iovctl/iovctl.c +++ b/usr.sbin/iovctl/iovctl.c @@ -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> diff --git a/usr.sbin/iovctl/parse.c b/usr.sbin/iovctl/parse.c index 50e73b1..b2ec395 100644 --- a/usr.sbin/iovctl/parse.c +++ b/usr.sbin/iovctl/parse.c @@ -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> diff --git a/usr.sbin/iovctl/validate.c b/usr.sbin/iovctl/validate.c index 0e3eacd..789175a 100644 --- a/usr.sbin/iovctl/validate.c +++ b/usr.sbin/iovctl/validate.c @@ -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> |
