thodg/libgit2

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0aae4da..5e15a21 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@ v0.23 + 1
 
 ### Changes or improvements
 
+* Custom filters can now be registered with wildcard attributes, for
+  example `filter=*`.  Consumers should examine the attributes parameter
+  of the `check` function for details.
+
 ### API additions
 
 ### API removals
@@ -88,10 +92,6 @@ v0.23
 * If libcurl is installed, we will use it to connect to HTTP(S)
   servers.
 
-* Custom filters can now be registered with wildcard attributes, for
-  example `filter=*`.  Consumers should examine the attributes parameter
-  of the `check` function for details.
-
 ### API additions
 
 * The `git_merge_options` gained a `file_flags` member.
diff --git a/tests/filter/wildcard.c b/tests/filter/wildcard.c
index 8031ad3..999b336 100644
--- a/tests/filter/wildcard.c
+++ b/tests/filter/wildcard.c
@@ -98,7 +98,6 @@ static void wildcard_filter_cleanup(git_filter *self, void *payload)
 {
 	GIT_UNUSED(self);
 	git__free(payload);
-	return 0;
 }
 
 static void wildcard_filter_free(git_filter *f)
@@ -106,7 +105,7 @@ static void wildcard_filter_free(git_filter *f)
 	git__free(f);
 }
 
-static git_filter *create_wildcard_filter()
+static git_filter *create_wildcard_filter(void)
 {
 	git_filter *filter = git__calloc(1, sizeof(git_filter));
 	cl_assert(filter);