jsoninfo: remove some dead code

fhuberts · fhuberts · commit a42fa55e5028 · 2012-10-23T13:45:14.000+02:00
Coverity: CID 739629 (#1 of 1): Logically dead code (DEADCODE) Execution cannot reach this expression ""auto"" inside statement "v4 = (autoV4 ? "auto" : "s");". CID 739630 (#1 of 1): Logically dead code (DEADCODE) Execution cannot reach this expression ""auto"" inside statement "v6 = (autoV6 ? "auto" : "s");". Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
diff --git a/lib/jsoninfo/src/olsrd_jsoninfo.c b/lib/jsoninfo/src/olsrd_jsoninfo.c
@@ -776,14 +776,14 @@ ipc_print_gateways(struct autobuf *abuf)
     }
 
     if (gw == olsr_get_inet_gateway(false)) {
-      v4 = autoV4 ? "auto" : "s";
+      v4 = "s";
     } else if (gw->ipv4 && (olsr_cnf->ip_version == AF_INET || olsr_cnf->use_niit)
                && (olsr_cnf->smart_gw_allow_nat || !gw->ipv4nat)) {
       v4 = "u";
     }
 
     if (gw == olsr_get_inet_gateway(true)) {
-      v6 = autoV6 ? "auto" : "s";
+      v6 = "s";
     } else if (gw->ipv6 && olsr_cnf->ip_version == AF_INET6) {
       v6 = "u";
     }

Original file line number	Diff line number	Diff line change
`@@ -776,14 +776,14 @@ ipc_print_gateways(struct autobuf *abuf)`
`776`	`776`	`}`
`777`	`777`
`778`	`778`	`if (gw == olsr_get_inet_gateway(false)) {`
`779`		`- v4 = autoV4 ? "auto" : "s";`
	`779`	`+ v4 = "s";`
`780`	`780`	`} else if (gw->ipv4 && (olsr_cnf->ip_version == AF_INET \|\| olsr_cnf->use_niit)`
`781`	`781`	`&& (olsr_cnf->smart_gw_allow_nat \|\| !gw->ipv4nat)) {`
`782`	`782`	`v4 = "u";`
`783`	`783`	`}`
`784`	`784`
`785`	`785`	`if (gw == olsr_get_inet_gateway(true)) {`
`786`		`- v6 = autoV6 ? "auto" : "s";`
	`786`	`+ v6 = "s";`
`787`	`787`	`} else if (gw->ipv6 && olsr_cnf->ip_version == AF_INET6) {`
`788`	`788`	`v6 = "u";`
`789`	`789`	`}`