diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2013-08-08 13:41:18 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2013-08-08 13:57:01 +0200 |
| commit | 4efa32903adf131631d283c914e0a5bf29c49e4d (patch) | |
| tree | a02ddafb762d78e22ce21c216fb465b31108cc44 /src | |
| parent | 84fec6f628b8c82a70c0aff5dc6a47d1cdb6fbf0 (diff) | |
| download | libgit2-4efa32903adf131631d283c914e0a5bf29c49e4d.tar.gz | |
config: get_multivar -> get_multivar_foreach
The plain function will return an iterator, so move this one out of
the way.
Diffstat (limited to 'src')
| -rw-r--r-- | src/config.c | 4 | ||||
| -rw-r--r-- | src/config_file.c | 4 | ||||
| -rw-r--r-- | src/diff_driver.c | 4 | ||||
| -rw-r--r-- | src/remote.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/config.c b/src/config.c index 6c055e0e6..a4627c9ad 100644 --- a/src/config.c +++ b/src/config.c @@ -574,7 +574,7 @@ int git_config_get_entry(const git_config_entry **out, const git_config *cfg, co return config_error_notfound(name); } -int git_config_get_multivar( +int git_config_get_multivar_foreach( const git_config *cfg, const char *name, const char *regexp, git_config_foreach_cb cb, void *payload) { @@ -593,7 +593,7 @@ int git_config_get_multivar( continue; file = internal->file; - if (!(err = file->get_multivar(file, name, regexp, cb, payload))) + if (!(err = file->get_multivar_foreach(file, name, regexp, cb, payload))) ret = 0; else if (err != GIT_ENOTFOUND) return err; diff --git a/src/config_file.c b/src/config_file.c index 6eb51ac25..ed79624eb 100644 --- a/src/config_file.c +++ b/src/config_file.c @@ -413,7 +413,7 @@ static int config_get(const git_config_backend *cfg, const char *name, const git return 0; } -static int config_get_multivar( +static int config_get_multivar_foreach( git_config_backend *cfg, const char *name, const char *regex_str, @@ -603,7 +603,7 @@ int git_config_file__ondisk(git_config_backend **out, const char *path) backend->parent.open = config_open; backend->parent.get = config_get; - backend->parent.get_multivar = config_get_multivar; + backend->parent.get_multivar_foreach = config_get_multivar_foreach; backend->parent.set = config_set; backend->parent.set_multivar = config_set_multivar; backend->parent.del = config_delete; diff --git a/src/diff_driver.c b/src/diff_driver.c index e82dfa50d..bd5a8fbd9 100644 --- a/src/diff_driver.c +++ b/src/diff_driver.c @@ -187,7 +187,7 @@ static int git_diff_driver_load( git_buf_truncate(&name, namelen + strlen("diff..")); git_buf_put(&name, "xfuncname", strlen("xfuncname")); - if ((error = git_config_get_multivar( + if ((error = git_config_get_multivar_foreach( cfg, name.ptr, NULL, diff_driver_xfuncname, drv)) < 0) { if (error != GIT_ENOTFOUND) goto done; @@ -196,7 +196,7 @@ static int git_diff_driver_load( git_buf_truncate(&name, namelen + strlen("diff..")); git_buf_put(&name, "funcname", strlen("funcname")); - if ((error = git_config_get_multivar( + if ((error = git_config_get_multivar_foreach( cfg, name.ptr, NULL, diff_driver_funcname, drv)) < 0) { if (error != GIT_ENOTFOUND) goto done; diff --git a/src/remote.c b/src/remote.c index 158f3e938..003fadaa3 100644 --- a/src/remote.c +++ b/src/remote.c @@ -217,7 +217,7 @@ static int get_optional_config( return -1; if (cb != NULL) - error = git_config_get_multivar(config, key, NULL, cb, payload); + error = git_config_get_multivar_foreach(config, key, NULL, cb, payload); else error = git_config_get_string(payload, config, key); |