mirror of
https://github.com/git/git.git
synced 2025-12-12 20:36:24 +01:00
Windows: shorten code by re-using convert_slashes()
Make a few more spots more readable by using the recently introduced, Windows-specific helper. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
8257d3b458
commit
8e9b20804a
@@ -167,7 +167,6 @@ const char *prefix_filename(const char *pfx, int pfx_len, const char *arg)
|
||||
strbuf_add(&path, pfx, pfx_len);
|
||||
strbuf_addstr(&path, arg);
|
||||
#else
|
||||
char *p;
|
||||
/* don't add prefix to absolute paths, but still replace '\' by '/' */
|
||||
strbuf_reset(&path);
|
||||
if (is_absolute_path(arg))
|
||||
@@ -175,9 +174,7 @@ const char *prefix_filename(const char *pfx, int pfx_len, const char *arg)
|
||||
else if (pfx_len)
|
||||
strbuf_add(&path, pfx, pfx_len);
|
||||
strbuf_addstr(&path, arg);
|
||||
for (p = path.buf + pfx_len; *p; p++)
|
||||
if (*p == '\\')
|
||||
*p = '/';
|
||||
convert_slashes(path.buf + pfx_len);
|
||||
#endif
|
||||
return path.buf;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user