submodule config: inline config_from_{name, path}

stefanbeller · gitster · commit e6ead0f2dba3 · 2016-11-22T14:43:03.000-08:00
There is no other user of config_from_{name, path}, such that there is no
reason for the existence of these one liner functions. Just inline these
to increase readability.

Signed-off-by: Stefan Beller &lt;sbeller@google.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
Reviewed-by: Brandon Williams &lt;bmwill@google.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/submodule-config.c b/submodule-config.c
@@ -471,18 +471,6 @@ static const struct submodule *config_from(struct submodule_cache *cache,
 	return submodule;
 }
 
-static const struct submodule *config_from_path(struct submodule_cache *cache,
-		const unsigned char *commit_sha1, const char *path)
-{
-	return config_from(cache, commit_sha1, path, lookup_path);
-}
-
-static const struct submodule *config_from_name(struct submodule_cache *cache,
-		const unsigned char *commit_sha1, const char *name)
-{
-	return config_from(cache, commit_sha1, name, lookup_name);
-}
-
 static void ensure_cache_init(void)
 {
 	if (is_cache_init)
@@ -508,14 +496,14 @@ const struct submodule *submodule_from_name(const unsigned char *commit_sha1,
 		const char *name)
 {
 	ensure_cache_init();
-	return config_from_name(&the_submodule_cache, commit_sha1, name);
+	return config_from(&the_submodule_cache, commit_sha1, name, lookup_name);
 }
 
 const struct submodule *submodule_from_path(const unsigned char *commit_sha1,
 		const char *path)
 {
 	ensure_cache_init();
-	return config_from_path(&the_submodule_cache, commit_sha1, path);
+	return config_from(&the_submodule_cache, commit_sha1, path, lookup_path);
 }
 
 void submodule_free(void)

Original file line number	Diff line number	Diff line change
`@@ -471,18 +471,6 @@ static const struct submodule config_from(struct submodule_cache cache,`
`471`	`471`	`return submodule;`
`472`	`472`	`}`
`473`	`473`
`474`		`-static const struct submodule config_from_path(struct submodule_cache cache,`
`475`		`- const unsigned char commit_sha1, const char path)`
`476`		`-{`
`477`		`- return config_from(cache, commit_sha1, path, lookup_path);`
`478`		`-}`
`479`		`-`
`480`		`-static const struct submodule config_from_name(struct submodule_cache cache,`
`481`		`- const unsigned char commit_sha1, const char name)`
`482`		`-{`
`483`		`- return config_from(cache, commit_sha1, name, lookup_name);`
`484`		`-}`
`485`		`-`
`486`	`474`	`static void ensure_cache_init(void)`
`487`	`475`	`{`
`488`	`476`	`if (is_cache_init)`
`@@ -508,14 +496,14 @@ const struct submodule submodule_from_name(const unsigned char commit_sha1,`
`508`	`496`	`const char *name)`
`509`	`497`	`{`
`510`	`498`	`ensure_cache_init();`
`511`		`- return config_from_name(&the_submodule_cache, commit_sha1, name);`
	`499`	`+ return config_from(&the_submodule_cache, commit_sha1, name, lookup_name);`
`512`	`500`	`}`
`513`	`501`
`514`	`502`	`const struct submodule submodule_from_path(const unsigned char commit_sha1,`
`515`	`503`	`const char *path)`
`516`	`504`	`{`
`517`	`505`	`ensure_cache_init();`
`518`		`- return config_from_path(&the_submodule_cache, commit_sha1, path);`
	`506`	`+ return config_from(&the_submodule_cache, commit_sha1, path, lookup_path);`
`519`	`507`	`}`
`520`	`508`
`521`	`509`	`void submodule_free(void)`