drop some obsolete "x = x" compiler warning hacks

peff · gitster · commit cbfd5e1cbb53 · 2013-03-21T14:06:38.000-07:00
In cases where the setting and access of a variable are
protected by the same conditional flag, older versions of
gcc would generate a "might be used unitialized" warning. We
silence the warning by initializing the variable to itself,
a hack that gcc recognizes.

Modern versions of gcc are smart enough to get this right,
going back to at least version 4.3.5. gcc 4.1 does get it
wrong in both cases, but is sufficiently old that we
probably don't need to care about it anymore.

Signed-off-by: Jeff King &lt;peff@peff.net&gt;
Reviewed-by: Jonathan Nieder &lt;jrnieder@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
@@ -193,7 +193,7 @@ static int batch_one_object(const char *obj_name, int print_contents)
 	unsigned char sha1[20];
 	enum object_type type = 0;
 	unsigned long size;
-	void *contents = contents;
+	void *contents;
 
 	if (!obj_name)
 	   return 1;
diff --git a/fast-import.c b/fast-import.c
@@ -2434,7 +2434,7 @@ static void note_change_n(struct branch *b, unsigned char *old_fanout)
 {
 	const char *p = command_buf.buf + 2;
 	static struct strbuf uq = STRBUF_INIT;
-	struct object_entry *oe = oe;
+	struct object_entry *oe;
 	struct branch *s;
 	unsigned char sha1[20], commit_sha1[20];
 	char path[60];

Original file line number	Diff line number	Diff line change
`@@ -2434,7 +2434,7 @@ static void note_change_n(struct branch b, unsigned char old_fanout)`
`2434`	`2434`	`{`
`2435`	`2435`	`const char *p = command_buf.buf + 2;`
`2436`	`2436`	`static struct strbuf uq = STRBUF_INIT;`
`2437`		`- struct object_entry *oe = oe;`
	`2437`	`+ struct object_entry *oe;`
`2438`	`2438`	`struct branch *s;`
`2439`	`2439`	`unsigned char sha1[20], commit_sha1[20];`
`2440`	`2440`	`char path[60];`