argv-array: fix bogus cast when freeing array

peff · gitster · commit ba4d1c7b1623 · 2012-09-02T21:10:24.000-07:00
Since the array struct stores a "const char **" argv member
(for compatibility with most of our argv-taking functions),
we have to cast away the const-ness when freeing its
elements.

However, we used the wrong type when doing so.  It doesn't
make a difference since free() take a void pointer anyway,
but it can be slightly confusing to a reader.

Signed-off-by: Jeff King &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/argv-array.c b/argv-array.c
@@ -63,7 +63,7 @@ void argv_array_clear(struct argv_array *array)
 	if (array->argv != empty_argv) {
 		int i;
 		for (i = 0; i < array->argc; i++)
-			free((char **)array->argv[i]);
+			free((char *)array->argv[i]);
 		free(array->argv);
 	}
 	argv_array_init(array);

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ void argv_array_clear(struct argv_array *array)`
`63`	`63`	`if (array->argv != empty_argv) {`
`64`	`64`	`int i;`
`65`	`65`	`for (i = 0; i < array->argc; i++)`
`66`		`- free((char **)array->argv[i]);`
	`66`	`+ free((char *)array->argv[i]);`
`67`	`67`	`free(array->argv);`
`68`	`68`	`}`
`69`	`69`	`argv_array_init(array);`