A little git_config_get_multivar code cleanup

e4fda954 · Russell Belfer · 7b5c0d18 · e4fda954
Commit e4fda954 authored Jul 09, 2013 by Russell Belfer
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 11 deletions

src/config.c
+5 -11

No files found.
--- a/src/config.c
+++ b/src/config.c
@@ -534,8 +534,7 @@ int git_config_get_multivar(
 {
 	file_internal *internal;
 	git_config_backend *file;
-	int ret = GIT_ENOTFOUND;
+	int ret = GIT_ENOTFOUND, err;
-	int err;
 	size_t i;
 	/*
@@ -548,15 +547,10 @@ int git_config_get_multivar(
 			continue;
 		file = internal->file;
-		err = file->get_multivar(file, name, regexp, cb, payload);
+		if (!(err = file->get_multivar(file, name, regexp, cb, payload)))
-		switch (err) {
+			ret = 0;
-			case GIT_OK:
+		else if (err != GIT_ENOTFOUND)
-				ret = GIT_OK;
+			return err;
-			case GIT_ENOTFOUND:
-				break;
-			default:
-				return err;
-		}
 	}
 	return (ret == GIT_ENOTFOUND) ? config_error_notfound(name) : 0;