diff options
| author | Russell Belfer <arrbee@arrbee.com> | 2012-02-29 12:04:59 -0800 |
|---|---|---|
| committer | Russell Belfer <arrbee@arrbee.com> | 2012-03-02 15:51:55 -0800 |
| commit | 854eccbb2d86c2910f9d98dc52f9ebd0e37c262a (patch) | |
| tree | b22048a02480598477cde9c41fc16d3967226d6b /tests-clar/config/multivar.c | |
| parent | 74fa4bfae37e9d7c9e35550c881b114d7a83c4fa (diff) | |
| download | libgit2-854eccbb2d86c2910f9d98dc52f9ebd0e37c262a.tar.gz | |
Clean up GIT_UNUSED macros on all platforms
It turns out that commit 31e9cfc4cbcaf1b38cdd3dbe3282a8f57e5366a5
did not fix the GIT_USUSED behavior on all platforms. This commit
walks through and really cleans things up more thoroughly, getting
rid of the unnecessary stuff.
To remove the use of some GIT_UNUSED, I ended up adding a couple
of new iterators for hashtables that allow you to iterator just
over keys or just over values.
In making this change, I found a bug in the clar tests (where we
were doing *count++ but meant to do (*count)++ to increment the
value). I fixed that but then found the test failing because it
was not really using an empty repo. So, I took some of the code
that I wrote for iterator testing and moved it to clar_helpers.c,
then made use of that to make it easier to open fixtures on a
per test basis even within a single test file.
Diffstat (limited to 'tests-clar/config/multivar.c')
| -rw-r--r-- | tests-clar/config/multivar.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests-clar/config/multivar.c b/tests-clar/config/multivar.c index bccdc1289..a8451aca2 100644 --- a/tests-clar/config/multivar.c +++ b/tests-clar/config/multivar.c @@ -12,10 +12,12 @@ void test_config_multivar__cleanup(void) cl_fixture_cleanup("config"); } -static int mv_read_cb(const char *name, const char *GIT_UNUSED(value), void *data) +static int mv_read_cb(const char *name, const char *value, void *data) { int *n = (int *) data; + GIT_UNUSED(value); + if (!strcmp(name, _name)) (*n)++; @@ -35,10 +37,12 @@ void test_config_multivar__foreach(void) git_config_free(cfg); } -static int cb(const char *GIT_UNUSED(val), void *data) +static int cb(const char *val, void *data) { int *n = (int *) data; + GIT_UNUSED(val); + (*n)++; return GIT_SUCCESS; |
