proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-06 06:42:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

git_mwindow_file_deregister() shouldn't return errors

Browse Source 
As a function that appears to only be called on error paths, I don't
think it makes sense for it to return an error, or clobber the global
giterr. Note that no existing callsites actually check the return
code.

In my own application, there are errors where the real error ends
up being hidden, as git_mwindow_file_deregister() clobbers the
global giterr. I'm not sure this error is even relevant?
This commit is contained in:
Scott J. Goldman 2013-01-05 18:20:42 -08:00
parent d74b1bc529
commit f9b55bcb5f
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/mwindow.c
View File

@ -293,28 +293,23 @@ int git_mwindow_file_register(git_mwindow_file *mwf)
return ret;
}
int git_mwindow_file_deregister(git_mwindow_file *mwf)
void git_mwindow_file_deregister(git_mwindow_file *mwf)
{
git_mwindow_ctl *ctl = &mem_ctl;
git_mwindow_file *cur;
unsigned int i;
if (git_mutex_lock(&git__mwindow_mutex)) {
giterr_set(GITERR_THREAD, "unable to lock mwindow mutex");
return -1;
}
if (git_mutex_lock(&git__mwindow_mutex))
return;
git_vector_foreach(&ctl->windowfiles, i, cur) {
if (cur == mwf) {
git_vector_remove(&ctl->windowfiles, i);
git_mutex_unlock(&git__mwindow_mutex);
return 0;
return;
}
}
git_mutex_unlock(&git__mwindow_mutex);
giterr_set(GITERR_ODB, "Failed to find the memory window file to deregister");
return -1;
}
void git_mwindow_close(git_mwindow **window)

2
src/mwindow.h
View File

@ -39,7 +39,7 @@ int git_mwindow_contains(git_mwindow *win, git_off_t offset);
void git_mwindow_free_all(git_mwindow_file *mwf);
unsigned char *git_mwindow_open(git_mwindow_file *mwf, git_mwindow **cursor, git_off_t offset, size_t extra, unsigned int *left);
int git_mwindow_file_register(git_mwindow_file *mwf);
int git_mwindow_file_deregister(git_mwindow_file *mwf);
void git_mwindow_file_deregister(git_mwindow_file *mwf);
void git_mwindow_close(git_mwindow **w_cursor);
#endif