Rewrite `git_repository__cleanup_files`
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51
diff --git a/src/repository.c b/src/repository.c
index 37aba4b..6b2705b 100644
--- a/src/repository.c
+++ b/src/repository.c
@@ -1955,26 +1955,32 @@ int git_repository_state(git_repository *repo)
return state;
}
-int git_repository__cleanup_files(git_repository *repo, const char *files[], size_t files_len)
+int git_repository__cleanup_files(
+ git_repository *repo, const char *files[], size_t files_len)
{
- git_buf path = GIT_BUF_INIT;
+ git_buf buf = GIT_BUF_INIT;
size_t i;
- int error = 0;
+ int error;
- for (i = 0; i < files_len; ++i) {
- git_buf_clear(&path);
+ for (error = 0, i = 0; !error && i < files_len; ++i) {
+ const char *path;
- if ((error = git_buf_joinpath(&path, repo->path_repository, files[i])) < 0 ||
- (git_path_isfile(git_buf_cstr(&path)) &&
- (error = p_unlink(git_buf_cstr(&path))) < 0) ||
- (git_path_isdir(git_buf_cstr(&path)) &&
- (error = git_futils_rmdir_r(git_buf_cstr(&path), NULL, GIT_RMDIR_REMOVE_FILES | GIT_RMDIR_REMOVE_BLOCKERS)) < 0))
- goto done;
- }
+ if (git_buf_joinpath(&buf, repo->path_repository, files[i]) < 0)
+ return -1;
-done:
- git_buf_free(&path);
+ path = git_buf_cstr(&buf);
+
+ if (git_path_isfile(path)) {
+ error = p_unlink(path);
+ } else if (git_path_isdir(path)) {
+ error = git_futils_rmdir_r(path, NULL,
+ GIT_RMDIR_REMOVE_FILES | GIT_RMDIR_REMOVE_BLOCKERS);
+ }
+
+ git_buf_clear(&buf);
+ }
+ git_buf_free(&buf);
return error;
}