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.

4 files changed, 11 insertions, 14 deletions

diff --git a/tests/t00-core.c b/tests/t00-core.c
index aff48b071..7f142ba21 100644
--- a/tests/t00-core.c
+++ b/tests/t00-core.c
@@ -424,10 +424,10 @@ static walk_data empty = {
 	GIT_BUF_INIT
 };
 
-static int dont_call_me(void *GIT_UNUSED(state), git_buf *GIT_UNUSED(path))
+static int dont_call_me(void *state, git_buf *path)
 {
-	GIT_UNUSED_ARG(state);
-	GIT_UNUSED_ARG(path);
+	GIT_UNUSED(state);
+	GIT_UNUSED(path);
 	return GIT_ERROR;
 }
 
diff --git a/tests/t07-hashtable.c b/tests/t07-hashtable.c
index 41d52af19..6beaeac68 100644
--- a/tests/t07-hashtable.c
+++ b/tests/t07-hashtable.c
@@ -154,7 +154,6 @@ BEGIN_TEST(tableit0, "iterate through all the contents of the table")
 	const int objects_n = 32;
 	int i;
 	table_item *objects, *ob;
-	const void *GIT_UNUSED(_unused);
 
 	git_hashtable *table = NULL;
 
@@ -170,9 +169,7 @@ BEGIN_TEST(tableit0, "iterate through all the contents of the table")
 		must_pass(git_hashtable_insert(table, &(objects[i].id), &(objects[i])));
 	}
 
-	GIT_HASHTABLE_FOREACH(table, _unused, ob,
-		ob->visited = 1;
-	);
+	GIT_HASHTABLE_FOREACH_VALUE(table, ob, ob->visited = 1);
 
 	/* make sure all nodes have been visited */
 	for (i = 0; i < objects_n; ++i)
diff --git a/tests/t18-status.c b/tests/t18-status.c
index 8bccb7106..aeadd5e6d 100644
--- a/tests/t18-status.c
+++ b/tests/t18-status.c
@@ -156,14 +156,14 @@ BEGIN_TEST(statuscb0, "test retrieving status for worktree of repository")
 	git_futils_rmdir_r(TEMP_REPO_FOLDER, 1);
 END_TEST
 
-static int status_cb1(const char *GIT_UNUSED(path), unsigned int GIT_UNUSED(status_flags), void *payload)
+static int status_cb1(const char *path, unsigned int status_flags, void *payload)
 {
 	int *count = (int *)payload;;
 
-	GIT_UNUSED_ARG(path);
-	GIT_UNUSED_ARG(status_flags);
+	GIT_UNUSED(path);
+	GIT_UNUSED(status_flags);
 
-	(void) *count++;
+	(*count)++;
 
 	return GIT_SUCCESS;
 }
diff --git a/tests/test_main.c b/tests/test_main.c
index 732d25a9d..50256e97c 100644
--- a/tests/test_main.c
+++ b/tests/test_main.c
@@ -70,12 +70,12 @@ int __cdecl
 #else
 int
 #endif
-main(int GIT_UNUSED(argc), char *GIT_UNUSED(argv[]))
+main(int argc, char *argv[])
 {
 	unsigned int i, failures;
 
-	GIT_UNUSED_ARG(argc);
-	GIT_UNUSED_ARG(argv);
+	GIT_UNUSED(argc);
+	GIT_UNUSED(argv);
 
 	git_threads_init();