diff options
| author | nulltoken <emeric.fermas@gmail.com> | 2011-07-03 14:42:32 +0200 |
|---|---|---|
| committer | schu <schu-github@schulog.org> | 2011-07-06 12:25:27 +0200 |
| commit | 1ee5fd903d00930aab08edecc6b409a34761cf7e (patch) | |
| tree | 076eef83fd6f8d462aa84779c45385de21b394d4 | |
| parent | 0ffcf78a30377971d4928439ae387396b3922cbf (diff) | |
| download | libgit2-1ee5fd903d00930aab08edecc6b409a34761cf7e.tar.gz | |
Fix windows specific issues
- msvc compilation warnings
- not released file handle that prevents file removal
| -rw-r--r-- | src/fileops.c | 2 | ||||
| -rw-r--r-- | src/fileops.h | 2 | ||||
| -rw-r--r-- | tests/t00-core.c | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/fileops.c b/src/fileops.c index afca0329f..ab3f43cc5 100644 --- a/src/fileops.c +++ b/src/fileops.c @@ -305,6 +305,8 @@ static int _rmdir_recurs_cb(void *GIT_UNUSED(nil), char *path) { int error = GIT_SUCCESS; + GIT_UNUSED_ARG(nil) + error = git_futils_isdir(path); if (error == GIT_SUCCESS) { size_t root_size = strlen(path); diff --git a/src/fileops.h b/src/fileops.h index a2f66a5da..cd3ff2f10 100644 --- a/src/fileops.h +++ b/src/fileops.h @@ -106,7 +106,7 @@ extern git_off_t git_futils_filesize(git_file fd); extern int git_futils_rmdir_recurs(const char *path); /* Taken from git.git */ -static inline int is_dot_or_dotdot(const char *name) +GIT_INLINE(int) is_dot_or_dotdot(const char *name) { return (name[0] == '.' && (name[1] == '\0' || diff --git a/tests/t00-core.c b/tests/t00-core.c index 0042da39c..1e9f97521 100644 --- a/tests/t00-core.c +++ b/tests/t00-core.c @@ -513,13 +513,14 @@ END_TEST BEGIN_TEST(rmdir1, "make sure non-empty dir cannot be deleted recusively") char file[GIT_PATH_MAX]; + int fd; must_pass(setup_empty_tmp_dir()); git_path_join(file, empty_tmp_dir, "/two/file.txt"); - must_pass(fd = p_creat(file, 0755)); + fd = p_creat(file, 0755); must_pass(fd); - must_fail(git_futils_rmdir_recurs(empty_tmp_dir)); must_pass(p_close(fd)); + must_fail(git_futils_rmdir_recurs(empty_tmp_dir)); must_pass(p_unlink(file)); must_pass(git_futils_rmdir_recurs(empty_tmp_dir)); END_TEST |