From: Simon Wilkinson <sxw@inf.ed.ac.uk>
Date: Sat, 26 Sep 2009 16:56:48 +0000 (+0100)
Subject: Squish some warnings in ubik/
X-Git-Tag: openafs-devel-1_5_65~40
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=fabe41d6443586778cd992ad0aa8fad41b130114;p=packages%2Fo%2Fopenafs.git

Squish some warnings in ubik/

Remove some more warnings from the ubik/ directory
   - Remove a dangling else case from an if statement
   - Prototype ubik_dprint_25
   - Don't do (a || b()) - it's horrible, and causes warnings!
     Replace with if (!a) b();

Reviewed-on: http://gerrit.openafs.org/504
Tested-by: Derrick Brashear <shadow@dementia.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/ubik/phys.c b/src/ubik/phys.c
index 2bad856dc..78448b370 100644
--- a/src/ubik/phys.c
+++ b/src/ubik/phys.c
@@ -142,7 +142,7 @@ uphys_close(register int afd)
 	return EBADF;
     tfd = fdcache;
     for (i = 0; i < MAXFDCACHE; i++, tfd++) {
-	if (tfd->fd == afd) 
+	if (tfd->fd == afd) {
 	    if (tfd->fileID != -10000) {
 		tfd->refCount--;
 		return 0;
@@ -158,6 +158,7 @@ uphys_close(register int afd)
 		tfd->fd = -1;
 		break;
 	    }
+	}
     }
     return close(afd);
 }
diff --git a/src/ubik/ubik.p.h b/src/ubik/ubik.p.h
index e419ebac7..90e256fa3 100644
--- a/src/ubik/ubik.p.h
+++ b/src/ubik/ubik.p.h
@@ -439,6 +439,7 @@ extern int uvote_Init(void);
 extern void ubik_vprint(const char *format, va_list ap);
 extern void ubik_print(const char *format, ...);
 extern void ubik_dprint(const char *format, ...);
+extern void ubik_dprint_25(const char *format, ...);
 /*\}*/
 
 #endif /* UBIK_INTERNALS */
diff --git a/src/ubik/ubikclient.c b/src/ubik/ubikclient.c
index 88c505198..060da0129 100644
--- a/src/ubik/ubikclient.c
+++ b/src/ubik/ubikclient.c
@@ -150,7 +150,9 @@ afs_random(void)
 #ifdef AFS_PTHREAD_ENV
     afs_uint32 state;
 
-    (called_afs_random_once || pthread_once(&random_once, afs_random_once));
+    if (!called_afs_random_once)
+	pthread_once(&random_once, afs_random_once);
+
     state = (afs_uint32) pthread_getspecific(random_number_key);
 #else
     static afs_uint32 state = 0;