Minor fixes for warnings and error propagation

arrbee · arrbee · commit b1914c36511a · 2014-05-12T10:24:46.000-07:00
diff --git a/include/git2/repository.h b/include/git2/repository.h
@@ -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
diff --git a/src/config_file.c b/src/config_file.c
@@ -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) {
+
+	if ((error = git_strmap_alloc(&map->values)) < 0)
 		git__free(map);
-		return error;
-	}
+	else
+		*out = map;
 
-	*out = map;
 	return error;
 }
 
diff --git a/src/diff_driver.c b/src/diff_driver.c
@@ -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;
diff --git a/src/repository.c b/src/repository.c
@@ -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);
 }

Original file line number	Diff line number	Diff line change
`@@ -418,7 +418,11 @@ GIT_EXTERN(int) git_repository_config(git_config *out, git_repository repo);`
`418`	`418`	`* Get a snapshot of the repository's configuration`
`419`	`419`	`*`
`420`	`420`	`* Convenience function to take a snapshot from the repository's`
`421`		`- * configuration.`
	`421`	`+ * configuration. The contents of this snapshot will not change,`
	`422`	`+ * even if the underlying config files are modified.`
	`423`	`+ *`
	`424`	`+ * The configuration file must be freed once it's no longer`
	`425`	`+ * being used by the user.`
`422`	`426`	`*`
`423`	`427`	`* @param out Pointer to store the loaded configuration`
`424`	`428`	`* @param repo the repository`
Original file line number	Diff line number	Diff line change
`@@ -627,10 +627,11 @@ int git_repository_config(git_config *out, git_repository repo)`
`627`	`627`
`628`	`628`	`int git_repository_config_snapshot(git_config *out, git_repository repo)`
`629`	`629`	`{`
	`630`	`+ int error;`
`630`	`631`	`git_config *weak;`
`631`	`632`
`632`		`- if (git_repository_config__weakptr(&weak, repo) < 0)`
`633`		`- return -1;`
	`633`	`+ if ((error = git_repository_config__weakptr(&weak, repo)) < 0)`
	`634`	`+ return error;`
`634`	`635`
`635`	`636`	`return git_config_snapshot(out, weak);`
`636`	`637`	`}`