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

lib/nfs/Connection: reduce Error instance allocations

Browse Source
This commit is contained in:
Max Kellermann
2014-10-09 08:08:17 +02:00
parent bfcc466647
commit 990809cc21
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib/nfs/Connection.cxx
View File

@@ -464,8 +464,7 @@ NfsConnection::MountCallback(int status, nfs_context *nfs, void *data,
inline bool inline bool
NfsConnection::MountInternal(Error &error) NfsConnection::MountInternal(Error &error)
{ {
if (context != nullptr) assert(context == nullptr);
return true;
context = nfs_init_context(); context = nfs_init_context();
if (context == nullptr) { if (context == nullptr) {
@@ -535,7 +534,7 @@ NfsConnection::BroadcastError(Error &&error)
void void
NfsConnection::RunDeferred() NfsConnection::RunDeferred()
{ {
{ if (context == nullptr) {
Error error; Error error;
if (!MountInternal(error)) { if (!MountInternal(error)) {
BroadcastMountError(std::move(error)); BroadcastMountError(std::move(error));