mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-06-22 14:52:41 +02:00
util: Drop no longer needed StripRedundantLastElementsOfPath() function
This commit is contained in:
parent
ecd094e2b1
commit
ebda2b8c81
@ -245,19 +245,6 @@ static std::optional<util::SettingsValue> InterpretValue(const KeyInfo& key, con
|
|||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace {
|
|
||||||
fs::path StripRedundantLastElementsOfPath(const fs::path& path)
|
|
||||||
{
|
|
||||||
auto result = path;
|
|
||||||
while (result.filename().empty() || fs::PathToString(result.filename()) == ".") {
|
|
||||||
result = result.parent_path();
|
|
||||||
}
|
|
||||||
|
|
||||||
assert(fs::equivalent(result, path.lexically_normal()));
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
} // namespace
|
|
||||||
|
|
||||||
// Define default constructor and destructor that are not inline, so code instantiating this class doesn't need to
|
// Define default constructor and destructor that are not inline, so code instantiating this class doesn't need to
|
||||||
// #include class definitions for all members.
|
// #include class definitions for all members.
|
||||||
// For example, m_settings has an internal dependency on univalue.
|
// For example, m_settings has an internal dependency on univalue.
|
||||||
@ -462,7 +449,6 @@ const fs::path& ArgsManager::GetDataDir(bool net_specific) const
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
path = StripRedundantLastElementsOfPath(path);
|
|
||||||
return path;
|
return path;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user