i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nfs4: Fix coding style

Browse Source 
No functional change intended.
This commit is contained in:
Pawel Dziepak
2014-02-21 04:19:00 +01:00
parent e1be7a26a4
commit 90213f44ac
1 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/nfs4/Cookie.cpp
+29 -29
View File
@@ -52,9 +52,9 @@ LockInfo::operator==(const struct flock& lock) const
{ {
bool eof = lock.l_len + lock.l_start == OFF_MAX; bool eof = lock.l_len + lock.l_start == OFF_MAX;
uint64 start = static_cast<uint64>(lock.l_start); uint64 start = static_cast<uint64>(lock.l_start);
uint64 len = static_cast<uint64>(lock.l_len); uint64 length = static_cast<uint64>(lock.l_len);
return fStart == start && (fLength == len return fStart == start && (fLength == length
|| (eof && fLength == UINT64_MAX)); || (eof && fLength == UINT64_MAX));
} }
@@ -86,43 +86,43 @@ Cookie::~Cookie()
status_t status_t
Cookie::RegisterRequest(RPC::Request* req) Cookie::RegisterRequest(RPC::Request* request)
{ {
ASSERT(req != NULL); ASSERT(request != NULL);
RequestEntry* ent = new RequestEntry; RequestEntry* entry = new RequestEntry;
if (ent == NULL) if (entry == NULL)
return B_NO_MEMORY; return B_NO_MEMORY;
MutexLocker _(fRequestLock); MutexLocker _(fRequestLock);
ent->fRequest = req; entry->fRequest = request;
ent->fNext = fRequests; entry->fNext = fRequests;
fRequests = ent; fRequests = entry;
return B_OK; return B_OK;
} }
status_t status_t
Cookie::UnregisterRequest(RPC::Request* req) Cookie::UnregisterRequest(RPC::Request* request)
{ {
ASSERT(req != NULL); ASSERT(request != NULL);
MutexLocker _(fRequestLock); MutexLocker _(fRequestLock);
RequestEntry* ent = fRequests; RequestEntry* entry = fRequests;
RequestEntry* prev = NULL; RequestEntry* previous = NULL;
while (ent != NULL) { while (entry != NULL) {
if (ent->fRequest == req) { if (entry->fRequest == request) {
if (prev == NULL) if (previous == NULL)
fRequests = ent->fNext; fRequests = entry->fNext;
else else
prev->fNext = ent->fNext; previous->fNext = entry->fNext;
delete ent; delete entry;
break; break;
} }
prev = ent; previous = entry;
ent = ent->fNext; entry = entry->fNext;
} }
return B_OK; return B_OK;
@@ -135,10 +135,10 @@ Cookie::CancelAll()
release_sem(fSnoozeCancel); release_sem(fSnoozeCancel);
MutexLocker _(fRequestLock); MutexLocker _(fRequestLock);
RequestEntry* ent = fRequests; RequestEntry* entry = fRequests;
while (ent != NULL) { while (entry != NULL) {
fFileSystem->Server()->WakeCall(ent->fRequest); fFileSystem->Server()->WakeCall(entry->fRequest);
ent = ent->fNext; entry = entry->fNext;
} }
return B_OK; return B_OK;
@@ -171,12 +171,12 @@ OpenFileCookie::AddLock(LockInfo* lock)
void void
OpenFileCookie::RemoveLock(LockInfo* lock, LockInfo* prev) OpenFileCookie::RemoveLock(LockInfo* lock, LockInfo* previous)
{ {
if (prev != NULL) if (previous != NULL)
prev->fCookieNext = lock->fCookieNext; previous->fCookieNext = lock->fCookieNext;
else { else {
ASSERT(prev == NULL && fLocks == lock); ASSERT(previous == NULL && fLocks == lock);
fLocks = lock->fCookieNext; fLocks = lock->fCookieNext;
} }
} }