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 2bad856dca7b8e1fc11b016c7da9797cc16f9f7a..78448b3708e054edfcf808d75c28a44cd34a33a6 100644 (file)
--- 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 e419ebac72f4ff50568639332953b672c92f3594..90e256fa3f68316789e7e8cdcfc14da6e3cea237 100644 (file)
--- 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 88c505198cd804114349ff973ea9fd51402ce0a2..060da012904f15e152c3265b699bb5d874396782 100644 (file)
--- 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;