proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2026-01-06 00:48:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor fixes for warnings and error propagation

Browse Source
This commit is contained in:
Russell Belfer 2014-05-12 10:24:46 -07:00
parent 7bcced44b7
commit b1914c3651
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/git2/repository.h
View File

@ -418,7 +418,11 @@ GIT_EXTERN(int) git_repository_config(git_config **out, git_repository *repo);
* Get a snapshot of the repository's configuration
*
* Convenience function to take a snapshot from the repository's
* configuration.
* configuration. The contents of this snapshot will not change,
* even if the underlying config files are modified.
*
* The configuration file must be freed once it's no longer
* being used by the user.
*
* @param out Pointer to store the loaded configuration
* @param repo the repository

15
src/config_file.c
View File

@ -247,18 +247,15 @@ static int refcounted_strmap_alloc(refcounted_strmap **out)
int error;
map = git__calloc(1, sizeof(refcounted_strmap));
if (!map) {
giterr_set_oom();
return -1;
}
GITERR_CHECK_ALLOC(map);
git_atomic_set(&map->refcount, 1);
if ((error = git_strmap_alloc(&map->values)) < 0) {
git__free(map);
return error;
}
*out = map;
if ((error = git_strmap_alloc(&map->values)) < 0)
git__free(map);
else
*out = map;
return error;
}

2
src/diff_driver.c
View File

@ -219,7 +219,7 @@ static int git_diff_driver_load(
git_diff_driver *drv = NULL;
size_t namelen = strlen(driver_name);
khiter_t pos;
git_config *cfg, *repo_cfg;
git_config *cfg;
git_buf name = GIT_BUF_INIT;
const git_config_entry *ce;
bool found_driver = false;

5
src/repository.c
View File

@ -627,10 +627,11 @@ int git_repository_config(git_config **out, git_repository *repo)
int git_repository_config_snapshot(git_config **out, git_repository *repo)
{
int error;
git_config *weak;
if (git_repository_config__weakptr(&weak, repo) < 0)
return -1;
if ((error = git_repository_config__weakptr(&weak, repo)) < 0)
return error;
return git_config_snapshot(out, weak);
}