batctl: avoid uninitialized variable when compiling bisect

Message ID 1309964637-23767-1-git-send-email-lindner_marek@yahoo.de (mailing list archive)
State Accepted, archived
Commit 64f974f5ae8668292af035a90f0b8cca5bbe82ce
Headers

Commit Message

Marek Lindner July 6, 2011, 3:03 p.m. UTC
  Reported-by: Max Ip <ipmax2011@googlemail.com>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
---
 bisect.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
  

Comments

Marek Lindner July 8, 2011, 11:02 p.m. UTC | #1
On Wednesday, July 06, 2011 17:03:57 Marek Lindner wrote:
> Reported-by: Max Ip <ipmax2011@googlemail.com>
> Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
> ---
>  bisect.c |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)

Applied in revision 64f974f.

Regards,
Marek
  

Patch

diff --git a/bisect.c b/bisect.c
index f6f171e..d3789aa 100644
--- a/bisect.c
+++ b/bisect.c
@@ -194,7 +194,7 @@  static int routing_table_new(char *orig, char *next_hop, char *old_next_hop, cha
 	struct seqno_event *seqno_event;
 	struct rt_table *rt_table, *prev_rt_table = NULL;
 	struct rt_hist *rt_hist;
-	int i, j;
+	int i, j = -1;
 
 	if (!curr_bat_node) {
 		fprintf(stderr, "Routing table change without preceding OGM - skipping");
@@ -331,7 +331,6 @@  static int routing_table_new(char *orig, char *next_hop, char *old_next_hop, cha
 	}
 
 	if (prev_rt_table) {
-		j = -1;
 		for (i = 0; i < prev_rt_table->num_entries; i++) {
 			/* if we have a previously deleted item don't copy it over */
 			if (prev_rt_table->entries[i].flags == RT_FLAG_DELETE) {