Skip to content

G
git2
Commit 4efa3290 by Carlos Martín Nieto
Options

config: get_multivar -> get_multivar_foreach 

The plain function will return an iterator, so move this one out of
the way.
parent 84fec6f6
Showing with 33 additions and 33 deletions
include/git2/config.h
...@@ -328,7 +328,7 @@ GIT_EXTERN(int) git_config_get_bool(int *out, const git_config *cfg, const char ...@@ -328,7 +328,7 @@ GIT_EXTERN(int) git_config_get_bool(int *out, const git_config *cfg, const char
GIT_EXTERN(int) git_config_get_string(const char **out, const git_config *cfg, const char *name); GIT_EXTERN(int) git_config_get_string(const char **out, const git_config *cfg, const char *name);
/** /**
* Get each value of a multivar. * Get each value of a multivar in a foreach callback
* *
* The callback will be called on each variable found * The callback will be called on each variable found
* *
...@@ -339,7 +339,7 @@ GIT_EXTERN(int) git_config_get_string(const char **out, const git_config *cfg, c ...@@ -339,7 +339,7 @@ GIT_EXTERN(int) git_config_get_string(const char **out, const git_config *cfg, c
* @param callback the function to be called on each value of the variable * @param callback the function to be called on each value of the variable
* @param payload opaque pointer to pass to the callback * @param payload opaque pointer to pass to the callback
*/ */
GIT_EXTERN(int) git_config_get_multivar(const git_config *cfg, const char *name, const char *regexp, git_config_foreach_cb callback, void *payload); GIT_EXTERN(int) git_config_get_multivar_foreach(const git_config *cfg, const char *name, const char *regexp, git_config_foreach_cb callback, void *payload);
/** /**
* Set the value of an integer config variable in the config file * Set the value of an integer config variable in the config file
......
include/git2/sys/config.h
...@@ -31,7 +31,7 @@ struct git_config_backend { ...@@ -31,7 +31,7 @@ struct git_config_backend {
/* Open means open the file/database and parse if necessary */ /* Open means open the file/database and parse if necessary */
int (*open)(struct git_config_backend *, git_config_level_t level); int (*open)(struct git_config_backend *, git_config_level_t level);
int (*get)(const struct git_config_backend *, const char *key, const git_config_entry **entry); int (*get)(const struct git_config_backend *, const char *key, const git_config_entry **entry);
int (*get_multivar)(struct git_config_backend *, const char *key, const char *regexp, git_config_foreach_cb callback, void *payload); int (*get_multivar_foreach)(struct git_config_backend *, const char *key, const char *regexp, git_config_foreach_cb callback, void *payload);
int (*set)(struct git_config_backend *, const char *key, const char *value); int (*set)(struct git_config_backend *, const char *key, const char *value);
int (*set_multivar)(git_config_backend *cfg, const char *name, const char *regexp, const char *value); int (*set_multivar)(git_config_backend *cfg, const char *name, const char *regexp, const char *value);
int (*del)(struct git_config_backend *, const char *key); int (*del)(struct git_config_backend *, const char *key);
......
src/config.c
...@@ -574,7 +574,7 @@ int git_config_get_entry(const git_config_entry **out, const git_config *cfg, co ...@@ -574,7 +574,7 @@ int git_config_get_entry(const git_config_entry **out, const git_config *cfg, co
return config_error_notfound(name); 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, const git_config *cfg, const char *name, const char *regexp,
git_config_foreach_cb cb, void *payload) git_config_foreach_cb cb, void *payload)
{ {
...@@ -593,7 +593,7 @@ int git_config_get_multivar( ...@@ -593,7 +593,7 @@ int git_config_get_multivar(
continue; continue;
file = internal->file; 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; ret = 0;
else if (err != GIT_ENOTFOUND) else if (err != GIT_ENOTFOUND)
return err; return err;
......
src/config_file.c
...@@ -413,7 +413,7 @@ static int config_get(const git_config_backend *cfg, const char *name, const git ...@@ -413,7 +413,7 @@ static int config_get(const git_config_backend *cfg, const char *name, const git
return 0; return 0;
} }
static int config_get_multivar( static int config_get_multivar_foreach(
git_config_backend *cfg, git_config_backend *cfg,
const char *name, const char *name,
const char *regex_str, const char *regex_str,
...@@ -603,7 +603,7 @@ int git_config_file__ondisk(git_config_backend **out, const char *path) ...@@ -603,7 +603,7 @@ int git_config_file__ondisk(git_config_backend **out, const char *path)
backend->parent.open = config_open; backend->parent.open = config_open;
backend->parent.get = config_get; 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 = config_set;
backend->parent.set_multivar = config_set_multivar; backend->parent.set_multivar = config_set_multivar;
backend->parent.del = config_delete; backend->parent.del = config_delete;
......
src/diff_driver.c
...@@ -187,7 +187,7 @@ static int git_diff_driver_load( ...@@ -187,7 +187,7 @@ static int git_diff_driver_load(
git_buf_truncate(&name, namelen + strlen("diff..")); git_buf_truncate(&name, namelen + strlen("diff.."));
git_buf_put(&name, "xfuncname", strlen("xfuncname")); 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) { cfg, name.ptr, NULL, diff_driver_xfuncname, drv)) < 0) {
if (error != GIT_ENOTFOUND) if (error != GIT_ENOTFOUND)
goto done; goto done;
...@@ -196,7 +196,7 @@ static int git_diff_driver_load( ...@@ -196,7 +196,7 @@ static int git_diff_driver_load(
git_buf_truncate(&name, namelen + strlen("diff..")); git_buf_truncate(&name, namelen + strlen("diff.."));
git_buf_put(&name, "funcname", strlen("funcname")); 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) { cfg, name.ptr, NULL, diff_driver_funcname, drv)) < 0) {
if (error != GIT_ENOTFOUND) if (error != GIT_ENOTFOUND)
goto done; goto done;
......
src/remote.c
...@@ -217,7 +217,7 @@ static int get_optional_config( ...@@ -217,7 +217,7 @@ static int get_optional_config(
return -1; return -1;
if (cb != NULL) 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 else
error = git_config_get_string(payload, config, key); error = git_config_get_string(payload, config, key);
......
tests-clar/config/multivar.c
...@@ -46,27 +46,27 @@ static int cb(const git_config_entry *entry, void *data) ...@@ -46,27 +46,27 @@ static int cb(const git_config_entry *entry, void *data)
return 0; return 0;
} }
static void check_get_multivar( static void check_get_multivar_foreach(
git_config *cfg, int expected, int expected_patterned) git_config *cfg, int expected, int expected_patterned)
{ {
int n = 0; int n = 0;
if (expected > 0) { if (expected > 0) {
cl_git_pass(git_config_get_multivar(cfg, _name, NULL, cb, &n)); cl_git_pass(git_config_get_multivar_foreach(cfg, _name, NULL, cb, &n));
cl_assert_equal_i(expected, n); cl_assert_equal_i(expected, n);
} else { } else {
cl_assert_equal_i(GIT_ENOTFOUND, cl_assert_equal_i(GIT_ENOTFOUND,
git_config_get_multivar(cfg, _name, NULL, cb, &n)); git_config_get_multivar_foreach(cfg, _name, NULL, cb, &n));
} }
n = 0; n = 0;
if (expected_patterned > 0) { if (expected_patterned > 0) {
cl_git_pass(git_config_get_multivar(cfg, _name, "example", cb, &n)); cl_git_pass(git_config_get_multivar_foreach(cfg, _name, "example", cb, &n));
cl_assert_equal_i(expected_patterned, n); cl_assert_equal_i(expected_patterned, n);
} else { } else {
cl_assert_equal_i(GIT_ENOTFOUND, cl_assert_equal_i(GIT_ENOTFOUND,
git_config_get_multivar(cfg, _name, "example", cb, &n)); git_config_get_multivar_foreach(cfg, _name, "example", cb, &n));
} }
} }
...@@ -75,31 +75,31 @@ void test_config_multivar__get(void) ...@@ -75,31 +75,31 @@ void test_config_multivar__get(void)
git_config *cfg; git_config *cfg;
cl_git_pass(git_config_open_ondisk(&cfg, "config/config11")); cl_git_pass(git_config_open_ondisk(&cfg, "config/config11"));
check_get_multivar(cfg, 2, 1); check_get_multivar_foreach(cfg, 2, 1);
/* add another that has the _name entry */ /* add another that has the _name entry */
cl_git_pass(git_config_add_file_ondisk(cfg, "config/config9", GIT_CONFIG_LEVEL_SYSTEM, 1)); cl_git_pass(git_config_add_file_ondisk(cfg, "config/config9", GIT_CONFIG_LEVEL_SYSTEM, 1));
check_get_multivar(cfg, 3, 2); check_get_multivar_foreach(cfg, 3, 2);
/* add another that does not have the _name entry */ /* add another that does not have the _name entry */
cl_git_pass(git_config_add_file_ondisk(cfg, "config/config0", GIT_CONFIG_LEVEL_GLOBAL, 1)); cl_git_pass(git_config_add_file_ondisk(cfg, "config/config0", GIT_CONFIG_LEVEL_GLOBAL, 1));
check_get_multivar(cfg, 3, 2); check_get_multivar_foreach(cfg, 3, 2);
/* add another that does not have the _name entry at the end */ /* add another that does not have the _name entry at the end */
cl_git_pass(git_config_add_file_ondisk(cfg, "config/config1", GIT_CONFIG_LEVEL_APP, 1)); cl_git_pass(git_config_add_file_ondisk(cfg, "config/config1", GIT_CONFIG_LEVEL_APP, 1));
check_get_multivar(cfg, 3, 2); check_get_multivar_foreach(cfg, 3, 2);
/* drop original file */ /* drop original file */
cl_git_pass(git_config_add_file_ondisk(cfg, "config/config2", GIT_CONFIG_LEVEL_LOCAL, 1)); cl_git_pass(git_config_add_file_ondisk(cfg, "config/config2", GIT_CONFIG_LEVEL_LOCAL, 1));
check_get_multivar(cfg, 1, 1); check_get_multivar_foreach(cfg, 1, 1);
/* drop other file with match */ /* drop other file with match */
cl_git_pass(git_config_add_file_ondisk(cfg, "config/config3", GIT_CONFIG_LEVEL_SYSTEM, 1)); cl_git_pass(git_config_add_file_ondisk(cfg, "config/config3", GIT_CONFIG_LEVEL_SYSTEM, 1));
check_get_multivar(cfg, 0, 0); check_get_multivar_foreach(cfg, 0, 0);
/* reload original file (add different place in order) */ /* reload original file (add different place in order) */
cl_git_pass(git_config_add_file_ondisk(cfg, "config/config11", GIT_CONFIG_LEVEL_SYSTEM, 1)); cl_git_pass(git_config_add_file_ondisk(cfg, "config/config11", GIT_CONFIG_LEVEL_SYSTEM, 1));
check_get_multivar(cfg, 2, 1); check_get_multivar_foreach(cfg, 2, 1);
git_config_free(cfg); git_config_free(cfg);
} }
...@@ -113,11 +113,11 @@ void test_config_multivar__add(void) ...@@ -113,11 +113,11 @@ void test_config_multivar__add(void)
cl_git_pass(git_config_set_multivar(cfg, _name, "nonexistant", "git://git.otherplace.org/libgit2")); cl_git_pass(git_config_set_multivar(cfg, _name, "nonexistant", "git://git.otherplace.org/libgit2"));
n = 0; n = 0;
cl_git_pass(git_config_get_multivar(cfg, _name, NULL, cb, &n)); cl_git_pass(git_config_get_multivar_foreach(cfg, _name, NULL, cb, &n));
cl_assert(n == 3); cl_assert(n == 3);
n = 0; n = 0;
cl_git_pass(git_config_get_multivar(cfg, _name, "otherplace", cb, &n)); cl_git_pass(git_config_get_multivar_foreach(cfg, _name, "otherplace", cb, &n));
cl_assert(n == 1); cl_assert(n == 1);
git_config_free(cfg); git_config_free(cfg);
...@@ -127,11 +127,11 @@ void test_config_multivar__add(void) ...@@ -127,11 +127,11 @@ void test_config_multivar__add(void)
cl_git_pass(git_config_open_ondisk(&cfg, "config/config11")); cl_git_pass(git_config_open_ondisk(&cfg, "config/config11"));
n = 0; n = 0;
cl_git_pass(git_config_get_multivar(cfg, _name, NULL, cb, &n)); cl_git_pass(git_config_get_multivar_foreach(cfg, _name, NULL, cb, &n));
cl_assert(n == 3); cl_assert(n == 3);
n = 0; n = 0;
cl_git_pass(git_config_get_multivar(cfg, _name, "otherplace", cb, &n)); cl_git_pass(git_config_get_multivar_foreach(cfg, _name, "otherplace", cb, &n));
cl_assert(n == 1); cl_assert(n == 1);
git_config_free(cfg); git_config_free(cfg);
...@@ -147,7 +147,7 @@ void test_config_multivar__add_new(void) ...@@ -147,7 +147,7 @@ void test_config_multivar__add_new(void)
cl_git_pass(git_config_set_multivar(cfg, var, "", "variable")); cl_git_pass(git_config_set_multivar(cfg, var, "", "variable"));
n = 0; n = 0;
cl_git_pass(git_config_get_multivar(cfg, var, NULL, cb, &n)); cl_git_pass(git_config_get_multivar_foreach(cfg, var, NULL, cb, &n));
cl_assert(n == 1); cl_assert(n == 1);
git_config_free(cfg); git_config_free(cfg);
...@@ -161,13 +161,13 @@ void test_config_multivar__replace(void) ...@@ -161,13 +161,13 @@ void test_config_multivar__replace(void)
cl_git_pass(git_config_open_ondisk(&cfg, "config/config11")); cl_git_pass(git_config_open_ondisk(&cfg, "config/config11"));
n = 0; n = 0;
cl_git_pass(git_config_get_multivar(cfg, _name, NULL, cb, &n)); cl_git_pass(git_config_get_multivar_foreach(cfg, _name, NULL, cb, &n));
cl_assert(n == 2); cl_assert(n == 2);
cl_git_pass(git_config_set_multivar(cfg, _name, "github", "git://git.otherplace.org/libgit2")); cl_git_pass(git_config_set_multivar(cfg, _name, "github", "git://git.otherplace.org/libgit2"));
n = 0; n = 0;
cl_git_pass(git_config_get_multivar(cfg, _name, NULL, cb, &n)); cl_git_pass(git_config_get_multivar_foreach(cfg, _name, NULL, cb, &n));
cl_assert(n == 2); cl_assert(n == 2);
git_config_free(cfg); git_config_free(cfg);
...@@ -175,7 +175,7 @@ void test_config_multivar__replace(void) ...@@ -175,7 +175,7 @@ void test_config_multivar__replace(void)
cl_git_pass(git_config_open_ondisk(&cfg, "config/config11")); cl_git_pass(git_config_open_ondisk(&cfg, "config/config11"));
n = 0; n = 0;
cl_git_pass(git_config_get_multivar(cfg, _name, NULL, cb, &n)); cl_git_pass(git_config_get_multivar_foreach(cfg, _name, NULL, cb, &n));
cl_assert(n == 2); cl_assert(n == 2);
git_config_free(cfg); git_config_free(cfg);
...@@ -190,7 +190,7 @@ void test_config_multivar__replace_multiple(void) ...@@ -190,7 +190,7 @@ void test_config_multivar__replace_multiple(void)
cl_git_pass(git_config_set_multivar(cfg, _name, "git://", "git://git.otherplace.org/libgit2")); cl_git_pass(git_config_set_multivar(cfg, _name, "git://", "git://git.otherplace.org/libgit2"));
n = 0; n = 0;
cl_git_pass(git_config_get_multivar(cfg, _name, "otherplace", cb, &n)); cl_git_pass(git_config_get_multivar_foreach(cfg, _name, "otherplace", cb, &n));
cl_assert(n == 2); cl_assert(n == 2);
git_config_free(cfg); git_config_free(cfg);
...@@ -198,7 +198,7 @@ void test_config_multivar__replace_multiple(void) ...@@ -198,7 +198,7 @@ void test_config_multivar__replace_multiple(void)
cl_git_pass(git_config_open_ondisk(&cfg, "config/config11")); cl_git_pass(git_config_open_ondisk(&cfg, "config/config11"));
n = 0; n = 0;
cl_git_pass(git_config_get_multivar(cfg, _name, "otherplace", cb, &n)); cl_git_pass(git_config_get_multivar_foreach(cfg, _name, "otherplace", cb, &n));
cl_assert(n == 2); cl_assert(n == 2);
git_config_free(cfg); git_config_free(cfg);
......
tests-clar/config/validkeyname.c
...@@ -28,7 +28,7 @@ static void assert_invalid_config_key_name(const char *name) ...@@ -28,7 +28,7 @@ static void assert_invalid_config_key_name(const char *name)
GIT_EINVALIDSPEC); GIT_EINVALIDSPEC);
cl_git_fail_with(git_config_delete_entry(cfg, name), cl_git_fail_with(git_config_delete_entry(cfg, name),
GIT_EINVALIDSPEC); GIT_EINVALIDSPEC);
cl_git_fail_with(git_config_get_multivar(cfg, name, "*", NULL, NULL), cl_git_fail_with(git_config_get_multivar_foreach(cfg, name, "*", NULL, NULL),
GIT_EINVALIDSPEC); GIT_EINVALIDSPEC);
cl_git_fail_with(git_config_set_multivar(cfg, name, "*", "42"), cl_git_fail_with(git_config_set_multivar(cfg, name, "*", "42"),
GIT_EINVALIDSPEC); GIT_EINVALIDSPEC);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment