From f076a1fe39a466f9be91934e35ed179e45edece0 Mon Sep 17 00:00:00 2001 From: Alexander Shalamov Date: Tue, 9 Oct 2018 17:17:12 +0300 Subject: [core] Use util::readFile for Local and Asset file sources Use exception free util::readFile instead of util::read_file for LocalFileSource and AssetFileSource implementations. --- platform/default/src/mbgl/storage/asset_file_source.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'platform/default/src/mbgl/storage/asset_file_source.cpp') diff --git a/platform/default/src/mbgl/storage/asset_file_source.cpp b/platform/default/src/mbgl/storage/asset_file_source.cpp index 7988654ae5..ed446f85a5 100644 --- a/platform/default/src/mbgl/storage/asset_file_source.cpp +++ b/platform/default/src/mbgl/storage/asset_file_source.cpp @@ -44,12 +44,13 @@ public: } else if (result == -1 && errno == ENOENT) { response.error = std::make_unique(Response::Error::Reason::NotFound); } else { - try { - response.data = std::make_shared(util::read_file(path)); - } catch (...) { + auto data = util::readFile(path); + if (!data) { response.error = std::make_unique( Response::Error::Reason::Other, - util::toString(std::current_exception())); + std::string("Cannot read file ") + path); + } else { + response.data = std::make_shared(std::move(*data)); } } -- cgit v1.2.1