diff options
| author |  Johannes Sixt <j6t@kdbg.org> | 2017-05-22 20:58:32 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-05-23 21:42:14 +0900 |
| commit | e20b5b59099a960d59f20276ae37353870e714de (patch) | |
| tree | 9b7d7408f9963b5f952141f97205f144e2990999 | |
| parent | Git 2.10.3 (diff) | |
| download | tgif-e20b5b59099a960d59f20276ae37353870e714de.tar.xz | |
mingw.h: permit arguments with side effects for is_dir_sep
Taking git-compat-util.h's cue (which uses an inline function to back
is_dir_sep()), let's use an inline function to back also the Windows
version of is_dir_sep(). This avoids problems when calling the function
with arguments that do more than just provide a single character, e.g.
incrementing a pointer. Example:
is_dir_sep(*p++)
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | compat/mingw.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/compat/mingw.h b/compat/mingw.h index 034fff9479..d2168c1e5e 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -395,7 +395,11 @@ HANDLE winansi_get_osfhandle(int fd); (isalpha(*(path)) && (path)[1] == ':' ? 2 : 0) int mingw_skip_dos_drive_prefix(char **path); #define skip_dos_drive_prefix mingw_skip_dos_drive_prefix -#define is_dir_sep(c) ((c) == '/' || (c) == '\\') +static inline int mingw_is_dir_sep(int c) +{ + return c == '/' || c == '\\'; +} +#define is_dir_sep mingw_is_dir_sep static inline char *mingw_find_last_dir_sep(const char *path) { char *ret = NULL; |