14 files changed, 12 insertions, 18 deletions

diff --git a/lib/libc/posix1e/cap_clear.c b/lib/libc/posix1e/cap_clear.c
index af4599de9ff8..eb6b39a3b95e 100644
--- a/lib/libc/posix1e/cap_clear.c
+++ b/lib/libc/posix1e/cap_clear.c
@@ -32,6 +32,8 @@
 #include <sys/types.h>
 #include <sys/capability.h>
 
+#include <string.h>
+
 int
 cap_clear(cap_t cap_p)
 {
diff --git a/lib/libc/posix1e/cap_dup.c b/lib/libc/posix1e/cap_dup.c
index 57c726c34d2c..7aacc811e0df 100644
--- a/lib/libc/posix1e/cap_dup.c
+++ b/lib/libc/posix1e/cap_dup.c
@@ -32,7 +32,7 @@
 #include <sys/types.h>
 #include <sys/capability.h>
 
-#include <stdlib.h>
+#include <string.h>
 
 cap_t
 cap_dup(cap_t cap_p)
diff --git a/lib/libc/posix1e/cap_free.c b/lib/libc/posix1e/cap_free.c
index 5c39b27db4fb..3c77992f2c32 100644
--- a/lib/libc/posix1e/cap_free.c
+++ b/lib/libc/posix1e/cap_free.c
@@ -32,6 +32,8 @@
 #include <sys/types.h>
 #include <sys/capability.h>
 
+#include <stdlib.h>
+
 int
 cap_free(void *obj_d)
 {
diff --git a/lib/libc/posix1e/cap_init.c b/lib/libc/posix1e/cap_init.c
index 163ecce4289e..377c524b43b9 100644
--- a/lib/libc/posix1e/cap_init.c
+++ b/lib/libc/posix1e/cap_init.c
@@ -45,8 +45,7 @@ cap_init(void)
 		errno = ENOMEM;
 		return (NULL);
 	}
-
-	bzero(cap, sizeof(struct cap));
+	cap_clear(cap);
 
 	return (cap);
 }
diff --git a/lib/libc/posix1e/cap_set_fd.c b/lib/libc/posix1e/cap_set_fd.c
index ba2f35618270..70b7160bcd2c 100644
--- a/lib/libc/posix1e/cap_set_fd.c
+++ b/lib/libc/posix1e/cap_set_fd.c
@@ -32,12 +32,9 @@
 #include <sys/types.h>
 #include <sys/capability.h>
 
-#include <sys/errno.h>
-
 int
 cap_set_fd(int fd, cap_t cap_p)
 {
-	int	error;
 
 	return (__cap_set_fd(fd, cap_p));
 }
diff --git a/lib/libc/posix1e/cap_set_file.c b/lib/libc/posix1e/cap_set_file.c
index e371f8af7fa0..4aa202ff1298 100644
--- a/lib/libc/posix1e/cap_set_file.c
+++ b/lib/libc/posix1e/cap_set_file.c
@@ -32,12 +32,10 @@
 #include <sys/types.h>
 #include <sys/capability.h>
 
-#include <sys/errno.h>
 
 int
 cap_set_file(const char *path_p, cap_t cap_p)
 {
-	int	error;
 
 	return (__cap_set_file(path_p, cap_p));
 }
diff --git a/lib/libc/posix1e/cap_set_proc.c b/lib/libc/posix1e/cap_set_proc.c
index e86c4bbb4af6..14fb44bad401 100644
--- a/lib/libc/posix1e/cap_set_proc.c
+++ b/lib/libc/posix1e/cap_set_proc.c
@@ -37,7 +37,6 @@
 int
 cap_set_proc(cap_t cap_p)
 {
-	int	error;
 
 	return (__cap_set_proc(cap_p));
 }
diff --git a/lib/libposix1e/cap_clear.c b/lib/libposix1e/cap_clear.c
index af4599de9ff8..eb6b39a3b95e 100644
--- a/lib/libposix1e/cap_clear.c
+++ b/lib/libposix1e/cap_clear.c
@@ -32,6 +32,8 @@
 #include <sys/types.h>
 #include <sys/capability.h>
 
+#include <string.h>
+
 int
 cap_clear(cap_t cap_p)
 {
diff --git a/lib/libposix1e/cap_dup.c b/lib/libposix1e/cap_dup.c
index 57c726c34d2c..7aacc811e0df 100644
--- a/lib/libposix1e/cap_dup.c
+++ b/lib/libposix1e/cap_dup.c
@@ -32,7 +32,7 @@
 #include <sys/types.h>
 #include <sys/capability.h>
 
-#include <stdlib.h>
+#include <string.h>
 
 cap_t
 cap_dup(cap_t cap_p)
diff --git a/lib/libposix1e/cap_free.c b/lib/libposix1e/cap_free.c
index 5c39b27db4fb..3c77992f2c32 100644
--- a/lib/libposix1e/cap_free.c
+++ b/lib/libposix1e/cap_free.c
@@ -32,6 +32,8 @@
 #include <sys/types.h>
 #include <sys/capability.h>
 
+#include <stdlib.h>
+
 int
 cap_free(void *obj_d)
 {
diff --git a/lib/libposix1e/cap_init.c b/lib/libposix1e/cap_init.c
index 163ecce4289e..377c524b43b9 100644
--- a/lib/libposix1e/cap_init.c
+++ b/lib/libposix1e/cap_init.c
@@ -45,8 +45,7 @@ cap_init(void)
 		errno = ENOMEM;
 		return (NULL);
 	}
-
-	bzero(cap, sizeof(struct cap));
+	cap_clear(cap);
 
 	return (cap);
 }
diff --git a/lib/libposix1e/cap_set_fd.c b/lib/libposix1e/cap_set_fd.c
index ba2f35618270..70b7160bcd2c 100644
--- a/lib/libposix1e/cap_set_fd.c
+++ b/lib/libposix1e/cap_set_fd.c
@@ -32,12 +32,9 @@
 #include <sys/types.h>
 #include <sys/capability.h>
 
-#include <sys/errno.h>
-
 int
 cap_set_fd(int fd, cap_t cap_p)
 {
-	int	error;
 
 	return (__cap_set_fd(fd, cap_p));
 }
diff --git a/lib/libposix1e/cap_set_file.c b/lib/libposix1e/cap_set_file.c
index e371f8af7fa0..4aa202ff1298 100644
--- a/lib/libposix1e/cap_set_file.c
+++ b/lib/libposix1e/cap_set_file.c
@@ -32,12 +32,10 @@
 #include <sys/types.h>
 #include <sys/capability.h>
 
-#include <sys/errno.h>
 
 int
 cap_set_file(const char *path_p, cap_t cap_p)
 {
-	int	error;
 
 	return (__cap_set_file(path_p, cap_p));
 }
diff --git a/lib/libposix1e/cap_set_proc.c b/lib/libposix1e/cap_set_proc.c
index e86c4bbb4af6..14fb44bad401 100644
--- a/lib/libposix1e/cap_set_proc.c
+++ b/lib/libposix1e/cap_set_proc.c
@@ -37,7 +37,6 @@
 int
 cap_set_proc(cap_t cap_p)
 {
-	int	error;
 
 	return (__cap_set_proc(cap_p));
 }