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

Some renaming.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20207 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2007-02-23 02:19:41 +00:00
parent e0f723a9e1
commit b9a1530f6d
5 changed files with 36 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/ramfs/Directory.cpp
+1 -1
View File
@@ -280,7 +280,7 @@ Directory::FindAndGetNode(const char *name, Node **node, Entry **_entry) const
*node = entry->GetNode(); *node = entry->GetNode();
if (_entry) if (_entry)
*_entry = entry; *_entry = entry;
error = GetVolume()->GetNode(*node); error = GetVolume()->GetVNode(*node);
} }
return error; return error;
} }
src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/ramfs/Node.cpp
+2 -2
View File
@@ -85,7 +85,7 @@ status_t
Node::AddReference() Node::AddReference()
{ {
if (++fRefCount == 1) { if (++fRefCount == 1) {
status_t error = GetVolume()->NewNode(this); status_t error = GetVolume()->NewVNode(this);
if (error != B_OK) { if (error != B_OK) {
fRefCount--; fRefCount--;
return error; return error;
@@ -102,7 +102,7 @@ void
Node::RemoveReference() Node::RemoveReference()
{ {
if (--fRefCount == 0) { if (--fRefCount == 0) {
GetVolume()->RemoveNode(this); GetVolume()->RemoveVNode(this);
fRefCount++; fRefCount++;
} }
} }
src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/ramfs/Volume.cpp
+16 -16
View File
@@ -338,9 +338,9 @@ Volume::GetName() const
return fName.GetString(); return fName.GetString();
} }
// NewNode // NewVNode
status_t status_t
Volume::NewNode(Node *node) Volume::NewVNode(Node *node)
{ {
status_t error = NodeAdded(node); status_t error = NodeAdded(node);
if (error == B_OK) { if (error == B_OK) {
@@ -351,45 +351,45 @@ Volume::NewNode(Node *node)
return error; return error;
} }
// GetNode // GetVNode
status_t status_t
Volume::GetNode(vnode_id id, Node **node) Volume::GetVNode(vnode_id id, Node **node)
{ {
return (fMounted ? get_vnode(GetID(), id, (void**)node) : B_BAD_VALUE); return (fMounted ? get_vnode(GetID(), id, (void**)node) : B_BAD_VALUE);
} }
// GetNode // GetVNode
status_t status_t
Volume::GetNode(Node *node) Volume::GetVNode(Node *node)
{ {
Node *dummy = NULL; Node *dummy = NULL;
status_t error = (fMounted ? GetNode(node->GetID(), &dummy) status_t error = (fMounted ? GetVNode(node->GetID(), &dummy)
: B_BAD_VALUE ); : B_BAD_VALUE );
if (error == B_OK && dummy != node) { if (error == B_OK && dummy != node) {
FATAL(("Two Nodes have the same ID: %Ld!\n", node->GetID())); FATAL(("Two Nodes have the same ID: %Ld!\n", node->GetID()));
PutNode(dummy); PutVNode(dummy);
error = B_ERROR; error = B_ERROR;
} }
return error; return error;
} }
// PutNode // PutVNode
status_t status_t
Volume::PutNode(vnode_id id) Volume::PutVNode(vnode_id id)
{ {
return (fMounted ? put_vnode(GetID(), id) : B_BAD_VALUE); return (fMounted ? put_vnode(GetID(), id) : B_BAD_VALUE);
} }
// PutNode // PutVNode
status_t status_t
Volume::PutNode(Node *node) Volume::PutVNode(Node *node)
{ {
return (fMounted ? put_vnode(GetID(), node->GetID()) : B_BAD_VALUE); return (fMounted ? put_vnode(GetID(), node->GetID()) : B_BAD_VALUE);
} }
// RemoveNode // RemoveVNode
status_t status_t
Volume::RemoveNode(Node *node) Volume::RemoveVNode(Node *node)
{ {
if (fMounted) if (fMounted)
return remove_vnode(GetID(), node->GetID()); return remove_vnode(GetID(), node->GetID());
@@ -399,9 +399,9 @@ Volume::RemoveNode(Node *node)
return error; return error;
} }
// UnremoveNode // UnremoveVNode
status_t status_t
Volume::UnremoveNode(Node *node) Volume::UnremoveVNode(Node *node)
{ {
return (fMounted ? unremove_vnode(GetID(), node->GetID()) : B_BAD_VALUE); return (fMounted ? unremove_vnode(GetID(), node->GetID()) : B_BAD_VALUE);
} }
src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/ramfs/Volume.h
+7 -8
View File
@@ -107,14 +107,13 @@ public:
Directory *GetRootDirectory() const { return fRootDirectory; } Directory *GetRootDirectory() const { return fRootDirectory; }
// TODO: Rename these to *VNode()? status_t NewVNode(Node *node);
status_t NewNode(Node *node); status_t GetVNode(vnode_id id, Node **node);
status_t GetNode(vnode_id id, Node **node); status_t GetVNode(Node *node);
status_t GetNode(Node *node); status_t PutVNode(vnode_id id);
status_t PutNode(vnode_id id); status_t PutVNode(Node *node);
status_t PutNode(Node *node); status_t RemoveVNode(Node *node);
status_t RemoveNode(Node *node); status_t UnremoveVNode(Node *node);
status_t UnremoveNode(Node *node);
// node table and listeners // node table and listeners
status_t NodeAdded(Node *node); status_t NodeAdded(Node *node);
src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/ramfs/kernel_interface.cpp
+10 -10
View File
@@ -407,11 +407,11 @@ FUNCTION(("dir: (%Lu), entry: `%s'\n", (dir ? dir->GetID() : -1), entryName));
// special entries: "." and ".." // special entries: "." and ".."
} else if (!strcmp(entryName, ".")) { } else if (!strcmp(entryName, ".")) {
*vnid = dir->GetID(); *vnid = dir->GetID();
if (volume->GetNode(*vnid, &node) != B_OK) if (volume->GetVNode(*vnid, &node) != B_OK)
error = B_BAD_VALUE; error = B_BAD_VALUE;
} else if (!strcmp(entryName, "..")) { } else if (!strcmp(entryName, "..")) {
Directory *parent = dir->GetParent(); Directory *parent = dir->GetParent();
if (parent && volume->GetNode(parent->GetID(), &node) == B_OK) if (parent && volume->GetVNode(parent->GetID(), &node) == B_OK)
*vnid = node->GetID(); *vnid = node->GetID();
else else
error = B_BAD_VALUE; error = B_BAD_VALUE;
@@ -428,7 +428,7 @@ SET_ERROR(error, error);
*resolvedPath = strdup(symLink->GetLinkedPath()); *resolvedPath = strdup(symLink->GetLinkedPath());
if (!*resolvedPath) if (!*resolvedPath)
SET_ERROR(error, B_NO_MEMORY); SET_ERROR(error, B_NO_MEMORY);
volume->PutNode(*vnid); volume->PutVNode(*vnid);
} }
} }
} else } else
@@ -654,7 +654,7 @@ ramfs_create(void *ns, void *_dir, const char *name, int openMode,
// get vnode // get vnode
if (error == B_OK) { if (error == B_OK) {
*vnid = node->GetID(); *vnid = node->GetID();
error = volume->GetNode(node->GetID(), &node); error = volume->GetVNode(node->GetID(), &node);
} }
} }
// the user must have dir write permission to create a new entry // the user must have dir write permission to create a new entry
@@ -974,9 +974,9 @@ oldDir->GetID(), oldName, newDir->GetID(), newName));
// release the entries // release the entries
if (clobberEntry) if (clobberEntry)
volume->PutNode(clobberNode); volume->PutVNode(clobberNode);
if (entry) if (entry)
volume->PutNode(node); volume->PutVNode(node);
} }
// notify listeners // notify listeners
@@ -1062,7 +1062,7 @@ ramfs_unlink(void *ns, void *_dir, const char *name)
SET_ERROR(error, B_DIRECTORY_NOT_EMPTY); SET_ERROR(error, B_DIRECTORY_NOT_EMPTY);
} else } else
error = dir->DeleteEntry(entry); error = dir->DeleteEntry(entry);
volume->PutNode(node); volume->PutVNode(node);
} else } else
SET_ERROR(error, B_ENTRY_NOT_FOUND); SET_ERROR(error, B_ENTRY_NOT_FOUND);
} }
@@ -1108,7 +1108,7 @@ ramfs_rmdir(void *ns, void *_dir, const char *name)
SET_ERROR(error, B_DIRECTORY_NOT_EMPTY); SET_ERROR(error, B_DIRECTORY_NOT_EMPTY);
} else } else
error = dir->DeleteEntry(entry); error = dir->DeleteEntry(entry);
volume->PutNode(node); volume->PutVNode(node);
} else } else
SET_ERROR(error, B_ENTRY_NOT_FOUND); SET_ERROR(error, B_ENTRY_NOT_FOUND);
} }
@@ -1237,7 +1237,7 @@ ramfs_mkdir(void *ns, void *_dir, const char *name, int mode)
node->SetUID(geteuid()); node->SetUID(geteuid());
node->SetGID(getegid()); node->SetGID(getegid());
// put the node // put the node
volume->PutNode(node->GetID()); volume->PutVNode(node->GetID());
} }
} }
} }
@@ -1460,7 +1460,7 @@ ramfs_symlink(void *ns, void *_dir, const char *name, const char *path)
node->SetUID(geteuid()); node->SetUID(geteuid());
node->SetGID(getegid()); node->SetGID(getegid());
// put the node // put the node
volume->PutNode(node->GetID()); volume->PutVNode(node->GetID());
} }
} }
} }