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

db/proxy: use AtScopeExit()

This commit is contained in:
Max Kellermann 2016-03-18 23:10:42 +01:00
parent 6190da1300
commit 686a53215d
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/db/plugins/ProxyDatabasePlugin.cxx
View File

@ -35,6 +35,7 @@
#include "tag/Tag.hxx"
#include "util/Error.hxx"
#include "util/Domain.hxx"
#include "util/ScopeExit.hxx"
#include "protocol/Ack.hxx"
#include "event/SocketMonitor.hxx"
#include "event/IdleMonitor.hxx"
@ -233,6 +234,10 @@ CheckError(struct mpd_connection *connection, Error &error)
if (code == MPD_ERROR_SUCCESS)
return true;
AtScopeExit(connection) {
mpd_connection_clear_error(connection);
};
if (code == MPD_ERROR_SERVER) {
/* libmpdclient's "enum mpd_server_error" is the same
as our "enum ack" */
@ -245,7 +250,6 @@ CheckError(struct mpd_connection *connection, Error &error)
mpd_connection_get_error_message(connection));
}
mpd_connection_clear_error(connection);
return false;
}
@ -786,6 +790,10 @@ ProxyDatabase::VisitUniqueTags(const DatabaseSelection &selection,
struct mpd_pair *pair;
while (result &&
(pair = mpd_recv_pair_tag(connection, tag_type2)) != nullptr) {
AtScopeExit(this, pair) {
mpd_return_pair(connection, pair);
};
TagBuilder tag;
tag.AddItem(tag_type, pair->value);
@ -798,7 +806,6 @@ ProxyDatabase::VisitUniqueTags(const DatabaseSelection &selection,
tag.AddEmptyItem(tag_type);
result = visit_tag(tag.Commit(), error);
mpd_return_pair(connection, pair);
}
return mpd_response_finish(connection) &&