diff options
| author | Frank Li <lznuaa@gmail.com> | 2009-09-16 10:20:17 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-09-18 20:00:41 -0700 |
| commit | 0d30ad71fa094dd89ae31b3381c2e63a41119c76 (patch) | |
| tree | 83d47d51f0d0598e9cea631273b4cdd317957abc /compat/mingw.c | |
| parent | 812bdbc31b246fcd5f3293e4dbac27eaec1ef4fa (diff) | |
| download | git-0d30ad71fa094dd89ae31b3381c2e63a41119c76.tar.gz git-0d30ad71fa094dd89ae31b3381c2e63a41119c76.tar.xz | |
Avoid declaration after statement
MSVC does not understand this C99 style.
Signed-off-by: Frank Li <lznuaa@gmail.com>
Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com>
Acked-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat/mingw.c')
| -rw-r--r-- | compat/mingw.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/compat/mingw.c b/compat/mingw.c index 36ef8d321..5478b747c 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -123,13 +123,17 @@ int mingw_open (const char *filename, int oflags, ...) { va_list args; unsigned mode; + int fd; + va_start(args, oflags); mode = va_arg(args, int); va_end(args); if (!strcmp(filename, "/dev/null")) filename = "nul"; - int fd = open(filename, oflags, mode); + + fd = open(filename, oflags, mode); + if (fd < 0 && (oflags & O_CREAT) && errno == EACCES) { DWORD attrs = GetFileAttributes(filename); if (attrs != INVALID_FILE_ATTRIBUTES && (attrs & FILE_ATTRIBUTE_DIRECTORY)) @@ -580,10 +584,11 @@ static char **get_path_split(void) static void free_path_split(char **path) { + char **p = path; + if (!path) return; - char **p = path; while (*p) free(*p++); free(path); @@ -1120,9 +1125,9 @@ int sigaction(int sig, struct sigaction *in, struct sigaction *out) #undef signal sig_handler_t mingw_signal(int sig, sig_handler_t handler) { + sig_handler_t old = timer_fn; if (sig != SIGALRM) return signal(sig, handler); - sig_handler_t old = timer_fn; timer_fn = handler; return old; } @@ -1209,8 +1214,9 @@ struct dirent *mingw_readdir(DIR *dir) if (dir->dd_handle == (long)INVALID_HANDLE_VALUE && dir->dd_stat == 0) { + DWORD lasterr; handle = FindFirstFileA(dir->dd_name, &buf); - DWORD lasterr = GetLastError(); + lasterr = GetLastError(); dir->dd_handle = (long)handle; if (handle == INVALID_HANDLE_VALUE && (lasterr != ERROR_NO_MORE_FILES)) { errno = err_win_to_posix(lasterr); |