From 870528b79923b065c9d04bc598b43a518f3cfafa Mon Sep 17 00:00:00 2001
From: Pawel Dziepak <pdziepak@quarnos.org>
Date: Thu, 16 Aug 2012 03:41:29 +0200
Subject: [PATCH] nfs4: Fix gcc4 warnings

---
 headers/private/net/dns_resolver.h                     | 10 +++++++---
 src/add-ons/kernel/file_systems/nfs4/Cookie.cpp        |  3 ++-
 src/add-ons/kernel/file_systems/nfs4/FileSystem.cpp    |  4 ++--
 src/add-ons/kernel/file_systems/nfs4/NFS4Inode.cpp     |  3 ++-
 src/add-ons/kernel/file_systems/nfs4/NFS4Server.cpp    |  4 ++--
 .../kernel/file_systems/nfs4/ReplyInterpreter.cpp      |  6 +++---
 6 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/headers/private/net/dns_resolver.h b/headers/private/net/dns_resolver.h
index 0a5cf14525..d868ca0381 100644
--- a/headers/private/net/dns_resolver.h
+++ b/headers/private/net/dns_resolver.h
@@ -26,8 +26,8 @@ struct dns_resolver_module {
 
 
 static inline int
-getaddrinfo(const char* node, const char* service, const struct addrinfo* hints,
-	struct addrinfo** res)
+kgetaddrinfo(const char* node, const char* service,
+	const struct addrinfo* hints, struct addrinfo** res)
 {
 	dns_resolver_module* dns;
 	status_t result = get_module(DNS_RESOLVER_MODULE_NAME,
@@ -44,11 +44,15 @@ getaddrinfo(const char* node, const char* service, const struct addrinfo* hints,
 
 
 static inline void
-freeaddrinfo(struct addrinfo* res)
+kfreeaddrinfo(struct addrinfo* res)
 {
 	free(res);
 }
 
 
+#define getaddrinfo		kgetaddrinfo
+#define freeaddrinfo	kfreeaddrinfo
+
+
 #endif	//	DNS_RESOLVER_H
 
diff --git a/src/add-ons/kernel/file_systems/nfs4/Cookie.cpp b/src/add-ons/kernel/file_systems/nfs4/Cookie.cpp
index 23a38e2950..805721a153 100644
--- a/src/add-ons/kernel/file_systems/nfs4/Cookie.cpp
+++ b/src/add-ons/kernel/file_systems/nfs4/Cookie.cpp
@@ -53,7 +53,8 @@ LockInfo::operator==(const struct flock& lock) const
 	uint64 start = static_cast<uint64>(lock.l_start);
 	uint64 len = static_cast<uint64>(lock.l_len);
 
-	return fStart == start && fLength == len || eof && fLength == UINT64_MAX;
+	return fStart == start && (fLength == len
+		|| (eof && fLength == UINT64_MAX));
 }
 
 
diff --git a/src/add-ons/kernel/file_systems/nfs4/FileSystem.cpp b/src/add-ons/kernel/file_systems/nfs4/FileSystem.cpp
index 2adf0b7f4d..46bd002dc8 100644
--- a/src/add-ons/kernel/file_systems/nfs4/FileSystem.cpp
+++ b/src/add-ons/kernel/file_systems/nfs4/FileSystem.cpp
@@ -110,8 +110,8 @@ FileSystem::Mount(FileSystem** pfs, RPC::Server* serv, const char* fsPath,
 	result = reply.Access(NULL, &allowed);
 	if (result != B_OK)
 		return result;
-	else if (allowed & (ACCESS4_READ | ACCESS4_LOOKUP)
-				!= (ACCESS4_READ | ACCESS4_LOOKUP))
+	else if ((allowed & (ACCESS4_READ | ACCESS4_LOOKUP))
+		!= (ACCESS4_READ | ACCESS4_LOOKUP))
 		return B_PERMISSION_DENIED;
 
 	AttrValue* values;
diff --git a/src/add-ons/kernel/file_systems/nfs4/NFS4Inode.cpp b/src/add-ons/kernel/file_systems/nfs4/NFS4Inode.cpp
index 145c50f842..81e6280867 100644
--- a/src/add-ons/kernel/file_systems/nfs4/NFS4Inode.cpp
+++ b/src/add-ons/kernel/file_systems/nfs4/NFS4Inode.cpp
@@ -938,7 +938,8 @@ NFS4Inode::ReadDirOnce(DirEntry** dirents, uint32* count, OpenDirCookie* cookie,
 			return result;
 		}
 
-		if (*change == 0 && before[0].fData.fValue64 == after[0].fData.fValue64
+		if ((*change == 0
+				&& before[0].fData.fValue64 == after[0].fData.fValue64)
 			|| *change == after[0].fData.fValue64)
 			*change = after[0].fData.fValue64;
 		else
diff --git a/src/add-ons/kernel/file_systems/nfs4/NFS4Server.cpp b/src/add-ons/kernel/file_systems/nfs4/NFS4Server.cpp
index 60a6ee0d13..1b09e633a7 100644
--- a/src/add-ons/kernel/file_systems/nfs4/NFS4Server.cpp
+++ b/src/add-ons/kernel/file_systems/nfs4/NFS4Server.cpp
@@ -109,8 +109,8 @@ uint64
 NFS4Server::ClientId(uint64 prevId, bool forceNew)
 {
 	MutexLocker _(fClientIdLock);
-	if (fUseCount == 0 && fClientIdLastUse + (time_t)LeaseTime() < time(NULL)
-		|| forceNew && fClientId == prevId) {
+	if ((fUseCount == 0 && fClientIdLastUse + (time_t)LeaseTime() < time(NULL))
+		|| (forceNew && fClientId == prevId)) {
 
 		Request request(fServer);
 		request.Builder().SetClientID(fServer);
diff --git a/src/add-ons/kernel/file_systems/nfs4/ReplyInterpreter.cpp b/src/add-ons/kernel/file_systems/nfs4/ReplyInterpreter.cpp
index 6f04552ab0..bf4f4dd2ac 100644
--- a/src/add-ons/kernel/file_systems/nfs4/ReplyInterpreter.cpp
+++ b/src/add-ons/kernel/file_systems/nfs4/ReplyInterpreter.cpp
@@ -161,11 +161,11 @@ ReplyInterpreter::Create(uint64* before, uint64* after, bool& atomic)
 
 // Bit Twiddling Hacks
 // http://graphics.stanford.edu/~seander/bithacks.html
-static inline uint32 sCountBits(uint32 v)
+static inline uint32 CountBits(uint32 v)
 {
 	v = v - ((v >> 1) & 0x55555555);
 	v = (v & 0x33333333) + ((v >> 2) & 0x33333333);
-	return ((v + (v >> 4) & 0xF0F0F0F) * 0x1010101) >> 24;
+	return (((v + (v >> 4)) & 0xF0F0F0F) * 0x1010101) >> 24;
 }
 
 
@@ -562,7 +562,7 @@ ReplyInterpreter::_DecodeAttrs(XDR::ReadStream& str, AttrValue** attrs,
 	uint32 attr_count = 0;
 	for (uint32 i = 0; i < bcount; i++) {
 		bitmap[i] = str.GetUInt();
-		attr_count += sCountBits(bitmap[i]);
+		attr_count += CountBits(bitmap[i]);
 	}
 
 	if (attr_count == 0) {