From c4718ea973dc20d96ddf1c8b164ed5ca514b8ca5 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Mon, 12 Jan 2015 09:46:40 +0100
Subject: [PATCH] Missing std::nothrow on new

Forgot to add this when migrating to BOpenHashTable.
---
 src/add-ons/kernel/file_cache/rule_based_prefetcher.cpp   | 4 ++--
 src/add-ons/kernel/network/datalink_protocols/arp/arp.cpp | 2 +-
 .../datalink_protocols/ipv6_datagram/ipv6_datagram.cpp    | 2 +-
 src/add-ons/kernel/network/stack/stack.cpp                | 8 ++++----
 src/system/kernel/device_manager/devfs.cpp                | 4 ++--
 src/system/kernel/elf.cpp                                 | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/add-ons/kernel/file_cache/rule_based_prefetcher.cpp b/src/add-ons/kernel/file_cache/rule_based_prefetcher.cpp
index 0f4525b80d..322359fba4 100644
--- a/src/add-ons/kernel/file_cache/rule_based_prefetcher.cpp
+++ b/src/add-ons/kernel/file_cache/rule_based_prefetcher.cpp
@@ -753,13 +753,13 @@ uninit()
 static status_t
 init()
 {
-	sTeamHash = new TeamTable();
+	sTeamHash = new(std::nothrow) TeamTable();
 	if (sTeamHash == NULL || sTeamHash->Init(64) != B_OK)
 		return B_NO_MEMORY;
 
 	status_t status;
 
-	sRulesHash = new RuleTable();
+	sRulesHash = new(std::nothrow) RuleTable();
 	if (sRulesHash == NULL || sRulesHash->Init(64) != B_OK) {
 		delete sTeamHash;
 		return B_NO_MEMORY;
diff --git a/src/add-ons/kernel/network/datalink_protocols/arp/arp.cpp b/src/add-ons/kernel/network/datalink_protocols/arp/arp.cpp
index 48283dbb07..9f7fd8bfbb 100644
--- a/src/add-ons/kernel/network/datalink_protocols/arp/arp.cpp
+++ b/src/add-ons/kernel/network/datalink_protocols/arp/arp.cpp
@@ -944,7 +944,7 @@ arp_init()
 {
 	mutex_init(&sCacheLock, "arp cache");
 
-	sCache = new AddressCache();
+	sCache = new(std::nothrow) AddressCache();
 	if (sCache == NULL || sCache->Init(64) != B_OK) {
 		mutex_destroy(&sCacheLock);
 		return B_NO_MEMORY;
diff --git a/src/add-ons/kernel/network/datalink_protocols/ipv6_datagram/ipv6_datagram.cpp b/src/add-ons/kernel/network/datalink_protocols/ipv6_datagram/ipv6_datagram.cpp
index 65564a42a2..c81b330636 100644
--- a/src/add-ons/kernel/network/datalink_protocols/ipv6_datagram/ipv6_datagram.cpp
+++ b/src/add-ons/kernel/network/datalink_protocols/ipv6_datagram/ipv6_datagram.cpp
@@ -407,7 +407,7 @@ ndp_init()
 
 	mutex_init(&sCacheLock, "ndp cache");
 
-	sCache = new AddressCache();
+	sCache = new(std::nothrow) AddressCache();
 	if (sCache == NULL || sCache->Init(64) != B_OK) {
 		mutex_destroy(&sCacheLock);
 		return B_NO_MEMORY;
diff --git a/src/add-ons/kernel/network/stack/stack.cpp b/src/add-ons/kernel/network/stack/stack.cpp
index f935bcc36b..7151ace2ba 100644
--- a/src/add-ons/kernel/network/stack/stack.cpp
+++ b/src/add-ons/kernel/network/stack/stack.cpp
@@ -798,26 +798,26 @@ init_stack()
 	mutex_init(&sChainLock, "net chains");
 	mutex_init(&sInitializeChainLock, "net intialize chains");
 
-	sFamilies = new FamilyTable();
+	sFamilies = new(std::nothrow) FamilyTable();
 	if (sFamilies == NULL || sFamilies->Init(10) != B_OK) {
 		status = B_NO_MEMORY;
 		goto err5;
 	}
 
-	sProtocolChains = new ChainTable();
+	sProtocolChains = new(std::nothrow) ChainTable();
 	if (sProtocolChains == NULL || sProtocolChains->Init(10) != B_OK) {
 		status = B_NO_MEMORY;
 		goto err6;
 	}
 
-	sDatalinkProtocolChains = new ChainTable();
+	sDatalinkProtocolChains = new(std::nothrow) ChainTable();
 	if (sDatalinkProtocolChains == NULL
 			|| sDatalinkProtocolChains->Init(10) != B_OK) {
 		status = B_NO_MEMORY;
 		goto err7;
 	}
 
-	sReceivingProtocolChains = new ChainTable();
+	sReceivingProtocolChains = new(std::nothrow) ChainTable();
 	if (sReceivingProtocolChains == NULL
 			|| sReceivingProtocolChains->Init(10) != B_OK) {
 		status = B_NO_MEMORY;
diff --git a/src/system/kernel/device_manager/devfs.cpp b/src/system/kernel/device_manager/devfs.cpp
index 1b6f6e5406..7876ae3754 100644
--- a/src/system/kernel/device_manager/devfs.cpp
+++ b/src/system/kernel/device_manager/devfs.cpp
@@ -887,7 +887,7 @@ devfs_mount(fs_volume* volume, const char* devfs, uint32 flags,
 	if (fs == NULL) {
 		err = B_NO_MEMORY;
 		goto err;
- 	}
+	}
 
 	volume->private_volume = fs;
 	volume->ops = &kVolumeOps;
@@ -897,7 +897,7 @@ devfs_mount(fs_volume* volume, const char* devfs, uint32 flags,
 
 	recursive_lock_init(&fs->lock, "devfs lock");
 
-	fs->vnode_hash = new NodeTable();
+	fs->vnode_hash = new(std::nothrow) NodeTable();
 	if (fs->vnode_hash == NULL || fs->vnode_hash->Init(DEVFS_HASH_SIZE) != B_OK) {
 		err = B_NO_MEMORY;
 		goto err2;
diff --git a/src/system/kernel/elf.cpp b/src/system/kernel/elf.cpp
index d0a81ce4ba..8a2ba78e05 100644
--- a/src/system/kernel/elf.cpp
+++ b/src/system/kernel/elf.cpp
@@ -2553,7 +2553,7 @@ elf_init(kernel_args *args)
 
 	image_init();
 
-	sImagesHash = new ImageHash();
+	sImagesHash = new(std::nothrow) ImageHash();
 	if (sImagesHash == NULL)
 		return B_NO_MEMORY;
 	status_t init = sImagesHash->Init(IMAGE_HASH_SIZE);