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

db/upnp: use vector::front() instead of [0]

This commit is contained in:
Max Kellermann 2014-01-21 22:57:16 +01:00
parent 411527a240
commit 94cb1545b3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/db/UpnpDatabasePlugin.cxx
View File

@ -226,12 +226,12 @@ UpnpDatabase::GetSong(const char *uri, Error &error) const
} }
ContentDirectoryService server; ContentDirectoryService server;
if (!m_superdir->getServer(vpath[0].c_str(), server, error)) if (!m_superdir->getServer(vpath.front().c_str(), server, error))
return nullptr; return nullptr;
vpath.erase(vpath.begin()); vpath.erase(vpath.begin());
UPnPDirObject dirent; UPnPDirObject dirent;
if (vpath[0].compare(rootid)) { if (vpath.front() != rootid) {
std::string objid; std::string objid;
if (!Namei(server, vpath, objid, dirent, error)) if (!Namei(server, vpath, objid, dirent, error))
return nullptr; return nullptr;
@ -433,7 +433,7 @@ UpnpDatabase::ReadNode(ContentDirectoryService &server,
return false; return false;
if (dirbuf.objects.size() == 1) { if (dirbuf.objects.size() == 1) {
dirent = std::move(dirbuf.objects[0]); dirent = std::move(dirbuf.objects.front());
} else { } else {
error.Format(upnp_domain, "Bad resource"); error.Format(upnp_domain, "Bad resource");
return false; return false;
@ -547,7 +547,7 @@ UpnpDatabase::VisitServer(ContentDirectoryService &server,
/* !Note: this *can't* be handled by Namei further down, /* !Note: this *can't* be handled by Namei further down,
because the path is not valid for traversal. Besides, it's because the path is not valid for traversal. Besides, it's
just faster to access the target node directly */ just faster to access the target node directly */
if (!vpath.empty() && !vpath[0].compare(rootid)) { if (!vpath.empty() && vpath.front() == rootid) {
if (visit_song) { if (visit_song) {
UPnPDirObject dirent; UPnPDirObject dirent;
if (!ReadNode(server, vpath.back().c_str(), dirent, if (!ReadNode(server, vpath.back().c_str(), dirent,
@ -713,7 +713,7 @@ UpnpDatabase::Visit(const DatabaseSelection &selection,
} }
// We do have a path: the first element selects the server // We do have a path: the first element selects the server
std::string servername(vpath[0]); std::string servername(vpath.front());
vpath.erase(vpath.begin()); vpath.erase(vpath.begin());
ContentDirectoryService server; ContentDirectoryService server;