posixfile.cpp: remove redundant realpath() call #13845
Conversation
Commit 1bd116c makes use of the allocating mode of realpath() by duplicating the realpath() invocation already done (i.e. with the same input path). In practice, if the realpath() invocation with nullptr fails, the realpath() invocation with a destination buffer is very likely to fail in the same way. Hence drop the realpath() invocation with a destination buffer, and move the realpath() invocation with nullptr in the existing if/else if chain to maintain the existing behaviour. Since "path_buffer" now is needed only for the fallback getcwd() invocation, move it in the inner scope where it is used. Since the usage of getcwd() already has a growing buffer logic, make the initial buffer size shorter, which should be enough to get current working directory already at the first attempt in most of the cases.
| { | ||
| dst = &path_buffer[0]; | ||
| return std::error_condition(); | ||
| } | ||
| else if (path[0] == PATHSEPCH) |
There was a problem hiding this comment.
Should this still have the else, which belongs to a now-removed if ()?
There was a problem hiding this comment.
This is a chain like
if (cond1) {
// code for cond1
return ...
} else if (cond2) {
// code for cond2
return ...
} else {
// code for else
return ...
}which is equivalent to
if (cond1) {
// code for cond1
return ...
}
if (cond2) {
// code for cond2
return ...
}
// code for else
return ...I replaced the now-removed if called realpath() with a buffer with the if that calls realpath(..., nullptr), as it does the same thing, keeping the if chain as it was for consistency.
|
The real purpose of this PR seems to be to get rid of |
Commit 1bd116c makes use of the allocating mode of
realpath()by duplicating therealpath()invocation already done (i.e. with the same input path). In practice, if therealpath()invocation withnullptrfails, therealpath()invocation with a destination buffer is very likely to fail in the same way.Hence drop the
realpath()invocation with a destination buffer, and move therealpath()invocation withnullptrin the existingif/else ifchain to maintain the existingbehaviour.Since
path_buffernow is needed only for the fallbackgetcwd()invocation, move it in the inner scope where it is used. Since the usage ofgetcwd()already has a growing buffer logic, make the initial buffer size shorter, which should be enough to get current working directory already at the first attempt in most of the cases.