[PATCH 5/6] prefix_filename: simplify windows #ifdef
- From
Jeff King <peff@peff.net>
- Date
- Mar 21, 2017, 01:30 UTC
- Message-ID
- <20170321013040.cl42hlrtwix6qa23@sigill.intra.peff.net>
- In-Reply-To
- <20170321011838.rdhnbfwbigm4s4e3@sigill.intra.peff.net>
The prefix_filename function used to do an early return when there was no prefix on non-Windows platforms, but always allocated on Windows so that it could call convert_slashes().
Now that the function always allocates, we can unify the logic and make convert_slashes() the only conditional part.
Signed-off-by: Jeff King <peff@peff.net> --- I wondered here if a compiler might complain about the dead assignment to pfx_len in the is_absolute_path() conditional. On Windows, that's used as an offset for calling into convert_slashes(), but on other platforms we never look at it again.
However, neither gcc nor clang complained, so I'm inclined to go with what I have here.
abspath.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/abspath.c b/abspath.c index 4addd1fde..7f1cfe979 100644 --- a/abspath.c +++ b/abspath.c @@ -251,18 +251,15 @@ char *prefix_filename(const char *pfx, const char *arg) struct strbuf path = STRBUF_INIT; size_t pfx_len = pfx ? strlen(pfx) : 0; -#ifndef GIT_WINDOWS_NATIVE - if (!pfx_len || is_absolute_path(arg)) - return xstrdup(arg); - strbuf_add(&path, pfx, pfx_len); - strbuf_addstr(&path, arg); -#else - /* don't add prefix to absolute paths, but still replace '\' by '/' */ - if (is_absolute_path(arg)) + if (!pfx_len) + ; /* nothing to prefix */ + else if (is_absolute_path(arg)) pfx_len = 0; - else if (pfx_len) + else strbuf_add(&path, pfx, pfx_len); + strbuf_addstr(&path, arg); +#ifdef GIT_WINDOWS_NATIVE convert_slashes(path.buf + pfx_len); #endif return strbuf_detach(&path, NULL);
-- 2.12.1.683.gcd02edfec