From 7260d7883ce98299126b850e6c1559d2597914fa Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Tue, 21 Jan 2014 23:10:30 +0100
Subject: db/upnp: move "objid" declaration down

Don't allocate the object when it's not needed.
---
 src/db/UpnpDatabasePlugin.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/db/UpnpDatabasePlugin.cxx')

diff --git a/src/db/UpnpDatabasePlugin.cxx b/src/db/UpnpDatabasePlugin.cxx
index cd3b8afbd..0307a984f 100644
--- a/src/db/UpnpDatabasePlugin.cxx
+++ b/src/db/UpnpDatabasePlugin.cxx
@@ -467,8 +467,6 @@ UpnpDatabase::Namei(ContentDirectoryService &server,
 		    UPnPDirObject &odirent,
 		    Error &error) const
 {
-	std::string objid(rootid);
-
 	if (vpath.empty()) {
 		// looking for root info
 		if (!ReadNode(server, rootid, odirent, error))
@@ -479,6 +477,8 @@ UpnpDatabase::Namei(ContentDirectoryService &server,
 
 	const UpnpClient_Handle handle = m_lib->getclh();
 
+	std::string objid(rootid);
+
 	// Walk the path elements, read each directory and try to find the next one
 	for (unsigned int i = 0; i < vpath.size(); i++) {
 		UPnPDirContent dirbuf;
-- 
cgit v1.2.3