summaryrefslogtreecommitdiff
path: root/usr/src/lib/libtsol/common/call_labeld.c
diff options
context:
space:
mode:
authorRichard Lowe <richlowe@richlowe.net>2011-05-16 21:37:47 +0000
committerRichard Lowe <richlowe@richlowe.net>2011-05-16 21:37:47 +0000
commitb30a53d02d9bc370d76b8125a98e34311c768b5e (patch)
tree8faa7b9d5466ec8fc6c078382759c1030ccfd8bc /usr/src/lib/libtsol/common/call_labeld.c
parent6b7143d774683daf27dfb2e93ab48d1ade1a3477 (diff)
downloadillumos-gate-b30a53d02d9bc370d76b8125a98e34311c768b5e.tar.gz
2242 libraries should be more careful casting pointers
Reviewed by: Dan McDonald <danmcd@nexenta.com> Reviewed by: Gordon Ross <gwr@nexenta.com> Approved by: Albert Lee <trisk@nexenta.com>
Diffstat (limited to 'usr/src/lib/libtsol/common/call_labeld.c')
-rw-r--r--usr/src/lib/libtsol/common/call_labeld.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/usr/src/lib/libtsol/common/call_labeld.c b/usr/src/lib/libtsol/common/call_labeld.c
index 8ae29742be..708a9e30af 100644
--- a/usr/src/lib/libtsol/common/call_labeld.c
+++ b/usr/src/lib/libtsol/common/call_labeld.c
@@ -24,8 +24,6 @@
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include <door.h>
#include <errno.h>
#include <fcntl.h>
@@ -139,14 +137,14 @@ try_again:
if ((doorfd = dup(doorfd)) < 0) {
perror("couldn't dup");
while (i--)
- (void) close(tbc[i]);
+ (void) close(tbc[i]);
doorfd = -1;
(void) mutex_unlock(&_door_lock);
return (NOSERVER);
}
}
while (i--)
- (void) close(tbc[i]);
+ (void) close(tbc[i]);
/*
* mark this door descriptor as close on exec
@@ -193,7 +191,7 @@ try_again:
(void) printf("\t\t id = %llx\n", real_door.di_uniquifier);
#endif /* DEBUG */
if ((real_door.di_attributes & DOOR_REVOKED) ||
- (real_door.di_data != (door_ptr_t)COOKIE)) {
+ (real_door.di_data != COOKIE)) {
#ifdef DEBUG
(void) printf("real door revoked\n");
#endif /* DEBUG */
@@ -204,8 +202,8 @@ try_again:
}
} else {
if ((door_info(doorfd, &my_door) < 0) ||
- (my_door.di_data != (door_ptr_t)COOKIE) ||
- (my_door.di_uniquifier != real_door.di_uniquifier)) {
+ (my_door.di_data != COOKIE) ||
+ (my_door.di_uniquifier != real_door.di_uniquifier)) {
perror("my door door_info");
/*
* don't close it - someone else has clobbered fd