zebreus/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests 1 Activity

Tweak

Browse source
This commit is contained in:
Eelco Dolstra 2016-09-20 17:49:31 +02:00
parent f12d56b27b
commit beaefdf706
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libstore/download.cc
View file

@ -98,11 +98,7 @@ struct CurlDownloader : public Downloader
{ {
assert(!done); assert(!done);
done = true; done = true;
try { callFailure(failure, std::make_exception_ptr(e));
throw e;
} catch (...) {
callFailure(failure);
}
} }
size_t writeCallback(void * contents, size_t size, size_t nmemb) size_t writeCallback(void * contents, size_t size, size_t nmemb)

4
src/libutil/util.cc
View file

@ -1230,10 +1230,10 @@ string base64Decode(const string & s)
} }
void callFailure(const std::function<void(std::exception_ptr exc)> & failure) void callFailure(const std::function<void(std::exception_ptr exc)> & failure, std::exception_ptr exc)
{ {
try { try {
failure(std::current_exception()); failure(exc);
} catch (std::exception & e) { } catch (std::exception & e) {
printMsg(lvlError, format("uncaught exception: %s") % e.what()); printMsg(lvlError, format("uncaught exception: %s") % e.what());
abort(); abort();

3
src/libutil/util.hh
View file

@ -383,7 +383,8 @@ string get(const T & map, const string & key, const string & def = "")
/* Call ‘failure’ with the current exception as argument. If ‘failure’ /* Call ‘failure’ with the current exception as argument. If ‘failure’
throws an exception, abort the program. */ throws an exception, abort the program. */
void callFailure(const std::function<void(std::exception_ptr exc)> & failure); void callFailure(const std::function<void(std::exception_ptr exc)> & failure,
std::exception_ptr exc = std::current_exception());
/* Evaluate the function ‘f’. If it returns a value, call ‘success’ /* Evaluate the function ‘f’. If it returns a value, call ‘success’