[illumos-gate merge]

commit a71e11eee4676204c7609c4c9703cc98fbf4669d
    8855 libnsl: variable 'p' set but not used
commit 10fb0c97e3ab2d7cb9ece84c177e49668137d68f
    8851 libast: parameter/variable set but not used
commit 1d2945e8b51a96806bfb1bc3cb0b1cf6732925e4
    8847 libadm: variable 'daynum' set but not used
commit df9cdf1096bbdb93cb9c2bb9d089a7804dc1d809
    8845 libima: variable set but not used
commit d87d03b4c0f66bf125e607ef8b0d9c5481040d20
    8842 libmail: right-hand operand of comma expression has no effect
commit 38fc59d1a32bf4ebde45c04f9e8a896ccc3db337
    8840 libtnfctl: variable 'ret_pp' set but not used
commit 100ea781a0fa9beb2f6704a2e6f207a83aa2a853
    8837 libsmedia: variable 'retformat' set but not used
commit 3c0e18f37537a4cc1475e6f715030b5457141261
    8836 libsum: 'id' defined but not used
commit 8659a363582025a151043e8e5450174179fd637b
    8834 libpp: 'id' defined but not used
commit a9ecb23444fb4086c2f46388f05df21dca317b58
    8832 libdll: 'id' defined but not used
commit bb4d45692c48b2f803f7ec1f690be050a0b2bf05
    8831 mpapi: variable 'status' set but not used
commit c532a89174aae7a12b4a8cef1517e723d26ff477
    8829 librdc: variable 'trc' set but not used

1 files changed, 8 insertions, 8 deletions

diff --git a/usr/src/lib/libima/common/sunima-lib.c b/usr/src/lib/libima/common/sunima-lib.c
index 6a233eaec1..1f96695085 100644
--- a/usr/src/lib/libima/common/sunima-lib.c
+++ b/usr/src/lib/libima/common/sunima-lib.c
@@ -125,24 +125,24 @@ IMA_API IMA_STATUS SUN_IMA_GetTunableProperties(
 	return (status);
 }
 
-static void os_obtainmutex(int semid) {
-	int retVal;
+static void
+os_obtainmutex(int semid)
+{
 	struct sembuf sem_b;
 
 	sem_b.sem_num = 0;
 	sem_b.sem_op = -1;
 	sem_b.sem_flg = SEM_UNDO;
-	retVal = semop(semid, &sem_b, 1);
-
+	(void) semop(semid, &sem_b, 1);
 }
 
-static void os_releasemutex(int semid) {
-	int retVal;
+static void
+os_releasemutex(int semid)
+{
 	struct sembuf sem_b;
 
 	sem_b.sem_num = 0;
 	sem_b.sem_op = 1;
 	sem_b.sem_flg = SEM_UNDO;
-	retVal = semop(semid, &sem_b, 1);
-
+	(void) semop(semid, &sem_b, 1);
 }