Commit f5586f5c by lhchavez

Addressed review feedback

parent 96df833b
...@@ -151,11 +151,11 @@ cleanup: ...@@ -151,11 +151,11 @@ cleanup:
if (fd != -1) if (fd != -1)
p_close(fd); p_close(fd);
if (git_buf_is_allocated(&tmp_path)) if (git_buf_len(&tmp_path) > 0)
(void)p_unlink(git_buf_cstr(&tmp_path)); p_unlink(git_buf_cstr(&tmp_path));
if (idx->pack != NULL) if (idx->pack != NULL)
(void)p_unlink(idx->pack->pack_name); p_unlink(idx->pack->pack_name);
git_buf_free(&path); git_buf_free(&path);
git_buf_free(&tmp_path); git_buf_free(&tmp_path);
...@@ -1094,10 +1094,10 @@ void git_indexer_free(git_indexer *idx) ...@@ -1094,10 +1094,10 @@ void git_indexer_free(git_indexer *idx)
git_mwindow_free_all(&idx->pack->mwf); git_mwindow_free_all(&idx->pack->mwf);
/* We need to close the descriptor here so Windows doesn't choke on unlink */ /* We need to close the descriptor here so Windows doesn't choke on unlink */
if (idx->pack->mwf.fd != -1) { if (idx->pack->mwf.fd != -1) {
(void)p_close(idx->pack->mwf.fd); p_close(idx->pack->mwf.fd);
idx->pack->mwf.fd = -1; idx->pack->mwf.fd = -1;
} }
(void)p_unlink(idx->pack->pack_name); p_unlink(idx->pack->pack_name);
if (!git_mutex_lock(&git__mwindow_mutex)) { if (!git_mutex_lock(&git__mwindow_mutex)) {
git_packfile_free(idx->pack); git_packfile_free(idx->pack);
......
...@@ -155,11 +155,7 @@ void test_pack_indexer__no_tmp_files(void) ...@@ -155,11 +155,7 @@ void test_pack_indexer__no_tmp_files(void)
cl_git_pass(git_buf_sets(&path, clar_sandbox_path())); cl_git_pass(git_buf_sets(&path, clar_sandbox_path()));
cl_git_pass(find_tmp_file_recurs(&first_tmp_file, &path)); cl_git_pass(find_tmp_file_recurs(&first_tmp_file, &path));
git_buf_free(&path); git_buf_free(&path);
if (git_buf_is_allocated(&first_tmp_file)) { cl_assert(git_buf_len(&first_tmp_file) == 0);
git_buf_free(&first_tmp_file);
cl_warning("Found a temporary file before running the test");
cl_skip();
}
cl_git_pass(git_indexer_new(&idx, ".", 0, NULL, NULL, NULL)); cl_git_pass(git_indexer_new(&idx, ".", 0, NULL, NULL, NULL));
git_indexer_free(idx); git_indexer_free(idx);
...@@ -167,9 +163,6 @@ void test_pack_indexer__no_tmp_files(void) ...@@ -167,9 +163,6 @@ void test_pack_indexer__no_tmp_files(void)
cl_git_pass(git_buf_sets(&path, clar_sandbox_path())); cl_git_pass(git_buf_sets(&path, clar_sandbox_path()));
cl_git_pass(find_tmp_file_recurs(&first_tmp_file, &path)); cl_git_pass(find_tmp_file_recurs(&first_tmp_file, &path));
git_buf_free(&path); git_buf_free(&path);
if (git_buf_is_allocated(&first_tmp_file)) { cl_assert(git_buf_len(&first_tmp_file) == 0);
cl_warning(git_buf_cstr(&first_tmp_file));
git_buf_free(&first_tmp_file); git_buf_free(&first_tmp_file);
cl_fail("Found a temporary file");
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment