Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Eliminated the extra buffer in dir_vnode_to_path(); we write directly to the

Browse Source 
specified buffer now.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34282 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2009-11-26 14:28:55 +00:00
parent 648aeae3bc
commit 7ce581d7eb
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/system/kernel/fs/vfs.cpp
View File

@ -2634,12 +2634,8 @@ dir_vnode_to_path(struct vnode* vnode, char* buffer, size_t bufferSize,
if (!S_ISDIR(vnode->type))
return B_NOT_A_DIRECTORY;
KPath pathBuffer(bufferSize);
if (pathBuffer.InitCheck() != B_OK)
return B_NO_MEMORY;
char* path = pathBuffer.LockBuffer();
int32 insert = pathBuffer.BufferSize();
char* path = buffer;
int32 insert = bufferSize;
int32 maxLevel = 256;
int32 length;
status_t status;
@ -2738,12 +2734,9 @@ dir_vnode_to_path(struct vnode* vnode, char* buffer, size_t bufferSize,
TRACE((" path is: %s\n", path + insert));
// copy the path to the output buffer
length = pathBuffer.BufferSize() - insert;
if (length <= (int)bufferSize)
memcpy(buffer, path + insert, length);
else
status = B_RESULT_NOT_REPRESENTABLE;
// move the path to the start of the buffer
length = bufferSize - insert;
memmove(buffer, path + insert, length);
out:
put_vnode(vnode);