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

* Removed superfluous check, and fixed wrong indentation. This also closes

Browse Source 
CID 1510.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38422 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2010-08-28 16:55:57 +00:00
parent 6195b696db
commit d2a6c05145
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/udf/kernel_interface.cpp
+18 -16
View File
@@ -5,8 +5,10 @@
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
/*! \file kernel_interface.cpp */ /*! \file kernel_interface.cpp */
#include <Drivers.h> #include <Drivers.h>
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
@@ -166,7 +168,7 @@ udf_read_fs_stat(fs_volume *_volume, struct fs_info *info)
static status_t static status_t
udf_get_vnode(fs_volume *_volume, ino_t id, fs_vnode *_node, int *_type, udf_get_vnode(fs_volume *_volume, ino_t id, fs_vnode *node, int *_type,
uint32 *_flags, bool reenter) uint32 *_flags, bool reenter)
{ {
TRACE(("udf_get_vnode: _volume = %p, _node = %p, reenter = %s\n", TRACE(("udf_get_vnode: _volume = %p, _node = %p, reenter = %s\n",
@@ -176,25 +178,25 @@ udf_get_vnode(fs_volume *_volume, ino_t id, fs_vnode *_node, int *_type,
// Convert the given vnode id to an address, and create // Convert the given vnode id to an address, and create
// and return a corresponding Icb object for it. // and return a corresponding Icb object for it.
TRACE(("udf_get_vnode: id = %Ld, blockSize = %lu\n", id, volume->BlockSize())); TRACE(("udf_get_vnode: id = %Ld, blockSize = %lu\n", id,
volume->BlockSize()));
Icb *icb = new(std::nothrow) Icb(volume, Icb *icb = new(std::nothrow) Icb(volume,
to_long_address(id, volume->BlockSize())); to_long_address(id, volume->BlockSize()));
if (icb) { if (icb == NULL)
if(icb->InitCheck() == B_OK) {
if (_node)
_node->private_node = icb;
_node->ops = &gUDFVnodeOps;
*_type = icb->Mode();
*_flags = 0;
} else {
TRACE_ERROR(("udf_get_vnode: InitCheck failed\n"));
delete icb;
return B_ERROR;
}
} else
return B_NO_MEMORY; return B_NO_MEMORY;
return B_OK; if (icb->InitCheck() == B_OK) {
node->private_node = icb;
node->ops = &gUDFVnodeOps;
*_type = icb->Mode();
*_flags = 0;
return B_OK;
}
TRACE_ERROR(("udf_get_vnode: InitCheck failed\n"));
delete icb;
return B_ERROR;
} }