We are currently indexing your data, so search results may be incomplete until we finish.
Directory: eliminate call recursion in getdir()
Changeset 5ab289f25d6a…
Parent a58fba69ec2d…
by
Changes to one file · Browse files at 5ab289f25d6a Showing diff from parent a58fba69ec2d Diff from another changeset...
|
@@ -158,31 +158,43 @@ }
-Directory* Directory::getdir(const std::string& n)
+Directory* Directory::getdir(const std::string& n_in)
{
std::string base;
std::string rest;
- if (!splitbase(n, base, rest))
+ std::string n = n_in;
+ const Directory* cur = this;
+
+ for (;;)
{
- TDEBUG_TRACE("Directory(" << path() << ")::getdir(" << n << "): splitbase returned 0");
+ loopstart:
+
+ if (!splitbase(n, base, rest))
+ {
+ TDEBUG_TRACE("Directory(" << path() << ")::getdir("
+ << n_in << "): splitbase returned 0");
+ return 0;
+ }
+
+ const bool leaf = base.empty();
+ const std::string& searchstr = (leaf ? n : base);
+
+ for (DirsT::const_iterator i = cur->subdirs_.begin();
+ i != cur->subdirs_.end(); ++i)
+ {
+ if ((*i)->name_ == searchstr)
+ {
+ if (leaf)
+ return *i;
+ cur = *i;
+ n = rest;
+ goto loopstart;
+ }
+ }
+
return 0;
}
-
- const bool leaf = base.empty();
- const std::string& searchstr = (leaf ? n : base);
-
- for (DirsT::const_iterator i = subdirs_.begin(); i != subdirs_.end(); ++i)
- {
- if ((*i)->name_ == searchstr)
- {
- if (leaf)
- return *i;
- return (*i)->getdir(rest);
- }
- }
-
- return 0;
}
|
||
Add a tag
Loading...