[PATCH 2/2] cleanup submodule_config a bit.
- From
Stefan Beller <sbeller@google.com>
- Date
- Aug 12, 2015, 19:13 UTC
- Message-ID
- <1439406838-6290-3-git-send-email-sbeller@google.com>
- In-Reply-To
- <1439406838-6290-1-git-send-email-sbeller@google.com>
In the first hunk, `submodule` is NULL all the time, so we can make it clearer by directly returning NULL.
In the second hunk, we can directly return the lookup values as it also makes the coder clearer.
Signed-off-by: Stefan Beller <sbeller@google.com> --- submodule-config.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/submodule-config.c b/submodule-config.c index 199692b..08e93cc 100644 --- a/submodule-config.c +++ b/submodule-config.c @@ -387,7 +387,7 @@ static const struct submodule *config_from(struct submodule_cache *cache, } if (!gitmodule_sha1_from_commit(commit_sha1, sha1)) - return submodule; + return NULL; switch (lookup_type) { case lookup_name: @@ -420,14 +420,12 @@ static const struct submodule *config_from(struct submodule_cache *cache, switch (lookup_type) { case lookup_name: - submodule = cache_lookup_name(cache, sha1, key); - break; + return cache_lookup_name(cache, sha1, key); case lookup_path: - submodule = cache_lookup_path(cache, sha1, key); - break; + return cache_lookup_path(cache, sha1, key); + default: + return NULL; } - - return submodule; } static const struct submodule *config_from_path(struct submodule_cache *cache,
-- 2.5.0.234.gefc8a62