oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

neighbor/Glue: support C++ exceptions

Browse Source
This commit is contained in:
Max Kellermann
2016-09-05 11:29:10 +02:00
parent 50e5244e25
commit a69c3c1848
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/neighbor/Glue.cxx
View File

@@ -27,6 +27,9 @@
#include "config/ConfigError.hxx" #include "config/ConfigError.hxx"
#include "config/Block.hxx" #include "config/Block.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include "util/RuntimeError.hxx"
#include <stdexcept>
NeighborGlue::Explorer::~Explorer() NeighborGlue::Explorer::~Explorer()
{ {
@@ -61,14 +64,20 @@ NeighborGlue::Init(EventLoop &loop, NeighborListener &listener, Error &error)
{ {
for (const auto *block = config_get_block(ConfigBlockOption::NEIGHBORS); for (const auto *block = config_get_block(ConfigBlockOption::NEIGHBORS);
block != nullptr; block = block->next) { block != nullptr; block = block->next) {
NeighborExplorer *explorer = try {
CreateNeighborExplorer(loop, listener, *block, error); auto *explorer =
if (explorer == nullptr) { CreateNeighborExplorer(loop, listener, *block,
error.FormatPrefix("Line %i: ", block->line); error);
return false; if (explorer == nullptr) {
} error.FormatPrefix("Line %i: ", block->line);
return false;
}
explorers.emplace_front(explorer); explorers.emplace_front(explorer);
} catch (...) {
std::throw_with_nested(FormatRuntimeError("Line %i: ",
block->line));
}
} }
return true; return true;