summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrwatson <rwatson@FreeBSD.org>2001-01-17 02:40:39 +0000
committerrwatson <rwatson@FreeBSD.org>2001-01-17 02:40:39 +0000
commit80d719db5a213af2333a8074c09c1e16c09efbe2 (patch)
treecde2a78ee050180356a043979451e4bfc8568f7c
parenta3a305a2b457f0e59d2ffde35995c5ec456b9267 (diff)
downloadFreeBSD-src-80d719db5a213af2333a8074c09c1e16c09efbe2.zip
FreeBSD-src-80d719db5a213af2333a8074c09c1e16c09efbe2.tar.gz
o When returning NULL, return (NULL) instead of return (0).
Submitted by: jedgar Obtained from: TrustedBSD Project
-rw-r--r--lib/libc/posix1e/acl_from_text.c6
-rw-r--r--lib/libc/posix1e/acl_get.c12
-rw-r--r--lib/libc/posix1e/acl_init.c2
-rw-r--r--lib/libc/posix1e/acl_to_text.c4
-rw-r--r--lib/libposix1e/acl_from_text.c6
-rw-r--r--lib/libposix1e/acl_get.c12
-rw-r--r--lib/libposix1e/acl_init.c2
-rw-r--r--lib/libposix1e/acl_to_text.c4
8 files changed, 24 insertions, 24 deletions
diff --git a/lib/libc/posix1e/acl_from_text.c b/lib/libc/posix1e/acl_from_text.c
index d4d9986..e35d150 100644
--- a/lib/libc/posix1e/acl_from_text.c
+++ b/lib/libc/posix1e/acl_from_text.c
@@ -118,12 +118,12 @@ acl_from_text(const char *buf_p)
/* Local copy we can mess up. */
mybuf_p = strdup(buf_p);
if (!mybuf_p)
- return(0);
+ return(NULL);
acl = acl_init(3);
if (!acl) {
free(mybuf_p);
- return(0);
+ return(NULL);
}
/* Outer loop: delimit at \n boundaries. */
@@ -223,7 +223,7 @@ acl_from_text(const char *buf_p)
error_label:
acl_free(acl);
free(mybuf_p);
- return(0);
+ return(NULL);
}
diff --git a/lib/libc/posix1e/acl_get.c b/lib/libc/posix1e/acl_get.c
index 494eed7..46882d6 100644
--- a/lib/libc/posix1e/acl_get.c
+++ b/lib/libc/posix1e/acl_get.c
@@ -44,13 +44,13 @@ acl_get_file(const char *path_p, acl_type_t type)
aclp = acl_init(ACL_MAX_ENTRIES);
if (!aclp) {
- return (0);
+ return (NULL);
}
error = __acl_get_file(path_p, type, aclp);
if (error) {
acl_free(aclp);
- return (0);
+ return (NULL);
}
return (aclp);
@@ -64,13 +64,13 @@ acl_get_fd(int fd)
aclp = acl_init(ACL_MAX_ENTRIES);
if (!aclp) {
- return (0);
+ return (NULL);
}
error = __acl_get_fd(fd, ACL_TYPE_ACCESS, aclp);
if (error) {
acl_free(aclp);
- return (0);
+ return (NULL);
}
return (aclp);
@@ -84,13 +84,13 @@ acl_get_fd_np(int fd, acl_type_t type)
aclp = acl_init(ACL_MAX_ENTRIES);
if (!aclp) {
- return (0);
+ return (NULL);
}
error = __acl_get_fd(fd, type, aclp);
if (error) {
acl_free(aclp);
- return (0);
+ return (NULL);
}
return (aclp);
diff --git a/lib/libc/posix1e/acl_init.c b/lib/libc/posix1e/acl_init.c
index cf7d908..5a167ce 100644
--- a/lib/libc/posix1e/acl_init.c
+++ b/lib/libc/posix1e/acl_init.c
@@ -43,7 +43,7 @@ acl_init(int count)
if (count > ACL_MAX_ENTRIES) {
errno = ENOMEM;
- return (0);
+ return (NULL);
}
acl = (struct acl *) malloc(sizeof(struct acl));
diff --git a/lib/libc/posix1e/acl_to_text.c b/lib/libc/posix1e/acl_to_text.c
index bb5a546..d5a1e32 100644
--- a/lib/libc/posix1e/acl_to_text.c
+++ b/lib/libc/posix1e/acl_to_text.c
@@ -61,7 +61,7 @@ acl_to_text(acl_t acl, ssize_t *len_p)
buf = strdup("");
if (!buf)
- return(0);
+ return(NULL);
mask_perm = ACL_PERM_BITS; /* effective is regular if no mask */
for (i = 0; i < acl->acl_cnt; i++)
@@ -218,5 +218,5 @@ acl_to_text(acl_t acl, ssize_t *len_p)
error_label:
/* jump to here sets errno already, we just clean up */
if (buf) free(buf);
- return (0);
+ return (NULL);
}
diff --git a/lib/libposix1e/acl_from_text.c b/lib/libposix1e/acl_from_text.c
index d4d9986..e35d150 100644
--- a/lib/libposix1e/acl_from_text.c
+++ b/lib/libposix1e/acl_from_text.c
@@ -118,12 +118,12 @@ acl_from_text(const char *buf_p)
/* Local copy we can mess up. */
mybuf_p = strdup(buf_p);
if (!mybuf_p)
- return(0);
+ return(NULL);
acl = acl_init(3);
if (!acl) {
free(mybuf_p);
- return(0);
+ return(NULL);
}
/* Outer loop: delimit at \n boundaries. */
@@ -223,7 +223,7 @@ acl_from_text(const char *buf_p)
error_label:
acl_free(acl);
free(mybuf_p);
- return(0);
+ return(NULL);
}
diff --git a/lib/libposix1e/acl_get.c b/lib/libposix1e/acl_get.c
index 494eed7..46882d6 100644
--- a/lib/libposix1e/acl_get.c
+++ b/lib/libposix1e/acl_get.c
@@ -44,13 +44,13 @@ acl_get_file(const char *path_p, acl_type_t type)
aclp = acl_init(ACL_MAX_ENTRIES);
if (!aclp) {
- return (0);
+ return (NULL);
}
error = __acl_get_file(path_p, type, aclp);
if (error) {
acl_free(aclp);
- return (0);
+ return (NULL);
}
return (aclp);
@@ -64,13 +64,13 @@ acl_get_fd(int fd)
aclp = acl_init(ACL_MAX_ENTRIES);
if (!aclp) {
- return (0);
+ return (NULL);
}
error = __acl_get_fd(fd, ACL_TYPE_ACCESS, aclp);
if (error) {
acl_free(aclp);
- return (0);
+ return (NULL);
}
return (aclp);
@@ -84,13 +84,13 @@ acl_get_fd_np(int fd, acl_type_t type)
aclp = acl_init(ACL_MAX_ENTRIES);
if (!aclp) {
- return (0);
+ return (NULL);
}
error = __acl_get_fd(fd, type, aclp);
if (error) {
acl_free(aclp);
- return (0);
+ return (NULL);
}
return (aclp);
diff --git a/lib/libposix1e/acl_init.c b/lib/libposix1e/acl_init.c
index cf7d908..5a167ce 100644
--- a/lib/libposix1e/acl_init.c
+++ b/lib/libposix1e/acl_init.c
@@ -43,7 +43,7 @@ acl_init(int count)
if (count > ACL_MAX_ENTRIES) {
errno = ENOMEM;
- return (0);
+ return (NULL);
}
acl = (struct acl *) malloc(sizeof(struct acl));
diff --git a/lib/libposix1e/acl_to_text.c b/lib/libposix1e/acl_to_text.c
index bb5a546..d5a1e32 100644
--- a/lib/libposix1e/acl_to_text.c
+++ b/lib/libposix1e/acl_to_text.c
@@ -61,7 +61,7 @@ acl_to_text(acl_t acl, ssize_t *len_p)
buf = strdup("");
if (!buf)
- return(0);
+ return(NULL);
mask_perm = ACL_PERM_BITS; /* effective is regular if no mask */
for (i = 0; i < acl->acl_cnt; i++)
@@ -218,5 +218,5 @@ acl_to_text(acl_t acl, ssize_t *len_p)
error_label:
/* jump to here sets errno already, we just clean up */
if (buf) free(buf);
- return (0);
+ return (NULL);
}
OpenPOWER on IntegriCloud