diff --git a/src/add-ons/kernel/file_systems/nfs4/CacheRevalidator.h b/src/add-ons/kernel/file_systems/nfs4/CacheRevalidator.h index 34d4f8a055..97879b2979 100644 --- a/src/add-ons/kernel/file_systems/nfs4/CacheRevalidator.h +++ b/src/add-ons/kernel/file_systems/nfs4/CacheRevalidator.h @@ -48,6 +48,7 @@ CacheRevalidator::Lock() mutex_lock(&fDirectoryCachesLock); } + inline void CacheRevalidator::Unlock() { @@ -75,4 +76,4 @@ CacheRevalidator::RemoveDirectory(DirectoryCache* cache) #endif // CACHEREVALIDATOR_H - + diff --git a/src/add-ons/kernel/file_systems/nfs4/Connection.cpp b/src/add-ons/kernel/file_systems/nfs4/Connection.cpp index d94801b2b0..2c13915959 100644 --- a/src/add-ons/kernel/file_systems/nfs4/Connection.cpp +++ b/src/add-ons/kernel/file_systems/nfs4/Connection.cpp @@ -34,6 +34,7 @@ PeerAddress::operator==(const PeerAddress& address) && fProtocol == address.fProtocol; } + bool PeerAddress::operator<(const PeerAddress& address) { @@ -257,7 +258,6 @@ ConnectionBase::ConnectionBase(const PeerAddress& address) } - ConnectionStream::ConnectionStream(const PeerAddress& address) : Connection(address) @@ -360,8 +360,8 @@ ConnectionStream::Receive(void** _buffer, uint32* _size) do { result = wait_for_objects(object, 2); - if (result < B_OK || - (object[0].events & B_EVENT_ACQUIRE_SEMAPHORE) != 0) { + if (result < B_OK + || (object[0].events & B_EVENT_ACQUIRE_SEMAPHORE) != 0) { free(buffer); return ECONNABORTED; } else if ((object[1].events & B_EVENT_READ) == 0) @@ -438,8 +438,8 @@ ConnectionPacket::Receive(void** _buffer, uint32* _size) do { result = wait_for_objects(object, 2); - if (result < B_OK || - (object[0].events & B_EVENT_ACQUIRE_SEMAPHORE) != 0) { + if (result < B_OK + || (object[0].events & B_EVENT_ACQUIRE_SEMAPHORE) != 0) { free(buffer); return ECONNABORTED; } else if ((object[1].events & B_EVENT_READ) == 0) @@ -695,8 +695,8 @@ ConnectionListener::AcceptConnection(Connection** connection) do { status_t result = wait_for_objects(object, 2); - if (result < B_OK || - (object[0].events & B_EVENT_ACQUIRE_SEMAPHORE) != 0) { + if (result < B_OK + || (object[0].events & B_EVENT_ACQUIRE_SEMAPHORE) != 0) { return ECONNABORTED; } else if ((object[1].events & B_EVENT_READ) == 0) continue; diff --git a/src/add-ons/kernel/file_systems/nfs4/DirectoryCache.cpp b/src/add-ons/kernel/file_systems/nfs4/DirectoryCache.cpp index 93ecfdec55..2fe8e61fee 100644 --- a/src/add-ons/kernel/file_systems/nfs4/DirectoryCache.cpp +++ b/src/add-ons/kernel/file_systems/nfs4/DirectoryCache.cpp @@ -128,6 +128,7 @@ DirectoryCache::AddEntry(const char* name, ino_t node, bool created) return B_OK; } + void DirectoryCache::RemoveEntry(const char* name) { @@ -244,8 +245,8 @@ DirectoryCache::NotifyChanges(DirectoryCacheSnapshot* oldSnapshot, bool found = false; NameCacheEntry* prev = NULL; while (oldCurrent != NULL) { - if (oldCurrent->fNode == newCurrent->fNode && - strcmp(oldCurrent->fName, newCurrent->fName) == 0) { + if (oldCurrent->fNode == newCurrent->fNode + && strcmp(oldCurrent->fName, newCurrent->fName) == 0) { found = true; break; } diff --git a/src/add-ons/kernel/file_systems/nfs4/FileSystem.cpp b/src/add-ons/kernel/file_systems/nfs4/FileSystem.cpp index ec5d992987..860c891e6f 100644 --- a/src/add-ons/kernel/file_systems/nfs4/FileSystem.cpp +++ b/src/add-ons/kernel/file_systems/nfs4/FileSystem.cpp @@ -138,12 +138,12 @@ FileSystem::Mount(FileSystem** pfs, RPC::Server* serv, const char* fsPath, fs->fExpireType = values[1].fData.fValue32; // FATTR4_FSID is mandatory - FileSystemId* fsid = - reinterpret_cast(values[2].fData.fPointer); + FileSystemId* fsid + = reinterpret_cast(values[2].fData.fPointer); if (count == 4 && values[3].fAttribute == FATTR4_FS_LOCATIONS) { - FSLocations* locs = - reinterpret_cast(values[3].fData.fLocations); + FSLocations* locs + = reinterpret_cast(values[3].fData.fLocations); fs->fPath = strdup(locs->fRootPath); } else @@ -230,8 +230,8 @@ FileSystem::Migrate(const RPC::Server* serv) if (result != B_OK) return result; - FSLocations* locs = - reinterpret_cast(values[0].fData.fLocations); + FSLocations* locs + = reinterpret_cast(values[0].fData.fLocations); RPC::Server* server = fServer; PeerAddress addr = fServer->ID(); diff --git a/src/add-ons/kernel/file_systems/nfs4/Inode.cpp b/src/add-ons/kernel/file_systems/nfs4/Inode.cpp index 00837a5b89..2a7705403c 100644 --- a/src/add-ons/kernel/file_systems/nfs4/Inode.cpp +++ b/src/add-ons/kernel/file_systems/nfs4/Inode.cpp @@ -39,7 +39,7 @@ Inode::Inode() status_t -Inode::CreateInode(FileSystem* fs, const FileInfo &fi, Inode** _inode) +Inode::CreateInode(FileSystem* fs, const FileInfo& fi, Inode** _inode) { Inode* inode = NULL; if (fs->Root() == NULL) @@ -104,8 +104,8 @@ Inode::CreateInode(FileSystem* fs, const FileInfo &fi, Inode** _inode) size = values[2].fData.fValue64; // FATTR4_FSID is mandatory - FileSystemId* fsid = - reinterpret_cast(values[3].fData.fPointer); + FileSystemId* fsid + = reinterpret_cast(values[3].fData.fPointer); if (*fsid != fs->FsId()) { delete[] values; return B_ENTRY_NOT_FOUND; @@ -653,6 +653,7 @@ Inode::CheckLockType(short ltype, uint32 mode) } } + status_t Inode::TestLock(OpenFileCookie* cookie, struct flock* lock) { @@ -685,6 +686,7 @@ Inode::TestLock(OpenFileCookie* cookie, struct flock* lock) return B_OK; } + status_t Inode::AcquireLock(OpenFileCookie* cookie, const struct flock* lock, bool wait) diff --git a/src/add-ons/kernel/file_systems/nfs4/Inode.h b/src/add-ons/kernel/file_systems/nfs4/Inode.h index 6a89c949e7..1201d2857e 100644 --- a/src/add-ons/kernel/file_systems/nfs4/Inode.h +++ b/src/add-ons/kernel/file_systems/nfs4/Inode.h @@ -82,12 +82,12 @@ public: status_t Read(OpenFileCookie* cookie, off_t pos, void* buffer, size_t* length); status_t Write(OpenFileCookie* cookie, off_t pos, - const void* buffer, size_t *_length); + const void* buffer, size_t* _length); status_t ReadDirect(OpenStateCookie* cookie, off_t pos, void* buffer, size_t* length, bool* eof); status_t WriteDirect(OpenStateCookie* cookie, off_t pos, - const void* buffer, size_t *_length); + const void* buffer, size_t* _length); status_t CreateDir(const char* name, int mode); status_t OpenDir(OpenDirCookie* cookie); diff --git a/src/add-ons/kernel/file_systems/nfs4/InodeDir.cpp b/src/add-ons/kernel/file_systems/nfs4/InodeDir.cpp index 3627468dd2..7e374c3448 100644 --- a/src/add-ons/kernel/file_systems/nfs4/InodeDir.cpp +++ b/src/add-ons/kernel/file_systems/nfs4/InodeDir.cpp @@ -210,7 +210,6 @@ FileToAttrName(const char* path) } - status_t Inode::GetDirSnapshot(DirectoryCacheSnapshot** _snapshot, OpenDirCookie* cookie, uint64* _change, bool attribute) diff --git a/src/add-ons/kernel/file_systems/nfs4/InodeRegular.cpp b/src/add-ons/kernel/file_systems/nfs4/InodeRegular.cpp index a9243ffcbd..811013fb7c 100644 --- a/src/add-ons/kernel/file_systems/nfs4/InodeRegular.cpp +++ b/src/add-ons/kernel/file_systems/nfs4/InodeRegular.cpp @@ -284,8 +284,8 @@ Inode::CloseAttr(OpenAttrCookie* cookie) status_t -Inode::ReadDirect(OpenStateCookie* cookie, off_t pos, void* buffer, size_t* _length, - bool* eof) +Inode::ReadDirect(OpenStateCookie* cookie, off_t pos, void* buffer, + size_t* _length, bool* eof) { *eof = false; uint32 size = 0; @@ -327,7 +327,7 @@ Inode::Read(OpenFileCookie* cookie, off_t pos, void* buffer, size_t* _length) status_t Inode::WriteDirect(OpenStateCookie* cookie, off_t pos, const void* _buffer, - size_t *_length) + size_t* _length) { uint32 size = 0; const char* buffer = reinterpret_cast(_buffer); @@ -370,7 +370,7 @@ Inode::WriteDirect(OpenStateCookie* cookie, off_t pos, const void* _buffer, status_t Inode::Write(OpenFileCookie* cookie, off_t pos, const void* _buffer, - size_t *_length) + size_t* _length) { struct stat st; status_t result = Stat(&st); diff --git a/src/add-ons/kernel/file_systems/nfs4/NFS4Defs.h b/src/add-ons/kernel/file_systems/nfs4/NFS4Defs.h index 236d37742f..aab14e6596 100644 --- a/src/add-ons/kernel/file_systems/nfs4/NFS4Defs.h +++ b/src/add-ons/kernel/file_systems/nfs4/NFS4Defs.h @@ -153,15 +153,15 @@ static inline bool sIsAttrSet(Attribute attr, const uint32* bitmap, enum FileType { - NF4REG = 1, /* Regular File */ - NF4DIR = 2, /* Directory */ - NF4BLK = 3, /* Special File - block device */ - NF4CHR = 4, /* Special File - character device */ - NF4LNK = 5, /* Symbolic Link */ - NF4SOCK = 6, /* Special File - socket */ - NF4FIFO = 7, /* Special File - fifo */ - NF4ATTRDIR = 8, /* Attribute Directory */ - NF4NAMEDATTR = 9 /* Named Attribute */ + NF4REG = 1, /* Regular File */ + NF4DIR = 2, /* Directory */ + NF4BLK = 3, /* Special File - block device */ + NF4CHR = 4, /* Special File - character device */ + NF4LNK = 5, /* Symbolic Link */ + NF4SOCK = 6, /* Special File - socket */ + NF4FIFO = 7, /* Special File - fifo */ + NF4ATTRDIR = 8, /* Attribute Directory */ + NF4NAMEDATTR = 9 /* Named Attribute */ }; static const mode_t sNFSFileTypeToHaiku[] = { diff --git a/src/add-ons/kernel/file_systems/nfs4/NFS4Inode.cpp b/src/add-ons/kernel/file_systems/nfs4/NFS4Inode.cpp index dd590085fa..73d176bc6f 100644 --- a/src/add-ons/kernel/file_systems/nfs4/NFS4Inode.cpp +++ b/src/add-ons/kernel/file_systems/nfs4/NFS4Inode.cpp @@ -173,8 +173,8 @@ NFS4Inode::LookUp(const char* name, uint64* change, uint64* fileID, return result; // FATTR4_FSID is mandatory - FileSystemId* fsid = - reinterpret_cast(values[0].fData.fPointer); + FileSystemId* fsid + = reinterpret_cast(values[0].fData.fPointer); if (*fsid != fFileSystem->FsId()) { delete[] values; return B_ENTRY_NOT_FOUND; @@ -562,8 +562,8 @@ NFS4Inode::OpenFile(OpenState* state, int mode, OpenDelegationData* delegation) // Verify if the file we want to open is the file this Inode // represents. - if (fFileSystem->IsAttrSupported(FATTR4_FILEID) || - fFileSystem->ExpireType() == FH4_PERSISTENT) { + if (fFileSystem->IsAttrSupported(FATTR4_FILEID) + || fFileSystem->ExpireType() == FH4_PERSISTENT) { reply.PutFH(); result = reply.LookUp(); if (result != B_OK) { @@ -1004,7 +1004,7 @@ NFS4Inode::TestLock(OpenFileCookie* cookie, LockType* type, uint64* position, if (result != B_OK) return result; - ReplyInterpreter &reply = request.Reply(); + ReplyInterpreter& reply = request.Reply(); if (HandleErrors(reply.NFS4Error(), serv, cookie)) continue; @@ -1043,7 +1043,7 @@ NFS4Inode::AcquireLock(OpenFileCookie* cookie, LockInfo* lockInfo, bool wait) return result; } - ReplyInterpreter &reply = request.Reply(); + ReplyInterpreter& reply = request.Reply(); sequence += IncrementSequence(reply.NFS4Error()); @@ -1087,7 +1087,7 @@ NFS4Inode::ReleaseLock(OpenFileCookie* cookie, LockInfo* lockInfo) if (result != B_OK) return result; - ReplyInterpreter &reply = request.Reply(); + ReplyInterpreter& reply = request.Reply(); reply.PutFH(); result = reply.LockU(lockInfo); diff --git a/src/add-ons/kernel/file_systems/nfs4/NFS4Server.cpp b/src/add-ons/kernel/file_systems/nfs4/NFS4Server.cpp index 8a39021bd8..c7f5ee285c 100644 --- a/src/add-ons/kernel/file_systems/nfs4/NFS4Server.cpp +++ b/src/add-ons/kernel/file_systems/nfs4/NFS4Server.cpp @@ -209,7 +209,7 @@ NFS4Server::_StartRenewing() fThreadCancel = false; fThread = spawn_kernel_thread(&NFS4Server::_RenewalThreadStart, - "NFSv4 Renewal", B_NORMAL_PRIORITY, this); + "NFSv4 Renewal", B_NORMAL_PRIORITY, this); if (fThread < B_OK) return fThread; diff --git a/src/add-ons/kernel/file_systems/nfs4/OpenState.cpp b/src/add-ons/kernel/file_systems/nfs4/OpenState.cpp index 1655c79170..c02ffb0d74 100644 --- a/src/add-ons/kernel/file_systems/nfs4/OpenState.cpp +++ b/src/add-ons/kernel/file_systems/nfs4/OpenState.cpp @@ -123,7 +123,7 @@ OpenState::_ReleaseLockOwner(LockOwner* owner) if (result != B_OK) return result; - ReplyInterpreter &reply = request.Reply(); + ReplyInterpreter& reply = request.Reply(); if (HandleErrors(reply.NFS4Error(), server)) continue; @@ -191,7 +191,7 @@ OpenState::_ReclaimOpen(uint64 newClientID) result = reply.Open(fStateID, &fStateSeq, &confirm, &delegation); if (result != B_OK) { - fFileSystem->OpenOwnerSequenceUnlock(sequence); + fFileSystem->OpenOwnerSequenceUnlock(sequence); return result; } @@ -241,7 +241,7 @@ OpenState::_ReclaimLocks(uint64 newClientID) if (result != B_OK) break; - ReplyInterpreter &reply = request.Reply(); + ReplyInterpreter& reply = request.Reply(); if (HandleErrors(reply.NFS4Error(), server)) continue; diff --git a/src/add-ons/kernel/file_systems/nfs4/RPCCallbackRequest.cpp b/src/add-ons/kernel/file_systems/nfs4/RPCCallbackRequest.cpp index 90fce4d550..7ed177326e 100644 --- a/src/add-ons/kernel/file_systems/nfs4/RPCCallbackRequest.cpp +++ b/src/add-ons/kernel/file_systems/nfs4/RPCCallbackRequest.cpp @@ -18,7 +18,7 @@ using namespace RPC; -CallbackRequest::CallbackRequest(void *buffer, int size) +CallbackRequest::CallbackRequest(void* buffer, int size) : fError(B_BAD_VALUE), fRPCError(GARBAGE_ARGS), diff --git a/src/add-ons/kernel/file_systems/nfs4/RPCCallbackRequest.h b/src/add-ons/kernel/file_systems/nfs4/RPCCallbackRequest.h index 01518f3b6c..19e2e006c5 100644 --- a/src/add-ons/kernel/file_systems/nfs4/RPCCallbackRequest.h +++ b/src/add-ons/kernel/file_systems/nfs4/RPCCallbackRequest.h @@ -17,7 +17,7 @@ namespace RPC { class CallbackRequest { public: - CallbackRequest(void *buffer, int size); + CallbackRequest(void* buffer, int size); ~CallbackRequest(); inline uint32 XID(); diff --git a/src/add-ons/kernel/file_systems/nfs4/RPCDefs.h b/src/add-ons/kernel/file_systems/nfs4/RPCDefs.h index bd551a69b5..3363eaeb66 100644 --- a/src/add-ons/kernel/file_systems/nfs4/RPCDefs.h +++ b/src/add-ons/kernel/file_systems/nfs4/RPCDefs.h @@ -36,17 +36,17 @@ enum { }; enum AcceptStat { - SUCCESS = 0, /* RPC executed successfully */ - PROG_UNAVAIL = 1, /* remote hasn't exported program */ - PROG_MISMATCH = 2, /* remote can't support version # */ - PROC_UNAVAIL = 3, /* program can't support procedure */ - GARBAGE_ARGS = 4, /* procedure can't decode params */ - SYSTEM_ERR = 5 /* e.g. memory allocation failure */ + SUCCESS = 0, /* RPC executed successfully */ + PROG_UNAVAIL = 1, /* remote hasn't exported program */ + PROG_MISMATCH = 2, /* remote can't support version # */ + PROC_UNAVAIL = 3, /* program can't support procedure */ + GARBAGE_ARGS = 4, /* procedure can't decode params */ + SYSTEM_ERR = 5 /* e.g. memory allocation failure */ }; enum RejectStat { - RPC_MISMATCH = 0, /* RPC version number != 2 */ - AUTH_ERROR = 1 /* remote can't authenticate caller */ + RPC_MISMATCH = 0, /* RPC version number != 2 */ + AUTH_ERROR = 1 /* remote can't authenticate caller */ }; enum AuthFlavour { diff --git a/src/add-ons/kernel/file_systems/nfs4/RPCReply.cpp b/src/add-ons/kernel/file_systems/nfs4/RPCReply.cpp index 3f61357e09..4166d4e24c 100644 --- a/src/add-ons/kernel/file_systems/nfs4/RPCReply.cpp +++ b/src/add-ons/kernel/file_systems/nfs4/RPCReply.cpp @@ -17,7 +17,7 @@ using namespace RPC; -Reply::Reply(void *buffer, int size) +Reply::Reply(void* buffer, int size) : fError(B_OK), fStream(buffer, size), diff --git a/src/add-ons/kernel/file_systems/nfs4/RPCReply.h b/src/add-ons/kernel/file_systems/nfs4/RPCReply.h index 6d688d89bf..50a200b3b8 100644 --- a/src/add-ons/kernel/file_systems/nfs4/RPCReply.h +++ b/src/add-ons/kernel/file_systems/nfs4/RPCReply.h @@ -16,7 +16,7 @@ namespace RPC { class Reply { public: - Reply(void *buffer, int size); + Reply(void* buffer, int size); ~Reply(); inline uint32 GetXID(); diff --git a/src/add-ons/kernel/file_systems/nfs4/ReplyInterpreter.cpp b/src/add-ons/kernel/file_systems/nfs4/ReplyInterpreter.cpp index 4ed2023277..14b8df860a 100644 --- a/src/add-ons/kernel/file_systems/nfs4/ReplyInterpreter.cpp +++ b/src/add-ons/kernel/file_systems/nfs4/ReplyInterpreter.cpp @@ -158,7 +158,6 @@ ReplyInterpreter::Create(uint64* before, uint64* after, bool& atomic) } - // Bit Twiddling Hacks // http://graphics.stanford.edu/~seander/bithacks.html static inline uint32 CountBits(uint32 v) @@ -555,7 +554,7 @@ ReplyInterpreter::_DecodeAttrs(XDR::ReadStream& str, AttrValue** attrs, uint32* count) { uint32 bcount = fReply->Stream().GetUInt(); - uint32 *bitmap = new(std::nothrow) uint32[bcount]; + uint32* bitmap = new(std::nothrow) uint32[bcount]; if (bitmap == NULL) return B_NO_MEMORY; @@ -667,8 +666,8 @@ ReplyInterpreter::_DecodeAttrs(XDR::ReadStream& str, AttrValue** attrs, for (uint32 i = 0; i < locs->fCount; i++) { locs->fLocations[i].fRootPath = sFlattenPathname(stream); locs->fLocations[i].fCount = stream.GetUInt(); - locs->fLocations[i].fLocations = - new const char*[locs->fLocations[i].fCount]; + locs->fLocations[i].fLocations + = new const char*[locs->fLocations[i].fCount]; for (uint32 j = 0; j < locs->fLocations[i].fCount; j++) locs->fLocations[i].fLocations[j] = stream.GetString(); } diff --git a/src/add-ons/kernel/file_systems/nfs4/Request.cpp b/src/add-ons/kernel/file_systems/nfs4/Request.cpp index d68d5b2176..3924f3bc03 100644 --- a/src/add-ons/kernel/file_systems/nfs4/Request.cpp +++ b/src/add-ons/kernel/file_systems/nfs4/Request.cpp @@ -28,8 +28,8 @@ Request::Send(Cookie* cookie) status_t Request::_SendUDP(Cookie* cookie) { - RPC::Reply *rpl = NULL; - RPC::Request *rpc; + RPC::Reply* rpl = NULL; + RPC::Request* rpc; status_t result = fServer->SendCallAsync(fBuilder.Request(), &rpl, &rpc); if (result != B_OK) @@ -87,8 +87,8 @@ Request::_SendUDP(Cookie* cookie) status_t Request::_SendTCP(Cookie* cookie) { - RPC::Reply *rpl = NULL; - RPC::Request *rpc; + RPC::Reply* rpl = NULL; + RPC::Request* rpc; status_t result; int attempts = 0; diff --git a/src/add-ons/kernel/file_systems/nfs4/RequestBuilder.cpp b/src/add-ons/kernel/file_systems/nfs4/RequestBuilder.cpp index 306e680aa8..3b8f69e376 100644 --- a/src/add-ons/kernel/file_systems/nfs4/RequestBuilder.cpp +++ b/src/add-ons/kernel/file_systems/nfs4/RequestBuilder.cpp @@ -837,8 +837,8 @@ RequestBuilder::_EncodeAttrs(XDR::WriteStream& stream, AttrValue* attr, return; } - Attribute* attrs = - reinterpret_cast(malloc(sizeof(Attribute) * count)); + Attribute* attrs + = reinterpret_cast(malloc(sizeof(Attribute) * count)); for (uint32 i = 0; i < count; i++) attrs[i] = static_cast(attr[i].fAttribute); _AttrBitmap(stream, attrs, count); @@ -885,8 +885,8 @@ RequestBuilder::_EncodeAttrs(XDR::WriteStream& stream, AttrValue* attr, if (i < count && attr[i].fAttribute == FATTR4_TIME_ACCESS_SET) { str.AddInt(1); // SET_TO_CLIENT_TIME4 - struct timespec* ts = - reinterpret_cast(attr[i].fData.fPointer); + struct timespec* ts + = reinterpret_cast(attr[i].fData.fPointer); str.AddHyper(ts->tv_sec); str.AddUInt(ts->tv_nsec); @@ -896,8 +896,8 @@ RequestBuilder::_EncodeAttrs(XDR::WriteStream& stream, AttrValue* attr, if (i < count && attr[i].fAttribute == FATTR4_TIME_MODIFY_SET) { str.AddInt(1); // SET_TO_CLIENT_TIME4 - struct timespec* ts = - reinterpret_cast(attr[i].fData.fPointer); + struct timespec* ts + = reinterpret_cast(attr[i].fData.fPointer); str.AddHyper(ts->tv_sec); str.AddUInt(ts->tv_nsec); diff --git a/src/add-ons/kernel/file_systems/nfs4/WorkQueue.cpp b/src/add-ons/kernel/file_systems/nfs4/WorkQueue.cpp index c576b96896..9a19120966 100644 --- a/src/add-ons/kernel/file_systems/nfs4/WorkQueue.cpp +++ b/src/add-ons/kernel/file_systems/nfs4/WorkQueue.cpp @@ -94,8 +94,8 @@ WorkQueue::WorkingThread() status_t result = wait_for_objects(object, 2); - if (result < B_OK || - (object[0].events & B_EVENT_ACQUIRE_SEMAPHORE) != 0) { + if (result < B_OK + || (object[0].events & B_EVENT_ACQUIRE_SEMAPHORE) != 0) { return result; } else if ((object[1].events & B_EVENT_ACQUIRE_SEMAPHORE) == 0) continue; diff --git a/src/add-ons/kernel/file_systems/nfs4/XDR.cpp b/src/add-ons/kernel/file_systems/nfs4/XDR.cpp index 9cc116d393..86a6462525 100644 --- a/src/add-ons/kernel/file_systems/nfs4/XDR.cpp +++ b/src/add-ons/kernel/file_systems/nfs4/XDR.cpp @@ -277,7 +277,7 @@ WriteStream::AddString(const char* str, uint32 maxlen) status_t -WriteStream::AddOpaque(const void *ptr, uint32 size) +WriteStream::AddOpaque(const void* ptr, uint32 size) { uint32 real_size = _RealSize(size); status_t err = _CheckResize(real_size + sizeof(uint32)); diff --git a/src/add-ons/kernel/file_systems/nfs4/kernel_interface.cpp b/src/add-ons/kernel/file_systems/nfs4/kernel_interface.cpp index 9958fa02e6..861b14d9dd 100644 --- a/src/add-ons/kernel/file_systems/nfs4/kernel_interface.cpp +++ b/src/add-ons/kernel/file_systems/nfs4/kernel_interface.cpp @@ -132,13 +132,13 @@ nfs4_mount(fs_volume* volume, const char* device, uint32 flags, PeerAddress address; MountConfiguration config; - char *path; + char* path; result = ParseArguments(args, &address, &path, &config); if (result != B_OK) return result; MemoryDeleter pathDeleter(path); - RPC::Server *server; + RPC::Server* server; result = gRPCServerManager->Acquire(&server, address, CreateNFS4Server); if (result != B_OK) return result; @@ -1065,7 +1065,7 @@ static file_system_module_info sNFSv4ModuleInfo = { }; module_info* modules[] = { - (module_info* )&sNFSv4ModuleInfo, + (module_info*)&sNFSv4ModuleInfo, NULL, }; diff --git a/src/add-ons/kernel/network/dns_resolver/kernel_add_on/dns_resolver.cpp b/src/add-ons/kernel/network/dns_resolver/kernel_add_on/dns_resolver.cpp index 6c1e0c9872..476b3948fd 100644 --- a/src/add-ons/kernel/network/dns_resolver/kernel_add_on/dns_resolver.cpp +++ b/src/add-ons/kernel/network/dns_resolver/kernel_add_on/dns_resolver.cpp @@ -105,16 +105,16 @@ RelocateEntries(struct addrinfo* addr) uint64 nextOffset = reinterpret_cast(current->ai_next); if (current->ai_addr != NULL) { - current->ai_addr = - reinterpret_cast(generalOffset + addrOffset); + current->ai_addr + = reinterpret_cast(generalOffset + addrOffset); } if (current->ai_canonname != NULL) current->ai_canonname = generalOffset + nameOffset; if (current->ai_next != NULL) { - current->ai_next = - reinterpret_cast(generalOffset + nextOffset); + current->ai_next + = reinterpret_cast(generalOffset + nextOffset); } current = current->ai_next; @@ -150,8 +150,8 @@ GetAddrInfo(const char* node, const char* service, if (hints != NULL) memcpy(buffer + off, hints, sizeof(*hints)); else { - struct addrinfo *nullHints = - reinterpret_cast(buffer + off); + struct addrinfo *nullHints + = reinterpret_cast(buffer + off); memset(nullHints, 0, sizeof(*nullHints)); nullHints->ai_family = AF_UNSPEC; } @@ -190,7 +190,7 @@ GetAddrInfo(const char* node, const char* service, continue; } - struct addrinfo *addr; + struct addrinfo* addr; switch (code) { case MsgReply: addr = reinterpret_cast(reply); @@ -223,6 +223,7 @@ dns_resolver_std_ops(int32 op, ...) } } + static dns_resolver_module sDNSResolverModule = { { DNS_RESOLVER_MODULE_NAME, diff --git a/src/add-ons/kernel/network/dns_resolver/server/main.cpp b/src/add-ons/kernel/network/dns_resolver/server/main.cpp index 8082488f5a..c5519fe1a9 100644 --- a/src/add-ons/kernel/network/dns_resolver/server/main.cpp +++ b/src/add-ons/kernel/network/dns_resolver/server/main.cpp @@ -33,8 +33,8 @@ GetAddrInfo(const char* buffer) const char* service = buffer[nodeSize] == '\0' ? NULL : buffer + nodeSize; uint32 serviceSize = service != NULL ? strlen(service) + 1 : 1; - const struct addrinfo* hints = - reinterpret_cast(buffer + nodeSize + serviceSize); + const struct addrinfo* hints + = reinterpret_cast(buffer + nodeSize + serviceSize); struct addrinfo* ai; status_t result = getaddrinfo(node, service, hints, &ai);