diff options
| author |  Johannes Sixt <j6t@kdbg.org> | 2016-04-02 21:03:14 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-04-04 18:03:02 -0700 |
| commit | 8e9b20804a9900d4560e9ace4bb8c5d048a2097e (patch) | |
| tree | 689892e0927299f6fced342cf8098931c3d91742 /compat | |
| parent | mingw: skip some tests in t9115 due to file name issues (diff) | |
| download | tgif-8e9b20804a9900d4560e9ace4bb8c5d048a2097e.tar.xz | |
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>
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/mingw.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/compat/mingw.c b/compat/mingw.c index 54c82ecf20..0413d5c3cd 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -763,15 +763,12 @@ struct tm *localtime_r(const time_t *timep, struct tm *result) char *mingw_getcwd(char *pointer, int len) { - int i; wchar_t wpointer[MAX_PATH]; if (!_wgetcwd(wpointer, ARRAY_SIZE(wpointer))) return NULL; if (xwcstoutf(pointer, wpointer, len) < 0) return NULL; - for (i = 0; pointer[i]; i++) - if (pointer[i] == '\\') - pointer[i] = '/'; + convert_slashes(pointer); return pointer; } @@ -2112,9 +2109,7 @@ static void setup_windows_environment() * executable (by not mistaking the dir separators * for escape characters). */ - for (; *tmp; tmp++) - if (*tmp == '\\') - *tmp = '/'; + convert_slashes(tmp); } /* simulate TERM to enable auto-color (see color.c) */ |