From 78ae6f5157822b60e07699a5eb3d798bbf769909 Mon Sep 17 00:00:00 2001
From: rwatson <rwatson@FreeBSD.org>
Date: Tue, 19 Sep 2000 19:14:31 +0000
Subject: o General warning fixing commit     - Include <stdlib.h> and
 <string.h> as needed for prototypes     - Remove unneeded "error" variables o
 Make cap_init() use cap_clear() instead of bzero()

Obtained from:	TrustedBSD Project
---
 lib/libc/posix1e/cap_clear.c    | 2 ++
 lib/libc/posix1e/cap_dup.c      | 2 +-
 lib/libc/posix1e/cap_free.c     | 2 ++
 lib/libc/posix1e/cap_init.c     | 3 +--
 lib/libc/posix1e/cap_set_fd.c   | 3 ---
 lib/libc/posix1e/cap_set_file.c | 2 --
 lib/libc/posix1e/cap_set_proc.c | 1 -
 7 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'lib/libc')

diff --git a/lib/libc/posix1e/cap_clear.c b/lib/libc/posix1e/cap_clear.c
index af4599d..eb6b39a 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 57c726c..7aacc81 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 5c39b27..3c77992 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 163ecce..377c524 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 ba2f356..70b7160 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 e371f8a..4aa202f 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 e86c4bb..14fb44b 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));
 }
-- 
cgit v1.1