From b30a53d02d9bc370d76b8125a98e34311c768b5e Mon Sep 17 00:00:00 2001 From: Richard Lowe Date: Mon, 16 May 2011 21:37:47 +0000 Subject: 2242 libraries should be more careful casting pointers Reviewed by: Dan McDonald Reviewed by: Gordon Ross Approved by: Albert Lee --- usr/src/lib/libtsol/common/call_labeld.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'usr/src/lib/libtsol/common/call_labeld.c') 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 #include #include @@ -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 -- cgit v1.2.3