From: Simon Wilkinson <sxw@inf.ed.ac.uk>
Date: Tue, 28 Jul 2009 11:25:08 +0000 (+0100)
Subject: Warnings work in util/
X-Git-Tag: openafs-devel-1_5_61~16
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=5eae1c8062a8662d172d21a059533e04eef318d2;p=packages%2Fo%2Fopenafs.git

Warnings work in util/

Make afs_ctime an inline function, instead of a complex macro.
This both improves our type safety, and suppreses warnings about
unused results.

Add bracing to clarify operator precedence in if (a && b || c)
statement

AFS_DARwiN60_ENV != AFS_DARWIN60_ENV

Use (void) rather than () in function prototypes

Reviewed-on: http://gerrit.openafs.org/240
Tested-by: Marc Dionne <marc.c.dionne@gmail.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/util/afsutil.h b/src/util/afsutil.h
index bf4db4e14..dc587a65e 100644
--- a/src/util/afsutil.h
+++ b/src/util/afsutil.h
@@ -89,8 +89,12 @@ extern char *vctime(const time_t * atime);
 #define afs_ctime(C, B, L) (char*)ctime_r(C, B)
 #endif /* AFS_SUN5_ENV */
 #else /* AFS_PTHREAD_ENV && !AFS_NT40_ENV */
-#define afs_ctime(C, B, S) \
-	((void)strncpy(B, ctime(C), (S-1)), (B)[S-1] = '\0', (B))
+static_inline char *
+afs_ctime(const time_t *C, char *B, size_t S) {
+    strncpy(B, ctime(C), (S-1));
+    B[S-1] = '\0';
+    return B;
+}
 #endif /* AFS_PTHREAD_ENV && !AFS_NT40_ENV */
 
 
diff --git a/src/util/fstab.c b/src/util/fstab.c
index a39ab46c2..2c3d518ec 100644
--- a/src/util/fstab.c
+++ b/src/util/fstab.c
@@ -104,7 +104,7 @@ fstabscan(void)
 struct fstab *
 getfsent(void)
 {
-    if (!_fs_buf && !setfsent() || !fstabscan())
+    if ((!_fs_buf && !setfsent()) || !fstabscan())
 	return ((struct fstab *)NULL);
     return (&_fs_fstab);
 }
diff --git a/src/util/softsig.c b/src/util/softsig.c
index 24a241254..bcd04f9e9 100644
--- a/src/util/softsig.c
+++ b/src/util/softsig.c
@@ -68,7 +68,7 @@ softsig_thread(void *arg)
 
     while (1) {
 	void (*h) (int);
-#if !defined(AFS_DARwiN60_ENV) && !defined(AFS_NBSD_ENV)
+#if !defined(AFS_DARWIN60_ENV) && !defined(AFS_NBSD_ENV)
 	int sigw;
 #endif
 
diff --git a/src/util/softsig.h b/src/util/softsig.h
index 8d1b79076..fec107b5f 100644
--- a/src/util/softsig.h
+++ b/src/util/softsig.h
@@ -10,7 +10,7 @@
 #ifndef _SOFTSIG_H
 #define _SOFTSIG_H
 
-void softsig_init();
+void softsig_init(void);
 void softsig_signal(int signo, void (*handler) (int));
 
 #endif