From 85f15b4bf0968c13f0a7bc97dc507a7fce05dbdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Mon, 24 Jan 2011 21:33:20 +0000 Subject: [PATCH] * uses std::nothrow when calling new. * fix an UDF reference. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40281 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/file_systems/ext2/CRCTable.cpp | 2 +- src/add-ons/kernel/file_systems/ext2/kernel_interface.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/add-ons/kernel/file_systems/ext2/CRCTable.cpp b/src/add-ons/kernel/file_systems/ext2/CRCTable.cpp index 2732cf41fd..ea16f6120e 100644 --- a/src/add-ons/kernel/file_systems/ext2/CRCTable.cpp +++ b/src/add-ons/kernel/file_systems/ext2/CRCTable.cpp @@ -47,7 +47,7 @@ static uint16 kCrcTable[256] = { }; -/*! \brief Calculates the UDF crc checksum for the given byte stream. +/*! \brief Calculates the EXT4 crc checksum for the given byte stream. Based on crc code from UDF-2.50 6.5, as permitted. This is reversed. diff --git a/src/add-ons/kernel/file_systems/ext2/kernel_interface.cpp b/src/add-ons/kernel/file_systems/ext2/kernel_interface.cpp index e32086e398..ffb20cad3c 100644 --- a/src/add-ons/kernel/file_systems/ext2/kernel_interface.cpp +++ b/src/add-ons/kernel/file_systems/ext2/kernel_interface.cpp @@ -119,7 +119,7 @@ static status_t ext2_mount(fs_volume* _volume, const char* device, uint32 flags, const char* args, ino_t* _rootID) { - Volume* volume = new Volume(_volume); + Volume* volume = new(std::nothrow) Volume(_volume); if (volume == NULL) return B_NO_MEMORY; @@ -221,7 +221,7 @@ ext2_get_vnode(fs_volume* _volume, ino_t id, fs_vnode* _node, int* _type, return B_BAD_VALUE; } - Inode* inode = new Inode(volume, id); + Inode* inode = new(std::nothrow) Inode(volume, id); if (inode == NULL) return B_NO_MEMORY;