fast-import: make code "-Wpointer-arith" clean

jrn · jrn · commit 6288e3e180c0 · 2011-02-28T15:25:12.000-06:00
The dereference() function to peel a tree-ish and find the underlying
tree expects arithmetic to (void *) to work on byte addresses.  We
should be reading the text of objects through a char * anyway.

Noticed-by: Junio C Hamano &lt;gitster@pobox.com&gt;
Signed-off-by: Jonathan Nieder &lt;jrnieder@gmail.com&gt;
diff --git a/fast-import.c b/fast-import.c
@@ -2848,7 +2848,7 @@ static struct object_entry *dereference(struct object_entry *oe,
 					unsigned char sha1[20])
 {
 	unsigned long size;
-	void *buf = NULL;
+	char *buf = NULL;
 	if (!oe) {
 		enum object_type type = sha1_object_info(sha1, NULL);
 		if (type < 0)

Original file line number	Diff line number	Diff line change
`@@ -2848,7 +2848,7 @@ static struct object_entry dereference(struct object_entry oe,`
`2848`	`2848`	`unsigned char sha1[20])`
`2849`	`2849`	`{`
`2850`	`2850`	`unsigned long size;`
`2851`		`- void *buf = NULL;`
	`2851`	`+ char *buf = NULL;`
`2852`	`2852`	`if (!oe) {`
`2853`	`2853`	`enum object_type type = sha1_object_info(sha1, NULL);`
`2854`	`2854`	`if (type < 0)`