filter::stream: free the filter sanely

ethomson · ethomson · commit 79306d8d59b3 · 2015-07-02T10:21:48.000-05:00
Don't use the filter's free callback to free the actual data structure
holding the filter, as we may not always actually initialize it (the
test may be skipped).
diff --git a/tests/filter/stream.c b/tests/filter/stream.c
@@ -25,6 +25,7 @@ void test_filter_stream__cleanup(void)
 	g_repo = NULL;
 
 	git_filter_unregister("compress");
+	git__free(compress_filter);
 }
 
 #define CHUNKSIZE 10240
@@ -123,11 +124,6 @@ static int compress_filter_stream_init(
 	return 0;
 }
 
-static void compress_filter_free(git_filter *f)
-{
-	git__free(f);
-}
-
 git_filter *create_compress_filter(void)
 {
 	git_filter *filter = git__calloc(1, sizeof(git_filter));
@@ -136,7 +132,6 @@ git_filter *create_compress_filter(void)
 	filter->version = GIT_FILTER_VERSION;
 	filter->attributes = "+compress";
 	filter->stream = compress_filter_stream_init;
-	filter->shutdown = compress_filter_free;
 
 	return filter;
 }

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ void test_filter_stream__cleanup(void)`
`25`	`25`	`g_repo = NULL;`
`26`	`26`
`27`	`27`	`git_filter_unregister("compress");`
	`28`	`+ git__free(compress_filter);`
`28`	`29`	`}`
`29`	`30`
`30`	`31`	`#define CHUNKSIZE 10240`
`@@ -123,11 +124,6 @@ static int compress_filter_stream_init(`
`123`	`124`	`return 0;`
`124`	`125`	`}`
`125`	`126`
`126`		`-static void compress_filter_free(git_filter *f)`
`127`		`-{`
`128`		`- git__free(f);`
`129`		`-}`
`130`		`-`
`131`	`127`	`git_filter *create_compress_filter(void)`
`132`	`128`	`{`
`133`	`129`	`git_filter *filter = git__calloc(1, sizeof(git_filter));`
`@@ -136,7 +132,6 @@ git_filter *create_compress_filter(void)`
`136`	`132`	`filter->version = GIT_FILTER_VERSION;`
`137`	`133`	`filter->attributes = "+compress";`
`138`	`134`	`filter->stream = compress_filter_stream_init;`
`139`		`- filter->shutdown = compress_filter_free;`
`140`	`135`
`141`	`136`	`return filter;`
`142`	`137`	`}`