Commit a24a6acb authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'minor-cleanups'


 SystemTools: Revert "Reduce scope of 'buf' variable in CollapseFullPath"
Acked-by: Kitware Robot's avatarKitware Robot <>
Merge-request: !146
parents 71cf8a3a 5ca03af6
......@@ -3412,9 +3412,9 @@ std::string SystemTools::CollapseFullPath(const std::string& in_path,
const char* in_base)
// Use the current working directory as a base path.
char buf[2048];
const char* res_in_base = in_base;
if (!res_in_base) {
char buf[2048];
if (const char* cwd = Getcwd(buf, 2048)) {
res_in_base = cwd;
} else {
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment