* [PATCH 1/2] config.c: drop local variable
@ 2016-04-27 21:30 Stefan Beller
2016-04-27 21:30 ` [PATCH 2/2] submodule-config: don't shadow `cache` Stefan Beller
0 siblings, 1 reply; 2+ messages in thread
From: Stefan Beller @ 2016-04-27 21:30 UTC (permalink / raw)
To: gitster; +Cc: git, Stefan Beller
As `ret` is not used for anything except determining an early return,
we don't need a variable for that. Drop it.
Signed-off-by: Stefan Beller <sbeller@google.com>
---
While reading config code, I found 2 nits. Both improve readability,
no bugfix or feature.
As it is generally discouraged to have cleanup patch churn,
I checked master..pu to see any possible topics in flight conflicting
on config.c or submodule-config.c and there is nothing close by.
Thanks,
Stefan
config.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/config.c b/config.c
index 10b5c95..262d8d7 100644
--- a/config.c
+++ b/config.c
@@ -1309,14 +1309,11 @@ static struct config_set_element *configset_find_element(struct config_set *cs,
struct config_set_element k;
struct config_set_element *found_entry;
char *normalized_key;
- int ret;
/*
* `key` may come from the user, so normalize it before using it
* for querying entries from the hashmap.
*/
- ret = git_config_parse_key(key, &normalized_key, NULL);
-
- if (ret)
+ if (git_config_parse_key(key, &normalized_key, NULL))
return NULL;
hashmap_entry_init(&k, strhash(normalized_key));
--
2.8.0.41.g0ac0153.dirty
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH 2/2] submodule-config: don't shadow `cache`
2016-04-27 21:30 [PATCH 1/2] config.c: drop local variable Stefan Beller
@ 2016-04-27 21:30 ` Stefan Beller
0 siblings, 0 replies; 2+ messages in thread
From: Stefan Beller @ 2016-04-27 21:30 UTC (permalink / raw)
To: gitster; +Cc: git, Stefan Beller
Lots of internal functions in submodule-confic.c have a first parameter
`struct submodule_cache *cache`, which currently always refers to the
global variable `cache` in the file. To avoid confusion rename the
global `cache` variable.
Signed-off-by: Stefan Beller <sbeller@google.com>
---
submodule-config.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/submodule-config.c b/submodule-config.c
index 8ac5031..debab29 100644
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -30,7 +30,7 @@ enum lookup_type {
lookup_path
};
-static struct submodule_cache cache;
+static struct submodule_cache the_submodule_cache;
static int is_cache_init;
static int config_path_cmp(const struct submodule_entry *a,
@@ -470,14 +470,14 @@ static void ensure_cache_init(void)
if (is_cache_init)
return;
- cache_init(&cache);
+ cache_init(&the_submodule_cache);
is_cache_init = 1;
}
int parse_submodule_config_option(const char *var, const char *value)
{
struct parse_config_parameter parameter;
- parameter.cache = &cache;
+ parameter.cache = &the_submodule_cache;
parameter.commit_sha1 = NULL;
parameter.gitmodules_sha1 = null_sha1;
parameter.overwrite = 1;
@@ -490,18 +490,18 @@ const struct submodule *submodule_from_name(const unsigned char *commit_sha1,
const char *name)
{
ensure_cache_init();
- return config_from_name(&cache, commit_sha1, name);
+ return config_from_name(&the_submodule_cache, commit_sha1, name);
}
const struct submodule *submodule_from_path(const unsigned char *commit_sha1,
const char *path)
{
ensure_cache_init();
- return config_from_path(&cache, commit_sha1, path);
+ return config_from_path(&the_submodule_cache, commit_sha1, path);
}
void submodule_free(void)
{
- cache_free(&cache);
+ cache_free(&the_submodule_cache);
is_cache_init = 0;
}
--
2.8.0.41.g0ac0153.dirty
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-04-27 21:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-04-27 21:30 [PATCH 1/2] config.c: drop local variable Stefan Beller
2016-04-27 21:30 ` [PATCH 2/2] submodule-config: don't shadow `cache` Stefan Beller
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).